Module Name: src
Committed By: christos
Date: Fri Mar 6 11:49:31 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctfmerge.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.10 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.11
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.10 Sat Feb 7 15:30:03 2015
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Fri Mar 6 06:49:30 2015
@@ -208,7 +208,12 @@
#pragma init(bigheap)
#define MERGE_PHASE1_BATCH_SIZE 8
+#if 0
+// XXX: bug?
#define MERGE_PHASE1_MAX_SLOTS 5
+#else
+#define MERGE_PHASE1_MAX_SLOTS 1
+#endif
#define MERGE_INPUT_THROTTLE_LEN 10
const char *progname;
