Changeset 7c95027


Ignore:
Timestamp:
03/27/15 17:16:53 (6 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:
ac6ac7f
Parents:
c63bcdf
Message:

Move combiners.h into libtrace_parallel.h and export libtrace_parallel.h
so that it is installed correctly.

Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • examples/parallel/timedemo.c

    rf3a2811 r7c95027  
    1212 */
    1313#include "libtrace_parallel.h"
    14 #include "combiners.h"
    1514#include <stdio.h>
    1615#include <inttypes.h>
  • lib/Makefile.am

    rc63bcdf r7c95027  
    11lib_LTLIBRARIES = libtrace.la
    2 include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h  
     2include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h libtrace_parallel.h
    33
    44AM_CFLAGS=@LIBCFLAGS@ @CFLAG_VISIBILITY@ -pthread
  • lib/libtrace_parallel.h

    ra330384 r7c95027  
    11221122 *
    11231123 * Sets a combiner against a trace, this should only be called on a
    1124  * non-started or paused trace.
     1124 * non-started or paused trace.  By default combiner_unordered
     1125 * will be used.
    11251126 */
    11261127DLLEXPORT void trace_set_combiner(libtrace_t *trace, const libtrace_combine_t *combiner, libtrace_generic_t config);
    11271128
     1129/**
     1130 * Takes unordered (or ordered) input and produces unordered output.
     1131 * Basically you get the result quickly but in no particular order.
     1132 */
     1133extern const libtrace_combine_t combiner_unordered;
     1134
     1135/**
     1136 * Takes ordered input and produces ordered output. Perpkt threads
     1137 * the output results must be ordered for this to work correctly!!
     1138 */
     1139extern const libtrace_combine_t combiner_ordered;
     1140
     1141/**
     1142 * Like classic Google Map/Reduce, the results are sorted
     1143 * in ascending order, this is only done when the trace finishes.
     1144 *
     1145 * This only works with a limited number of results, otherwise
     1146 * we will just run out of memory and crash!! You should always
     1147 * use combiner_ordered if you can.
     1148 */
     1149extern const libtrace_combine_t combiner_sorted;
     1150
    11281151#endif // LIBTRACE_PARALLEL_H
  • lib/trace_parallel.c

    r915b93c r7c95027  
    9595#include "rt_protocol.h"
    9696#include "hash_toeplitz.h"
    97 #include "combiners.h"
    9897
    9998#include <pthread.h>
  • test/test-format-parallel-reporter.c

    r6a6e6a8 r7c95027  
    5050#include "dagformat.h"
    5151#include "libtrace_parallel.h"
    52 #include "data-struct/vector.h"
    53 #include "combiners.h"
    5452
    5553void iferr(libtrace_t *trace,const char *msg)
  • tools/traceanon/traceanon_parallel.c

    r6b98325 r7c95027  
    11#define _GNU_SOURCE
    22#include "libtrace_parallel.h"
    3 #include "data-struct/vector.h"
    4 #include "data-struct/message_queue.h"
    5 #include "combiners.h"
    63#include <stdio.h>
    74#include <unistd.h>
  • tools/tracertstats/tracertstats_parallel.c

    ra330384 r7c95027  
    5656#include "rt_protocol.h"
    5757#include "dagformat.h"
    58 
    59 #include "data-struct/vector.h"
    60 #include "data-struct/message_queue.h"
    61 #include "combiners.h"
    6258
    6359#ifndef UINT32_MAX
  • tools/tracestats/tracestats_parallel.c

    r6b98325 r7c95027  
    5555#include "libtrace_parallel.h"
    5656#include "lt_inttypes.h"
    57 #include "data-struct/vector.h"
    58 #include "data-struct/message_queue.h"
    59 #include "combiners.h"
    6057#include <pthread.h>
    6158
Note: See TracChangeset for help on using the changeset viewer.