diff --git a/Makefile b/Makefile index c4093df..be6d6a7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TESTS = wfqueue wfqueue0#lcrq ccqueue msqueue faa delay +TESTS = wfqueue wfqueue0 lcrq ccqueue msqueue faa delay CC = gcc CFLAGS = -g -Wall -O3 -pthread -D_GNU_SOURCE @@ -35,7 +35,7 @@ msqueue: CFLAGS += -DMSQUEUE faa: CFLAGS += -DFAAQ $(TESTS): harness.o -wfqueue wfqueue0 lcrq ccqueue msqueue faa: pairwise.o +wfqueue wfqueue0 lcrq ccqueue msqueue faa: halfhalf.o delay: delay.o msqueue lcrq: hzdptr.o xxhash.o diff --git a/ccqueue.c b/ccqueue.c index d256fa9..ae2764d 100644 --- a/ccqueue.c +++ b/ccqueue.c @@ -70,3 +70,4 @@ void * dequeue(queue_t * queue, handle_t * handle) return node ? node->data : (void *) -1; } +void queue_free(int id, int nprocs) {} diff --git a/delay.c b/delay.c index 694d2f7..f72fea4 100644 --- a/delay.c +++ b/delay.c @@ -36,4 +36,5 @@ void * benchmark(int id, int nprocs) { return NULL; } +void thread_exit(int id, int nprocs) {} int verify() { return 1; } diff --git a/driver b/driver index 2836629..a66cb3c 100755 --- a/driver +++ b/driver @@ -12,13 +12,14 @@ T95=( \ 2.080 2.074 2.069 2.064 2.060 2.056 2.052 2.048 2.045 2.042 \ ) -TIMES[0]=$($@ | grep Mean | awk '{ print $5 }') +cmd="$@" +TIMES[0]=$(eval $cmd | grep Mean | awk '{ print $5 }') SUM=${TIMES[0]} printf '#%-2d %.2f\n' 1 ${TIMES[0]} i=1 while true; do - TIME=$($@ | grep Mean | awk '{ print $5 }') + TIME=$(eval $cmd | grep Mean | awk '{ print $5 }') TIMES[$i]=$TIME SUM=$(echo "$SUM + $TIME" | bc) N=$(($i + 1)) diff --git a/faa.c b/faa.c index ca44c86..6537518 100644 --- a/faa.c +++ b/faa.c @@ -18,3 +18,5 @@ void * dequeue(queue_t * q, handle_t * th) return (void *) (long) *th; } +void queue_free(queue_t * q, handle_t * h) {} + diff --git a/lcrq.c b/lcrq.c index 97d3682..0cc25fc 100644 --- a/lcrq.c +++ b/lcrq.c @@ -240,3 +240,5 @@ void * dequeue(queue_t * q, handle_t * th) return (void *) lcrq_get(q, th); } +void queue_free(int id, int nprocs) {} + diff --git a/msqueue.c b/msqueue.c index ac7b715..b2c85bd 100644 --- a/msqueue.c +++ b/msqueue.c @@ -81,3 +81,4 @@ void * dequeue(queue_t * q, handle_t * handle) return data; } +void queue_free(int id, int nprocs) {}