Changeset 0f5d4de for examples/skeleton/parallel.c

Timestamp:

01/15/19 16:46:02 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

edd0448

Parents:

be1b03a

Message:

Fix bad global variable names in examples

The global names were clashing with names used for function
parameters.

File:

• examples/skeleton/parallel.c (modified) (3 diffs)

examples/skeleton/parallel.c

@@ -53 +53 @@
 
 volatile int done = 0;
-libtrace_t *trace = NULL;
+libtrace_t *inptrace = NULL;
 
 static void cleanup_signal(int sig) {
         (void)sig;      /* avoid warnings about unused parameter */
         done = 1;
-        if (trace)
-                trace_pstop(trace);
+        if (inptrace)
+                trace_pstop(inptrace);
 }
 
@@ -288 +288 @@
         for (i = optind; i < argc; i++) {
 
-                trace = trace_create(argv[i]);
-
-                if (trace_is_err(trace)) {
-                        trace_perror(trace, "Opening trace file");
+                inptrace = trace_create(argv[i]);
+
+                if (trace_is_err(inptrace)) {
+                        trace_perror(inptrace, "Opening trace file");
                         retcode = -1;
                         break;
                 }
 
-                if (filter && trace_config(trace, TRACE_OPTION_FILTER, filter) == -1) {
-                        trace_perror(trace, "trace_config(filter)");
+                if (filter && trace_config(inptrace, TRACE_OPTION_FILTER, filter) == -1) {
+                        trace_perror(inptrace, "trace_config(filter)");
                         retcode = -1;
                         break;
                 }
 
-                trace_set_perpkt_threads(trace, threads);
-                trace_set_combiner(trace, &combiner_ordered,
+                trace_set_perpkt_threads(inptrace, threads);
+                trace_set_combiner(inptrace, &combiner_ordered,
                                 (libtrace_generic_t) {0});
-                trace_set_hasher(trace, HASHER_BIDIRECTIONAL, NULL, NULL);
-
-                if (trace_pstart(trace, &global, processing, reporter)) {
-                        trace_perror(trace, "Starting trace");
+                trace_set_hasher(inptrace, HASHER_BIDIRECTIONAL, NULL, NULL);
+
+                if (trace_pstart(inptrace, &global, processing, reporter)) {
+                        trace_perror(inptrace, "Starting trace");
                         break;
                 }
 
                 /* Wait for all threads to stop */
-                trace_join(trace);
-
-                if (trace_is_err(trace)) {
-                        trace_perror(trace, "Processing packets");
+                trace_join(inptrace);
+
+                if (trace_is_err(inptrace)) {
+                        trace_perror(inptrace, "Processing packets");
                         retcode = -1;
                         break;
@@ -327 +327 @@
         if (filter)
                 trace_destroy_filter(filter);
-        trace_destroy(trace);
+        trace_destroy(inptrace);
         trace_destroy_callback_set(processing);
         trace_destroy_callback_set(reporter);