Changeset 50b1bee for tools/traceanon/traceanon_parallel.c

Timestamp:

08/26/14 23:28:14 (7 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

2498008

Parents:

f0e8bd6

Message:

Ensure we've started the output before trying to write to it in traceanon
Remove some uneeded configuration options

File:

• tools/traceanon/traceanon_parallel.c (modified) (3 diffs)

tools/traceanon/traceanon_parallel.c

@@ -408 +408 @@
         }
 
+        if (trace_start_output(writer)==-1) {
+                trace_perror_output(writer,"trace_start_output");
+                trace_destroy_output(writer);
+                trace_destroy(trace);
+                return 1;
+        }
+
         // OK parallel changes start here
 
@@ -417 +424 @@
         int i = 1;
         trace_parallel_config(trace, TRACE_OPTION_ORDERED, &i);
-        //trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_BUFFER_SIZE, &i);
-        i = 6;
-    trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &i);
         trace_parallel_config(trace, TRACE_OPTION_SET_CONFIG, &uc);
-        trace_set_hasher(trace, HASHER_CUSTOM, bad_hash, NULL);
+        //trace_set_hasher(trace, HASHER_CUSTOM, rand_hash, NULL);
         
         if (trace_pstart(trace, NULL, &per_packet, &write_out)==-1) {
@@ -428 +432 @@
                 trace_destroy(trace);
                 return 1;
-        }
-        
-        if (trace_start_output(writer)==-1) {
-                trace_perror_output(writer,"trace_start_output");
-                trace_destroy_output(writer);
-                trace_destroy(trace);
-                return 1;
         }