haiwan
/
ck
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regressions: Make clean and gettimeofday fixes.

Browse Source
ck_pring
David Joseph 12 years ago
parent a4cd7f2ef2
commit 7b94d7c13d
35 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
regressions/ck_backoff/validate/Makefile
Unescape View File

@ -9,7 +9,7 @@ check: all
./validate ./validate
clean: clean:
rm -rf validate *.dSYM rm -rf validate *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=-D_GNU_SOURCE CFLAGS+=-D_GNU_SOURCE

2
regressions/ck_bag/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./order ./order
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_barrier/benchmark/Makefile
Unescape View File

@ -8,7 +8,7 @@ throughput: throughput.c ../../../include/ck_barrier.h ../../../src/ck_barrier_c
$(CC) $(CFLAGS) -o throughput throughput.c ../../../src/ck_barrier_centralized.c $(CC) $(CFLAGS) -o throughput throughput.c ../../../src/ck_barrier_centralized.c
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_barrier/validate/Makefile
Unescape View File

@ -28,7 +28,7 @@ check: all
exit $$rc exit $$rc
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_bitmap/validate/Makefile
Unescape View File

@ -8,7 +8,7 @@ serial: serial.c ../../../include/ck_bitmap.h
$(CC) $(CFLAGS) -o serial serial.c $(CC) $(CFLAGS) -o serial serial.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
check: all check: all
./serial ./serial

2
regressions/ck_brlock/benchmark/Makefile
Unescape View File

@ -11,7 +11,7 @@ throughput: throughput.c ../../../include/ck_brlock.h
$(CC) $(CFLAGS) -o throughput throughput.c $(CC) $(CFLAGS) -o throughput throughput.c
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_brlock/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./validate $(CORES) 1 ./validate $(CORES) 1
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_bytelock/benchmark/Makefile
Unescape View File

@ -8,7 +8,7 @@ latency: latency.c
$(CC) $(CFLAGS) -o latency latency.c $(CC) $(CFLAGS) -o latency latency.c
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_bytelock/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./validate $(CORES) 1 ./validate $(CORES) 1
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_cohort/benchmark/Makefile
Unescape View File

@ -11,7 +11,7 @@ ck_cohort.LATENCY: ck_cohort.c
$(CC) -DLATENCY $(CFLAGS) -o ck_cohort.LATENCY ck_cohort.c $(CC) -DLATENCY $(CFLAGS) -o ck_cohort.LATENCY ck_cohort.c
clean: clean:
rm -rf *.dSYM $(OBJECTS) rm -rf *.dSYM *.exe $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm

2
regressions/ck_cohort/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./validate `expr $(CORES) / 2` 2 1 ./validate `expr $(CORES) / 2` 2 1
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_epoch/validate/Makefile
Unescape View File

@ -20,7 +20,7 @@ ck_stack: ck_stack.c ../../../include/ck_stack.h ../../../include/ck_epoch.h ../
$(CC) $(CFLAGS) -o ck_stack ck_stack.c ../../../src/ck_epoch.c $(CC) $(CFLAGS) -o ck_stack ck_stack.c ../../../src/ck_epoch.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_fifo/benchmark/Makefile
Unescape View File

@ -8,7 +8,7 @@ latency: latency.c
$(CC) $(CFLAGS) -o latency latency.c $(CC) $(CFLAGS) -o latency latency.c
clean: clean:
rm -rf *~ *.o *.dSYM $(OBJECTS) rm -rf *~ *.o *.dSYM *.exe $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_fifo/validate/Makefile
Unescape View File

@ -23,7 +23,7 @@ ck_fifo_mpmc_iterator: ck_fifo_mpmc_iterator.c ../../../include/ck_fifo.h
$(CC) $(CFLAGS) -o ck_fifo_mpmc_iterator ck_fifo_mpmc_iterator.c $(CC) $(CFLAGS) -o ck_fifo_mpmc_iterator ck_fifo_mpmc_iterator.c
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_hp/benchmark/Makefile
Unescape View File

@ -11,7 +11,7 @@ stack_latency: stack_latency.c
$(CC) $(CFLAGS) -o stack_latency ../../../src/ck_hp.c stack_latency.c $(CC) $(CFLAGS) -o stack_latency ../../../src/ck_hp.c stack_latency.c
clean: clean:
rm -rf *~ *.o *.dSYM $(OBJECTS) rm -rf *~ *.o *.dSYM *.exe $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_hp/validate/Makefile
Unescape View File

@ -27,7 +27,7 @@ nbds_haz_test: ../../../src/ck_hp.c nbds_haz_test.c
$(CC) $(CFLAGS) ../../../src/ck_hp.c -o nbds_haz_test nbds_haz_test.c $(CC) $(CFLAGS) ../../../src/ck_hp.c -o nbds_haz_test nbds_haz_test.c
clean: clean:
rm -rf *~ *.o *.dSYM $(OBJECTS) rm -rf *~ *.o *.dSYM *.exe $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_hs/benchmark/Makefile
Unescape View File

@ -11,7 +11,7 @@ parallel_bytestring: parallel_bytestring.c ../../../include/ck_hs.h ../../../src
$(CC) $(PTHREAD_CFLAGS) $(CFLAGS) -o parallel_bytestring parallel_bytestring.c ../../../src/ck_hs.c ../../../src/ck_epoch.c $(CC) $(PTHREAD_CFLAGS) $(CFLAGS) -o parallel_bytestring parallel_bytestring.c ../../../src/ck_hs.c ../../../src/ck_epoch.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=-D_GNU_SOURCE CFLAGS+=-D_GNU_SOURCE

2
regressions/ck_hs/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./serial ./serial
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=-D_GNU_SOURCE CFLAGS+=-D_GNU_SOURCE

2
regressions/ck_ht/benchmark/Makefile
Unescape View File

@ -14,7 +14,7 @@ parallel_direct: parallel_direct.c ../../../include/ck_ht.h ../../../src/ck_ht.c
$(CC) $(PTHREAD_CFLAGS) $(CFLAGS) -o parallel_direct parallel_direct.c ../../../src/ck_ht.c ../../../src/ck_epoch.c $(CC) $(PTHREAD_CFLAGS) $(CFLAGS) -o parallel_direct parallel_direct.c ../../../src/ck_ht.c ../../../src/ck_epoch.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=-D_GNU_SOURCE CFLAGS+=-D_GNU_SOURCE

2
regressions/ck_ht/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./serial ./serial
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=-D_GNU_SOURCE CFLAGS+=-D_GNU_SOURCE

2
regressions/ck_pflock/benchmark/Makefile
Unescape View File

@ -11,7 +11,7 @@ throughput: throughput.c ../../../include/ck_rwlock.h
$(CC) $(CFLAGS) -o throughput throughput.c $(CC) $(CFLAGS) -o throughput throughput.c
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_pflock/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./validate $(CORES) 1 ./validate $(CORES) 1
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_pr/benchmark/Makefile
Unescape View File

@ -12,7 +12,7 @@ ck_pr_fas_64: ck_pr_fas_64.c
$(CC) $(CFLAGS) -o ck_pr_fas_64 ck_pr_fas_64.c $(CC) $(CFLAGS) -o ck_pr_fas_64 ck_pr_fas_64.c
clean: clean:
rm -rf ck_pr_cas_64 ck_pr_fas_64 ck_pr_cas_64_2 *.dSYM rm -rf ck_pr_cas_64 ck_pr_fas_64 ck_pr_cas_64_2 *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm

2
regressions/ck_pr/validate/Makefile
Unescape View File

@ -78,7 +78,7 @@ ck_pr_unary: ck_pr_unary.c
$(CC) $(CFLAGS) -o ck_pr_unary ck_pr_unary.c $(CC) $(CFLAGS) -o ck_pr_unary ck_pr_unary.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=-D_GNU_SOURCE CFLAGS+=-D_GNU_SOURCE

2
regressions/ck_queue/validate/Makefile
Unescape View File

@ -20,7 +20,7 @@ ck_stailq: $(HEADER) ck_stailq.c
$(CC) $(CFLAGS) -o ck_stailq ck_stailq.c $(CC) $(CFLAGS) -o ck_stailq ck_stailq.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_ring/benchmark/Makefile
Unescape View File

@ -8,7 +8,7 @@ latency: latency.c ../../../include/ck_ring.h
$(CC) $(CFLAGS) -o latency latency.c $(CC) $(CFLAGS) -o latency latency.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=-D_GNU_SOURCE CFLAGS+=-D_GNU_SOURCE

2
regressions/ck_ring/validate/Makefile
Unescape View File

@ -28,7 +28,7 @@ ck_ring_spmc: ck_ring_spmc.c ../../../include/ck_ring.h
../../../src/ck_barrier_centralized.c ../../../src/ck_barrier_centralized.c
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_rwlock/benchmark/Makefile
Unescape View File

@ -11,7 +11,7 @@ throughput: throughput.c ../../../include/ck_rwlock.h
$(CC) $(CFLAGS) -o throughput throughput.c $(CC) $(CFLAGS) -o throughput throughput.c
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_rwlock/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./validate $(CORES) 1 ./validate $(CORES) 1
clean: clean:
rm -rf *.dSYM *~ *.o $(OBJECTS) rm -rf *.dSYM *.exe *~ *.o $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_sequence/validate/Makefile
Unescape View File

@ -11,7 +11,7 @@ check: all
./ck_sequence $(CORES) 1 ./ck_sequence $(CORES) 1
clean: clean:
rm -rf *~ *.o $(OBJECTS) *.dSYM rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_spinlock/benchmark/Makefile
Unescape View File

@ -74,7 +74,7 @@ ck_anderson.LATENCY: ck_anderson.c
$(CC) -DLATENCY $(CFLAGS) -o ck_anderson.LATENCY ck_anderson.c $(CC) -DLATENCY $(CFLAGS) -o ck_anderson.LATENCY ck_anderson.c
clean: clean:
rm -rf *.dSYM $(OBJECTS) rm -rf *.dSYM *.exe $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm

2
regressions/ck_spinlock/validate/Makefile
Unescape View File

@ -47,7 +47,7 @@ ck_dec: ck_dec.c
clean: clean:
rm -rf ck_ticket ck_mcs ck_dec ck_cas ck_fas ck_clh linux_spinlock ck_ticket_pb \ rm -rf ck_ticket ck_mcs ck_dec ck_cas ck_fas ck_clh linux_spinlock ck_ticket_pb \
ck_anderson ck_spinlock *.dSYM ck_anderson ck_spinlock *.dSYM *.exe
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm

2
regressions/ck_stack/benchmark/Makefile
Unescape View File

@ -8,7 +8,7 @@ latency: latency.c
$(CC) $(CFLAGS) -o latency latency.c $(CC) $(CFLAGS) -o latency latency.c
clean: clean:
rm -rf *~ *.o *.dSYM $(OBJECTS) rm -rf *~ *.o *.dSYM *.exe $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

2
regressions/ck_stack/validate/Makefile
Unescape View File

@ -50,7 +50,7 @@ mpmc_trypair mpmc_pair spinlock_pair spinlock_eb_pair pthreads_pair: pair.c
$(CC) -DPTHREADS $(CFLAGS) -o pthreads_pair pair.c $(CC) -DPTHREADS $(CFLAGS) -o pthreads_pair pair.c
clean: clean:
rm -rf *~ *.o *.dSYM $(OBJECTS) rm -rf *~ *.o *.dSYM *.exe $(OBJECTS)
include ../../../build/regressions.build include ../../../build/regressions.build
CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE

6
regressions/common.h
Unescape View File

@ -29,6 +29,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h>
#ifdef __linux__ #ifdef __linux__
#include <sched.h> #include <sched.h>
@ -46,7 +47,6 @@
#define DELTA_EPOCH 11644473600000000ULL #define DELTA_EPOCH 11644473600000000ULL
#else #else
#include <signal.h> #include <signal.h>
#include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -137,6 +137,7 @@ common_gettimeofday(struct timeval *tv, void *tz)
FILETIME ft; FILETIME ft;
uint64_t tmp_time = 0; uint64_t tmp_time = 0;
static bool tzflag = false; static bool tzflag = false;
struct timezone *tzp = NULL;
if (tv != NULL) { if (tv != NULL) {
GetSystemTimeAsFileTime(&ft); GetSystemTimeAsFileTime(&ft);
@ -161,8 +162,7 @@ common_gettimeofday(struct timeval *tv, void *tz)
tzflag = true; tzflag = true;
} }
struct timezone *tzp = (struct timezone *)tz; tzp = (struct timezone *)tz;
tzp->tz_minuteswest = _timezone / 60; tzp->tz_minuteswest = _timezone / 60;
tzp->tz_dsttime = _daylight; tzp->tz_dsttime = _daylight;
} }

Write Preview
Loading…
Cancel
Save