Changeset b297e50

Timestamp:

10/13/05 16:26:37 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

c9caf07

Parents:

eb6f2ea

Message:

Add -d to merge directions, without just does a normal merge

File:

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

tools/tracemerge/tracemerge.c

@@ -4 +4 @@
 #include <inttypes.h>
 #include <stdbool.h>
+#include <getopt.h>
+
+void usage(char *argv0)
+{
+        fprintf(stderr,"Usage: %s [ -i | --set-interface ] outputuri traceuri...\n",argv0);
+        fprintf(stderr,"\n");
+        fprintf(stderr,"Merges traces together, with -i each trace gets it's own direction/interface,\n without traces keep whatever direction/interface they have set\n");
+        exit(1);
+}
 
 int main(int argc, char *argv[])
@@ -12 +21 @@
         struct libtrace_packet_t *packet;
         bool *live;
+        bool set_interface=false;
         int i=0;
 
-        if (argc<2) {
-                printf("Usage: %s outputuri traceuri...\n",argv[0]);
-                printf("\n");
-                printf("Merges traces together, each trace gets it's own direction\n");
+        while (1) {
+                int option_index;
+                struct option long_options[] = {
+                        { "set-interface",      0, 0, 'i' },
+                        { NULL,                 0, 0, 0 },
+                };
+
+                int c=getopt_long(argc, argv, "i:",
+                                long_options, &option_index);
+
+                if (c==-1)
+                        break;
+
+                switch (c) {
+                        case 'i': set_interface=true; break;
+                        default:
+                                fprintf(stderr,"unknown option: %c\n",c);
+                                usage(argv[0]);
+
+                }
+
+        }
+
+        if (optind+2<argc)
+                usage(argv[0]);
+
+        output=trace_output_create(argv[optind]);
+        if (!output) {
+                fprintf(stderr,"Unable to open output file %s\n",argv[optind]);
                 return 1;
         }
 
-        output=trace_output_create(argv[1]);
-        if (!output) {
-                fprintf(stderr,"Unable to open output file %s\n",argv[1]);
-                return 1;
-        }
-
-        input=calloc((argc-2),sizeof(struct libtrace_t *));
-        packet=calloc((argc-2),sizeof(struct libtrace_packet_t));
-        live=calloc((argc-2),sizeof(bool));
-        for(i=0;i<argc-2;++i) {
+        input=calloc((argc-optind),sizeof(struct libtrace_t *));
+        packet=calloc((argc-optind),sizeof(struct libtrace_packet_t));
+        live=calloc((argc-optind),sizeof(bool));
+        for(i=0;i<argc-optind;++i) {
                 struct libtrace_t *f;
                 struct libtrace_packet_t p;
-                f=trace_create(argv[i+2]);
+                f=trace_create(argv[i+optind]);
                 input[i]=f;
                 if (!input[i]) {
-                        fprintf(stderr,"Could not read %s\n",argv[i+2]);
+                        fprintf(stderr,"Could not read %s\n",argv[i+optind]);
                         return 1;
-                }
-                else {
-                        fprintf(stderr,"Created %s @ %p\n",argv[i+2],input[i]);
                 }
                 trace_read_packet(f,&p);
@@ -77 +103 @@
                 }
 
-                trace_set_direction(&packet[oldest],oldest);
+                if (set_interface)
+                        trace_set_direction(&packet[oldest],oldest);
                 trace_write_packet(output,&packet[oldest]);
                 live[oldest]=false;