Changeset c2f71ad for tools

Timestamp:

03/31/06 11:10:43 (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:

7e16db7

Parents:

4af54d1

Message:

Merged sam's fixes
Added unique-packets

File:

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

tools/tracemerge/tracemerge.c

@@ -8 +8 @@
 void usage(char *argv0)
 {
-        fprintf(stderr,"Usage: %s [ -i | --set-interface ] outputuri traceuri...\n",argv0);
+        fprintf(stderr,"Usage: %s [ -i | --set-interface ] [ -u | --unique-packets ] 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");
@@ -22 +22 @@
         bool *live;
         bool set_interface=false;
+        bool unique_packets=false;
         int i=0;
+        uint64_t last_ts=0;
 
         while (1) {
@@ -28 +30 @@
                 struct option long_options[] = {
                         { "set-interface",      0, 0, 'i' },
+                        { "unique-packets",     0, 0, 'u' },
                         { NULL,                 0, 0, 0 },
                 };
 
-                int c=getopt_long(argc, argv, "i:",
+                int c=getopt_long(argc, argv, "iu",
                                 long_options, &option_index);
 
@@ -39 +42 @@
                 switch (c) {
                         case 'i': set_interface=true; break;
+                        case 'u': unique_packets=true; break;
                         default:
                                 fprintf(stderr,"unknown option: %c\n",c);
@@ -65 +69 @@
         for(i=0;i<argc-optind;++i) {
                 struct libtrace_t *f;
-                struct libtrace_packet_t *p;
                 f=trace_create(argv[i+optind]);
                 if (trace_is_err(f)) {
@@ -78 +81 @@
                 input[i]=f;
                 packet[i]=p;
-                trace_read_packet(f,p);
+                if (trace_read_packet(f,packet[i])>0)
+                        live[i]=true;
         }
 
@@ -103 +107 @@
                         if (live[i] && 
                                 (oldest==-1 || 
-                                 oldest_ts<trace_get_erf_timestamp(packet[i]))) {
+                                 oldest_ts>trace_get_erf_timestamp(packet[i]))) {
                                 oldest=i;
                                 oldest_ts=trace_get_erf_timestamp(packet[i]);
@@ -113 +117 @@
                 }
 
+                live[oldest]=false;
+
                 if (set_interface)
                         trace_set_direction(packet[oldest],oldest);
+
+                if (unique_packets && oldest_ts == last_ts)
+                        continue;
+
                 trace_write_packet(output,packet[oldest]);
-                live[oldest]=false;
+
+                last_ts=oldest_ts;
                 
         }