Changeset 0f5d4de

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.

Location:

examples

Files:

• parallel/network_capture.c (modified) (8 diffs)
• skeleton/parallel.c (modified) (3 diffs)

examples/parallel/network_capture.c

@@ -21 +21 @@
 #include <string.h>
 
-static char *output = NULL;
+static char *outputfile = NULL;
 
 static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
 static int count = 0;
-static libtrace_t *trace = NULL;
+static libtrace_t *inptrace = NULL;
 
 static int compress_level=-1;
@@ -32 +32 @@
 static void stop(int signal UNUSED)
 {
-        if (trace)
-                trace_pstop(trace);
+        if (inptrace)
+                trace_pstop(inptrace);
 }
 
@@ -57 +57 @@
         const char * first_extension = NULL;
 
-        file_index = strrchr(output, '/');
+        file_index = strrchr(outputfile, '/');
         if (file_index)
                 first_extension = strchr(file_index, '.');
@@ -64 +64 @@
 
         if (first_extension) {
-                snprintf(name, sizeof(name), "%.*s-%d%s", (int) (first_extension - output), output, my_id, first_extension);
+                snprintf(name, sizeof(name), "%.*s-%d%s", (int) (first_extension - outputfile), outputfile, my_id, first_extension);
         } else {
-                snprintf(name, sizeof(name), "%s-%d", output, my_id);
+                snprintf(name, sizeof(name), "%s-%d", outputfile, my_id);
         }
 
@@ -232 +232 @@
                 return 1;
         }
-        trace = trace_create(argv[optind]);
-        output = argv[optind+1];
-
-        if (trace_is_err(trace)) {
-                trace_perror(trace,"Opening trace file");
+        inptrace = trace_create(argv[optind]);
+        outputfile = argv[optind+1];
+
+        if (trace_is_err(inptrace)) {
+                trace_perror(inptrace,"Opening trace file");
                 return 1;
         }
@@ -247 +247 @@
 
         if (snaplen != -1)
-                trace_set_snaplen(trace, snaplen);
+                trace_set_snaplen(inptrace, snaplen);
         if(nb_threads != -1)
-                trace_set_perpkt_threads(trace, nb_threads);
+                trace_set_perpkt_threads(inptrace, nb_threads);
 
         /* We use a new version of trace_start(), trace_pstart()
          * The reporter function argument is optional and can be NULL */
-        if (trace_pstart(trace, NULL, processing, NULL)) {
-                trace_perror(trace,"Starting trace");
-                trace_destroy(trace);
+        if (trace_pstart(inptrace, NULL, processing, NULL)) {
+                trace_perror(inptrace,"Starting trace");
+                trace_destroy(inptrace);
                 trace_destroy_callback_set(processing);
                 return 1;
@@ -261 +261 @@
 
         /* Wait for the trace to finish */
-        trace_join(trace);
-
-        if (trace_is_err(trace)) {
-                trace_perror(trace,"Reading packets");
-                trace_destroy(trace);
+        trace_join(inptrace);
+
+        if (trace_is_err(inptrace)) {
+                trace_perror(inptrace,"Reading packets");
+                trace_destroy(inptrace);
                 trace_destroy_callback_set(processing);
                 return 1;
@@ -271 +271 @@
 
         /* Print stats before we destroy the trace */
-        stats = trace_get_statistics(trace, NULL);
+        stats = trace_get_statistics(inptrace, NULL);
         fprintf(stderr, "Overall statistics\n");
         trace_print_statistics(stats, stderr, "\t%s: %"PRIu64"\n");
 
         trace_destroy_callback_set(processing);
-        trace_destroy(trace);
+        trace_destroy(inptrace);
         return 0;
 }

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);