Fri Mar 6 11:49:31 2015 UTC ()
XXX: Use only a single thread. We seem to have a bug in our threading code
that causes us to hang in the ksem code if we use more than one.


(christos)
diff -r1.10 -r1.11 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
cvs diff -r1.10 -r1.11 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c (expand / switch to unified diff)

--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c 2015/02/07 20:30:03 1.10
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c 2015/03/06 11:49:30 1.11
@@ -198,27 +198,32 @@ @@ -198,27 +198,32 @@
198#endif 198#endif
199 199
200#include "ctf_headers.h" 200#include "ctf_headers.h"
201#include "ctftools.h" 201#include "ctftools.h"
202#include "ctfmerge.h" 202#include "ctfmerge.h"
203#include "traverse.h" 203#include "traverse.h"
204#include "memory.h" 204#include "memory.h"
205#include "fifo.h" 205#include "fifo.h"
206#include "barrier.h" 206#include "barrier.h"
207 207
208#pragma init(bigheap) 208#pragma init(bigheap)
209 209
210#define MERGE_PHASE1_BATCH_SIZE 8 210#define MERGE_PHASE1_BATCH_SIZE 8
 211#if 0
 212// XXX: bug?
211#define MERGE_PHASE1_MAX_SLOTS 5 213#define MERGE_PHASE1_MAX_SLOTS 5
 214#else
 215#define MERGE_PHASE1_MAX_SLOTS 1
 216#endif
212#define MERGE_INPUT_THROTTLE_LEN 10 217#define MERGE_INPUT_THROTTLE_LEN 10
213 218
214const char *progname; 219const char *progname;
215static char *outfile = NULL; 220static char *outfile = NULL;
216static char *tmpname = NULL; 221static char *tmpname = NULL;
217static int dynsym; 222static int dynsym;
218int debug_level = DEBUG_LEVEL; 223int debug_level = DEBUG_LEVEL;
219#if 0 224#if 0
220static size_t maxpgsize = 0x400000; 225static size_t maxpgsize = 0x400000;
221#endif 226#endif
222static int maxslots = MERGE_PHASE1_MAX_SLOTS; 227static int maxslots = MERGE_PHASE1_MAX_SLOTS;
223 228
224 229