Changeset 6b98325 for tools/tracestats

Timestamp:

03/23/15 17:52:17 (6 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:

773d5e2

Parents:

963b13b

Message:

Removes pconfig_input() and replaces trace_config() with trace_set_<option>

• Removes trace_pconfig completely - only trace_set_hasher is left now in trace_config
• Rework user configuration so this is no longer modified directly. Now we just apply it directly to a trace.
• Many minor documentation fixes and additions

Location:

tools/tracestats

Files:

• tracestats.c (modified) (1 diff)
• tracestats_parallel.c (modified) (5 diffs)

tools/tracestats/tracestats.c

@@ -129 +129 @@
                 bytes+=wlen;
         }
+        trace_destroy_packet(packet);
 
         stats = trace_get_statistics(trace, NULL);

tools/tracestats/tracestats_parallel.c

@@ -215 +215 @@
 }
 
-struct user_configuration uc;
-
-
 /* Process a trace, counting packets that match filter(s) */
-static void run_trace(char *uri) 
+static void run_trace(char *uri, char *config, char *config_file)
 {
 
@@ -230 +227 @@
                 return;
         }
-        
-        int option = 2;
+
+        //libtrace_filter_t *f = trace_create_filter("udp");
+        //trace_config(trace, TRACE_OPTION_FILTER, f);
+
+        //trace_config(trace, TRACE_OPTION_META_FREQ, &option);
         //option = 10000;
-    //trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
+        trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
         //trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);
-        trace_parallel_config(trace, TRACE_OPTION_SET_CONFIG, &uc);
+
+        /* Apply config */
+        if (config) {
+                trace_set_configuration(trace, config);
+        }
+
+        if (config_file) {
+                FILE * f = fopen(optarg, "r");
+                if (f != NULL) {
+                        trace_set_configuration_file(trace, f);
+                        fclose(f);
+                } else {
+                        perror("Failed to open configuration file\n");
+                        exit(-1);
+                }
+        }
+
         trace_set_combiner(trace, &combiner_ordered, (libtrace_generic_t){0});
 
@@ -278 +294 @@
         int i;
         struct sigaction sigact;
-        ZERO_USER_CONFIG(uc);
+        char *config = NULL;
+        char *config_file = NULL;
+
         while(1) {
                 int option_index;
@@ -309 +327 @@
                                 break;
                         case 'u':
-                                  parse_user_config(&uc, optarg);
-                                  break;
-                        case 'U':;
-                                FILE * f = fopen(optarg, "r");
-                                if (f != NULL) {
-                                        parse_user_config_file(&uc, f);
-                                } else {
-                                        perror("Failed to open configuration file\n");
-                                        usage(argv[0]);
-                                }
+                                config = optarg;
+                                break;
+                        case 'U':
+                                config_file = optarg;
                                 break;
                         default:
@@ -333 +345 @@
         sigaction(SIGINT, &sigact, NULL);
         sigaction(SIGTERM, &sigact, NULL);
-        
+
         for(i=optind;i<argc;++i) {
-                run_trace(argv[i]);
+                run_trace(argv[i], config, config_file);
         }
         if (optind+1<argc) {