Changeset 89ed4a0
- Timestamp:
- 01/07/19 10:36:09 (2 years ago)
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tools/tracemerge/tracemerge.c
r8e11beb r89ed4a0 207 207 input[i]=f; 208 208 packet[i]=p; 209 if (trace_read_packet(f,packet[i])>0) 209 if (trace_read_packet(f,packet[i])>0){ 210 210 live[i]=true; 211 } 211 212 } 212 213 … … 237 238 if (live[i]) { 238 239 this_ts = trace_get_erf_timestamp(packet[i]); 240 241 /* If the ts is 0 and its a meta packet just output it 242 * and read new packets until we get one that has a ts */ 243 while (this_ts == 0 && IS_LIBTRACE_META_PACKET(packet[i])) { 244 trace_write_packet(output,packet[i]); 245 /* read another packet */ 246 if (trace_read_packet(input[i],packet[i])>0) { 247 live[i] = true; 248 } 249 this_ts = trace_get_erf_timestamp(packet[i]); 250 } 251 239 252 if (this_ts != 0 && (oldest==-1 || 240 253 oldest_ts>this_ts)) {
Note: See TracChangeset
for help on using the changeset viewer.