Ignore:
Timestamp:
08/12/14 15:22:24 (7 years ago)
Author:
Richard Sanger <rsangerarj@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:
957a72a
Parents:
7e4e9b8 (diff), f051c1b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop' of https://github.com/rsanger/libtrace into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/tracertstats/tracertstats_parallel.c

    rb13b939 rf051c1b  
    209209                        // Publish and make a new one new
    210210                        //fprintf(stderr, "Publishing result %"PRIu64"\n", last_ts);
    211                         trace_publish_result(trace, (uint64_t) last_ts, results);
    212                         trace_post_reduce(trace);
     211                        trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
     212                        trace_post_reporter(trace);
    213213                        results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
    214214                        last_ts++;
     
    234234                // printf ("%d.%06d READ #%"PRIu64"\n", tv.tv_sec, tv.tv_usec, trace_packet_get(packet));
    235235                switch (mesg->code) {
    236                         case MESSAGE_STARTED:
     236                        case MESSAGE_STARTING:
    237237                                results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
    238238                                break;
    239                         case MESSAGE_STOPPED:
     239                        case MESSAGE_STOPPING:
    240240                                // Should we always post this?
    241241                                if (results->total.count) {
    242                                         trace_publish_result(trace, (uint64_t) last_ts, results);
    243                                         trace_post_reduce(trace);
     242                                        trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
     243                                        trace_post_reporter(trace);
    244244                                        results = NULL;
    245245                                }
     
    260260                                        if (next_update_time <= mesg->additional.uint64) {
    261261                                                //fprintf(stderr, "Got a tick and publishing early!!\n");
    262                                                 trace_publish_result(trace, (uint64_t) last_ts, results);
    263                                                 trace_post_reduce(trace);
     262                                                trace_publish_result(trace, t, (uint64_t) last_ts, results, RESULT_NORMAL);
     263                                                trace_post_reporter(trace);
    264264                                                results = calloc(1, sizeof(result_t) + sizeof(statistic_t) * filter_count);
    265265                                                last_ts++;
Note: See TracChangeset for help on using the changeset viewer.