Changeset 89ed4a0

Timestamp:

01/07/19 10:36:09 (23 months ago)

Author:

Jacob Van Walraven <jcv9@…>

Branches:

develop

Children:

aceeda6

Parents:

b39eaee

git-author:

Jacob Van Walraven <jcv9@…> (12/17/18 10:21:25)

git-committer:

Jacob Van Walraven <jcv9@…> (01/07/19 10:36:09)

Message:

Update tracemerge to handle packets without a timestamp

File:

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

tools/tracemerge/tracemerge.c

@@ -207 +207 @@
                 input[i]=f;
                 packet[i]=p;
-                if (trace_read_packet(f,packet[i])>0)
+                if (trace_read_packet(f,packet[i])>0){
                         live[i]=true;
+                }
         }
 
@@ -237 +238 @@
                         if (live[i]) {
                                 this_ts = trace_get_erf_timestamp(packet[i]);
+
+                                /* If the ts is 0 and its a meta packet just output it
+                                 * and read new packets until we get one that has a ts */
+                                while (this_ts == 0 && IS_LIBTRACE_META_PACKET(packet[i])) {
+                                        trace_write_packet(output,packet[i]);
+                                        /* read another packet */
+                                        if (trace_read_packet(input[i],packet[i])>0) {
+                                                live[i] = true;
+                                        }
+                                        this_ts = trace_get_erf_timestamp(packet[i]);
+                                }
+
                                 if (this_ts != 0 && (oldest==-1 ||
                                                 oldest_ts>this_ts)) {