Changeset 0f5d4de for examples/skeleton/parallel.c
- Timestamp:
- 01/15/19 16:46:02 (2 years ago)
- Branches:
- develop
- Children:
- edd0448
- Parents:
- be1b03a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
examples/skeleton/parallel.c
r389dd77 r0f5d4de 53 53 54 54 volatile int done = 0; 55 libtrace_t * trace = NULL;55 libtrace_t *inptrace = NULL; 56 56 57 57 static void cleanup_signal(int sig) { 58 58 (void)sig; /* avoid warnings about unused parameter */ 59 59 done = 1; 60 if ( trace)61 trace_pstop( trace);60 if (inptrace) 61 trace_pstop(inptrace); 62 62 } 63 63 … … 288 288 for (i = optind; i < argc; i++) { 289 289 290 trace = trace_create(argv[i]);291 292 if (trace_is_err( trace)) {293 trace_perror( trace, "Opening trace file");290 inptrace = trace_create(argv[i]); 291 292 if (trace_is_err(inptrace)) { 293 trace_perror(inptrace, "Opening trace file"); 294 294 retcode = -1; 295 295 break; 296 296 } 297 297 298 if (filter && trace_config( trace, TRACE_OPTION_FILTER, filter) == -1) {299 trace_perror( trace, "trace_config(filter)");298 if (filter && trace_config(inptrace, TRACE_OPTION_FILTER, filter) == -1) { 299 trace_perror(inptrace, "trace_config(filter)"); 300 300 retcode = -1; 301 301 break; 302 302 } 303 303 304 trace_set_perpkt_threads( trace, threads);305 trace_set_combiner( trace, &combiner_ordered,304 trace_set_perpkt_threads(inptrace, threads); 305 trace_set_combiner(inptrace, &combiner_ordered, 306 306 (libtrace_generic_t) {0}); 307 trace_set_hasher( trace, HASHER_BIDIRECTIONAL, NULL, NULL);308 309 if (trace_pstart( trace, &global, processing, reporter)) {310 trace_perror( trace, "Starting trace");307 trace_set_hasher(inptrace, HASHER_BIDIRECTIONAL, NULL, NULL); 308 309 if (trace_pstart(inptrace, &global, processing, reporter)) { 310 trace_perror(inptrace, "Starting trace"); 311 311 break; 312 312 } 313 313 314 314 /* Wait for all threads to stop */ 315 trace_join( trace);316 317 if (trace_is_err( trace)) {318 trace_perror( trace, "Processing packets");315 trace_join(inptrace); 316 317 if (trace_is_err(inptrace)) { 318 trace_perror(inptrace, "Processing packets"); 319 319 retcode = -1; 320 320 break; … … 327 327 if (filter) 328 328 trace_destroy_filter(filter); 329 trace_destroy( trace);329 trace_destroy(inptrace); 330 330 trace_destroy_callback_set(processing); 331 331 trace_destroy_callback_set(reporter);
Note: See TracChangeset
for help on using the changeset viewer.