debugging valgrind issues, no resolution.

Author: erikjlee

include/qthread/performance.h

@@ -663,18 +663,20 @@ bool qtperf_check_invariants(void);
 #ifdef QTHREAD_PERFORMANCE
 #define QTPERF_ENTER_STATE(...) qtperf_enter_state(__VA_ARGS__)
 #define QTPERF_WORKER_ENTER_STATE(pdata,state) do{      \
-    if(qtperf_should_instrument_workers){\
-      QTPERF_ASSERT(pdata != NULL);\
-      qtperf_enter_state(pdata, state);\
+    if(qtperf_should_instrument_workers){               \
+      QTPERF_ASSERT(pdata != NULL);                     \
+      qtperf_enter_state(pdata, state);                 \
     } } while(0)
-#define QTPERF_QTHREAD_ENTER_STATE(pdata,state) do{                     \
-    if(qtperf_should_instrument_qthreads){                                     \
-        QTPERF_ASSERT(pdata != NULL);\
-        qtperf_enter_state(pdata, state);\
+#define QTPERF_QTHREAD_ENTER_STATE(pdata,state) do{     \
+    if(qtperf_should_instrument_qthreads){              \
+        QTPERF_ASSERT(pdata != NULL);                   \
+        qtperf_enter_state(pdata, state);               \
     }} while(0)
 
 #else
 # define QTPERF_ENTER_STATE(...)
+# define QTPERF_QTHREAD_ENTER_STATE(...)
+# define QTPERF_WORKER_ENTER_STATE(...)
 #endif // ifdef QTHREAD_PERFORMANCE
 
 

test/perf/Makefile

@@ -4,11 +4,12 @@ QTH_INC=$(QTHREADS)/include
 QTH_LIB=$(QTHREADS)/src/.libs
 CMOCK_LIB=${QTHREADS}/dependencies/install/lib
 CMOCK_INC=${QTHREADS}/dependencies/install/include
+PKGLIB=${QTHREADS}/dependencies/install/lib/pkgconfig
 
-CFLAGS_OPT=-I$(QTH_INC) -I${CMOCK_INC} -O3 -Wall -pedantic -DPERFDBG=1 -DQTPERF_TESTING -DQTHREAD_PERFORMANCE -DQTHREAD_NONLAZY_THREADIDS=1 -g $(shell pkg-config --cflags cmocka)
-CFLAGS_DBG=-I$(QTH_INC) -I${CMOCK_INC} -Wall -pedantic -DPERFDBG=1 -DQTPERF_TESTING -DQTHREAD_PERFORMANCE -DQTHREAD_NONLAZY_THREADIDS=1 -g $(shell pkg-config --cflags cmocka)
+CFLAGS_OPT=-I$(QTH_INC) -I${CMOCK_INC} -O3 -Wall -DPERFDBG=1 -DQTPERF_TESTING -DQTHREAD_PERFORMANCE -DQTHREAD_NONLAZY_THREADIDS=1 -g 
+CFLAGS_DBG=-I$(QTH_INC) -I${CMOCK_INC} -Wall -DPERFDBG=1 -DQTPERF_TESTING -DQTHREAD_PERFORMANCE -DQTHREAD_NONLAZY_THREADIDS=1 -g 
 CFLAGS_NOPERF=-I$(QTH_INC) -DQTHREAD_NONLAZY_THREADIDS=1 -g 
-CFLAGS=${CFLAGS_DBG}
+CFLAGS=-std=c99 ${CFLAGS_DBG}
 
 LDFLAGS=-L$(QTH_LIB) -lqthread -L${CMOCK_LIB} -lcmocka
 TESTS=$(shell ls test_*.c)
@@ -28,6 +29,8 @@ check: all
 %.o: %.c
 	gcc -c -o $*.o $(CFLAGS) $*.c
 
+check-%: all
+	LD_LIBRARY_PATH="${LIBPATH}" QT_NUM_SHEPHERDS=9 valgrind -q --read-var-info --leak-check=full ./$*.test 
 
 clean:
 	rm -f *~ *.o ${TARGETS}