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 context 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
@@ -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;