Ignore:
Timestamp:
09/17/14 13:45:29 (8 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:
9e429e8
Parents:
2498008
Message:

Remove anything to do with the combiner from set configuration and removes any options/storage related to these such as the next expected packet.

Instead this is done using trace_set_combiner now, and the for the built-in combiners.h header. This is a lot more flexible and allows the users to specify there own combiner, and any number of options for it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/test-format-parallel-hasher.c

    r2498008 rd994324  
    9191}
    9292
    93 
    9493struct TLS {
    9594        bool seen_start_message;
     
    106105        if (result) {
    107106                assert(libtrace_result_get_key(result) == 0);
    108                 printf("%d,", (int) libtrace_result_get_value(result));
     107                printf("%d,", libtrace_result_get_value(result).sint);
    109108                totalthreads++;
    110                 totalpkts += (int) libtrace_result_get_value(result);
    111                 assert(libtrace_result_get_value(result) == 25 ||
    112                         libtrace_result_get_value(result) == expected - 25);
     109                totalpkts += libtrace_result_get_value(result).sint;
     110                assert(libtrace_result_get_value(result).sint == 25 ||
     111                        libtrace_result_get_value(result).sint == expected - 25);
    113112        } else {
    114113                switch(mesg->code) {
     
    165164
    166165                        // All threads publish to verify the thread count
    167                         trace_publish_result(trace, t, (uint64_t) 0, (void *) tls->count, RESULT_NORMAL);
     166                        trace_publish_result(trace, t, (uint64_t) 0, (libtrace_generic_types_t){.sint=tls->count}, RESULT_NORMAL);
    168167                        trace_post_reporter(trace);
    169168                        free(tls);
Note: See TracChangeset for help on using the changeset viewer.