Changeset bab946c for tools/tracestats/tracestats.c

Timestamp:

01/15/19 16:47:20 (2 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

e9fe6ac

Parents:

edd0448

Message:

Fix clashes between global and local variable names in tools.

File:

• tools/tracestats/tracestats.c (modified) (3 diffs)

tools/tracestats/tracestats.c

@@ -54 +54 @@
 #include <pthread.h>
 
-struct libtrace_t *trace = NULL;
+struct libtrace_t *inptrace = NULL;
 
 static void cleanup_signal(int signal UNUSED)
 {
-        if (trace)
-                trace_pstop(trace);
+        if (inptrace)
+                trace_pstop(inptrace);
 }
 
@@ -196 +196 @@
         libtrace_callback_set_t *pktcbs, *rescbs;
 
-        trace = trace_create(uri);
-
-        if (trace_is_err(trace)) {
-                trace_perror(trace,"Failed to create trace");
+        inptrace = trace_create(uri);
+
+        if (trace_is_err(inptrace)) {
+                trace_perror(inptrace,"Failed to create trace");
                 return;
         }
@@ -214 +214 @@
 
         if (threadcount != 0)
-                trace_set_perpkt_threads(trace, threadcount);
+                trace_set_perpkt_threads(inptrace, threadcount);
 
         /* Start the trace as a parallel trace */
-        if (trace_pstart(trace, NULL, pktcbs, rescbs)==-1) {
-                trace_perror(trace,"Failed to start trace");
+        if (trace_pstart(inptrace, NULL, pktcbs, rescbs)==-1) {
+                trace_perror(inptrace,"Failed to start trace");
                 return;
         }
 
         /* Wait for all threads to stop */
-        trace_join(trace);
-
-        if (trace_is_err(trace))
-                trace_perror(trace,"%s",uri);
-
-        trace_destroy(trace);
+        trace_join(inptrace);
+
+        if (trace_is_err(inptrace))
+                trace_perror(inptrace,"%s",uri);
+
+        trace_destroy(inptrace);
         trace_destroy_callback_set(pktcbs);
         trace_destroy_callback_set(rescbs);