Changeset 2b9a4c7

Timestamp:

11/21/09 00:42:12 (11 years ago)

Author:

Yuwei Wang <yww4@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:

05000f9

Parents:

099c35e

Message:

using getopt for commandline arguements. add -f for filter support

File:

• tools/tracereplay/tracereplay.c (modified) (7 diffs)

tools/tracereplay/tracereplay.c

@@ -17 +17 @@
 #include <string.h>
 #include <libtrace.h>
+#include <getopt.h>
 
 static libtrace_packet_t * per_packet(libtrace_packet_t *packet) {
@@ -28 +29 @@
 
   trace_construct_packet(new_packet,linktype,pkt_buffer,wire_length);
-
 
   return new_packet;
@@ -82 +82 @@
         }
 }
-                
+
+static void usage(char * argv) {
+        fprintf(stderr, "usage: %s [options] libtraceuri outputuri...\n", argv);
+        fprintf(stderr, " --filter bpfexpr\n");
+        fprintf(stderr, " -f bpfexpr\n");
+        fprintf(stderr, "\t\tApply a bpf filter expression\n");
+}
+
 int main(int argc, char *argv[]) {
         
@@ -88 +95 @@
         libtrace_out_t *output;
         libtrace_packet_t *packet;
+        libtrace_filter_t *filter=NULL;
         int psize = 0;
         char *uri = 0;
-        
-        if (argc == 3) {
-                uri = strdup(argv[1]);
-        } else {
-                fprintf(stderr,"usage: %s <input uri> <outputuri>\n",argv[0]);
-                return -1;
-        }
+
+        while(1) {
+                int option_index;
+                struct option long_options[] = {
+                        { "filter",     1, 0, 'f'},
+                        { "help",       0, 0, 'h'},
+                        { NULL,         0, 0, 0}
+                };
+
+                int c = getopt_long(argc, argv, "f:",
+                                long_options, &option_index);
+
+                if(c == -1)
+                        break;
+
+                switch (c) {
+                        case 'f':
+                                filter = trace_create_filter(optarg);
+                                break;
+                        case 'h':
+                                usage(argv[0]);
+                                return 1;
+                        default:
+                                fprintf(stderr, "Unknown option: %c\n", c);
+                }
+        }
+
+        if(optind>=argc) {
+                fprintf(stderr, "Missing input uri\n");
+                usage(argv[0]);
+                return 1;
+        }
+        if(optind+1>=argc) {
+                fprintf(stderr, "Missing output uri\n");
+                usage(argv[0]);
+                return 1;
+        }
+
+        uri = strdup(argv[optind]);
 
         /* Create the trace */
@@ -104 +144 @@
                 return 1;
         }
-        
+
+        /* apply filter */
+        if(filter) {
+                if(trace_config(trace, TRACE_OPTION_FILTER, filter)) {
+                        trace_perror(trace, "ignoring: ");
+                }
+        }
+
         /* Starting the trace */
         if (trace_start(trace) != 0) {
@@ -112 +159 @@
 
         /* Creating output trace */
-        output = trace_create_output(argv[2]);
+        output = trace_create_output(argv[optind+1]);
         
         if (trace_is_err_output(output)) {
-                trace_perror_output(output, "Opening output trace");
+                trace_perror_output(output, "Opening output trace: ");
                 return 1;
         }
         if (trace_start_output(output)) {
-                trace_perror_output(output, "Starting output trace");
+                trace_perror_output(output, "Starting output trace: ");
                 trace_destroy_output(output);
                 trace_destroy(trace);
                 return 1;
         }
-                
 
         packet = trace_create_packet();
@@ -147 +193 @@
         free(uri);
         trace_destroy(trace);
+        trace_destroy_filter(filter);
         trace_destroy_output(output);
         trace_destroy_packet(packet);