Changeset d51fd26
- Timestamp:
- 01/09/15 09:26:47 (7 years ago)
- Branches:
- 4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
- Children:
- 4cc6e74
- Parents:
- bdc8b36
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/trace_parallel.c
r1919caf rd51fd26 541 541 else if (ret != nb_packets) { 542 542 // Refill the empty packets 543 printf("Refilling packets ret=%d nb_packets=%z \n", ret, nb_packets);543 printf("Refilling packets ret=%d nb_packets=%zd\n", ret, nb_packets); 544 544 libtrace_ocache_alloc(&trace->packet_freelist, (void **) &packets[ret], nb_packets - ret, nb_packets - ret); 545 545 } … … 1386 1386 /* Finalise the packets, freeing any resources the format module 1387 1387 * may have allocated it and zeroing all data associated with it. 1388 * ./1388 */ 1389 1389 //trace_fin_packet(packets[i]); 1390 1390 /* Store the trace we are reading from into the packet opaque … … 1412 1412 filtered_pkts[nb_filtered++] = packets[i]; 1413 1413 packets[i] = NULL; 1414 } else if (libtrace->snaplen>0) { 1415 /* Snap the packet */ 1416 trace_set_capture_length(packets[i], 1417 libtrace->snaplen); 1414 } else { 1415 if (libtrace->snaplen>0) 1416 /* Snap the packet */ 1417 trace_set_capture_length(packets[i], 1418 libtrace->snaplen); 1418 1419 trace_packet_set_order(packets[i], trace_get_erf_timestamp(packets[i])); 1419 1420 } … … 1430 1431 } else { 1431 1432 for (i = 0; i < ret; ++i) { 1432 trace_set_capture_length(packets[i], 1433 libtrace->snaplen); 1433 if (libtrace->snaplen>0) 1434 trace_set_capture_length(packets[i], 1435 libtrace->snaplen); 1434 1436 trace_packet_set_order(packets[i], trace_get_erf_timestamp(packets[i])); 1435 1437 }
Note: See TracChangeset
for help on using the changeset viewer.