Changeset b8826aa


Ignore:
Timestamp:
06/27/13 10:29:08 (7 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:
d0cae69
Parents:
946f9e1
Message:

Fixes bug where the output file was destroyed multiple times on error if --merge-inputs was given.

Reported by:
The Mayhem Team (Alexandre Rebert, Thanassis Avgerinos, Sang Kil Cha,
David Brumley, Manuel Egele)
Cylab, Carnegie Mellon University

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/tracertstats/tracertstats.c

    r5d081ff rb8826aa  
    8080
    8181
    82 struct output_data_t *output;
     82struct output_data_t *output = NULL;
    8383
    8484static void report_results(double ts,uint64_t count,uint64_t bytes)
     
    138138                trace_perror(trace,"trace_create");
    139139                trace_destroy(trace);
    140                 output_destroy(output);
     140                if (!merge_inputs)
     141                        output_destroy(output);
    141142                return;
    142143        }
     
    144145                trace_perror(trace,"trace_start");
    145146                trace_destroy(trace);
    146                 output_destroy(output);
     147                if (!merge_inputs)
     148                        output_destroy(output);
    147149                return;
    148150        }
Note: See TracChangeset for help on using the changeset viewer.