diff --git a/regressions/ck_backoff/validate/Makefile b/regressions/ck_backoff/validate/Makefile index 60cd40b..39e6d4f 100644 --- a/regressions/ck_backoff/validate/Makefile +++ b/regressions/ck_backoff/validate/Makefile @@ -9,7 +9,7 @@ check: all ./validate clean: - rm -rf validate *.dSYM + rm -rf validate *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=-D_GNU_SOURCE diff --git a/regressions/ck_bag/validate/Makefile b/regressions/ck_bag/validate/Makefile index 3df6823..b06f8b7 100644 --- a/regressions/ck_bag/validate/Makefile +++ b/regressions/ck_bag/validate/Makefile @@ -11,7 +11,7 @@ check: all ./order clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_barrier/benchmark/Makefile b/regressions/ck_barrier/benchmark/Makefile index 864c6fc..ea973d2 100644 --- a/regressions/ck_barrier/benchmark/Makefile +++ b/regressions/ck_barrier/benchmark/Makefile @@ -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 clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_barrier/validate/Makefile b/regressions/ck_barrier/validate/Makefile index f11b70a..f31a1a6 100644 --- a/regressions/ck_barrier/validate/Makefile +++ b/regressions/ck_barrier/validate/Makefile @@ -28,7 +28,7 @@ check: all exit $$rc clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_bitmap/validate/Makefile b/regressions/ck_bitmap/validate/Makefile index c96f924..85e13c8 100644 --- a/regressions/ck_bitmap/validate/Makefile +++ b/regressions/ck_bitmap/validate/Makefile @@ -8,7 +8,7 @@ serial: serial.c ../../../include/ck_bitmap.h $(CC) $(CFLAGS) -o serial serial.c clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe check: all ./serial diff --git a/regressions/ck_brlock/benchmark/Makefile b/regressions/ck_brlock/benchmark/Makefile index 1c6c0d6..cd12e7c 100644 --- a/regressions/ck_brlock/benchmark/Makefile +++ b/regressions/ck_brlock/benchmark/Makefile @@ -11,7 +11,7 @@ throughput: throughput.c ../../../include/ck_brlock.h $(CC) $(CFLAGS) -o throughput throughput.c clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_brlock/validate/Makefile b/regressions/ck_brlock/validate/Makefile index e233d69..3a49c43 100644 --- a/regressions/ck_brlock/validate/Makefile +++ b/regressions/ck_brlock/validate/Makefile @@ -11,7 +11,7 @@ check: all ./validate $(CORES) 1 clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_bytelock/benchmark/Makefile b/regressions/ck_bytelock/benchmark/Makefile index 0fe3712..c819099 100644 --- a/regressions/ck_bytelock/benchmark/Makefile +++ b/regressions/ck_bytelock/benchmark/Makefile @@ -8,7 +8,7 @@ latency: latency.c $(CC) $(CFLAGS) -o latency latency.c clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_bytelock/validate/Makefile b/regressions/ck_bytelock/validate/Makefile index dce3a0a..2a890e0 100644 --- a/regressions/ck_bytelock/validate/Makefile +++ b/regressions/ck_bytelock/validate/Makefile @@ -11,7 +11,7 @@ check: all ./validate $(CORES) 1 clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_cohort/benchmark/Makefile b/regressions/ck_cohort/benchmark/Makefile index 7cf62da..6af18b9 100644 --- a/regressions/ck_cohort/benchmark/Makefile +++ b/regressions/ck_cohort/benchmark/Makefile @@ -11,7 +11,7 @@ ck_cohort.LATENCY: ck_cohort.c $(CC) -DLATENCY $(CFLAGS) -o ck_cohort.LATENCY ck_cohort.c clean: - rm -rf *.dSYM $(OBJECTS) + rm -rf *.dSYM *.exe $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm diff --git a/regressions/ck_cohort/validate/Makefile b/regressions/ck_cohort/validate/Makefile index 794e3e6..145af3a 100644 --- a/regressions/ck_cohort/validate/Makefile +++ b/regressions/ck_cohort/validate/Makefile @@ -11,7 +11,7 @@ check: all ./validate `expr $(CORES) / 2` 2 1 clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_epoch/validate/Makefile b/regressions/ck_epoch/validate/Makefile index 59b2252..73f8e5d 100644 --- a/regressions/ck_epoch/validate/Makefile +++ b/regressions/ck_epoch/validate/Makefile @@ -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 clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_fifo/benchmark/Makefile b/regressions/ck_fifo/benchmark/Makefile index 50e5a09..6e2df2a 100644 --- a/regressions/ck_fifo/benchmark/Makefile +++ b/regressions/ck_fifo/benchmark/Makefile @@ -8,7 +8,7 @@ latency: latency.c $(CC) $(CFLAGS) -o latency latency.c clean: - rm -rf *~ *.o *.dSYM $(OBJECTS) + rm -rf *~ *.o *.dSYM *.exe $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_fifo/validate/Makefile b/regressions/ck_fifo/validate/Makefile index d12d703..a669896 100644 --- a/regressions/ck_fifo/validate/Makefile +++ b/regressions/ck_fifo/validate/Makefile @@ -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 clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_hp/benchmark/Makefile b/regressions/ck_hp/benchmark/Makefile index 8ab5273..2025ea9 100644 --- a/regressions/ck_hp/benchmark/Makefile +++ b/regressions/ck_hp/benchmark/Makefile @@ -11,7 +11,7 @@ stack_latency: stack_latency.c $(CC) $(CFLAGS) -o stack_latency ../../../src/ck_hp.c stack_latency.c clean: - rm -rf *~ *.o *.dSYM $(OBJECTS) + rm -rf *~ *.o *.dSYM *.exe $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_hp/validate/Makefile b/regressions/ck_hp/validate/Makefile index f1e091c..476b34f 100644 --- a/regressions/ck_hp/validate/Makefile +++ b/regressions/ck_hp/validate/Makefile @@ -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 clean: - rm -rf *~ *.o *.dSYM $(OBJECTS) + rm -rf *~ *.o *.dSYM *.exe $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_hs/benchmark/Makefile b/regressions/ck_hs/benchmark/Makefile index 6ffdb43..18ccdba 100644 --- a/regressions/ck_hs/benchmark/Makefile +++ b/regressions/ck_hs/benchmark/Makefile @@ -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 clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=-D_GNU_SOURCE diff --git a/regressions/ck_hs/validate/Makefile b/regressions/ck_hs/validate/Makefile index a01a08a..a96e652 100644 --- a/regressions/ck_hs/validate/Makefile +++ b/regressions/ck_hs/validate/Makefile @@ -11,7 +11,7 @@ check: all ./serial clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=-D_GNU_SOURCE diff --git a/regressions/ck_ht/benchmark/Makefile b/regressions/ck_ht/benchmark/Makefile index df5e16c..8e21d5b 100644 --- a/regressions/ck_ht/benchmark/Makefile +++ b/regressions/ck_ht/benchmark/Makefile @@ -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 clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=-D_GNU_SOURCE diff --git a/regressions/ck_ht/validate/Makefile b/regressions/ck_ht/validate/Makefile index f89e117..5942975 100644 --- a/regressions/ck_ht/validate/Makefile +++ b/regressions/ck_ht/validate/Makefile @@ -11,7 +11,7 @@ check: all ./serial clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=-D_GNU_SOURCE diff --git a/regressions/ck_pflock/benchmark/Makefile b/regressions/ck_pflock/benchmark/Makefile index 59c0b53..6f739d9 100644 --- a/regressions/ck_pflock/benchmark/Makefile +++ b/regressions/ck_pflock/benchmark/Makefile @@ -11,7 +11,7 @@ throughput: throughput.c ../../../include/ck_rwlock.h $(CC) $(CFLAGS) -o throughput throughput.c clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_pflock/validate/Makefile b/regressions/ck_pflock/validate/Makefile index fd25fea..eea9d02 100644 --- a/regressions/ck_pflock/validate/Makefile +++ b/regressions/ck_pflock/validate/Makefile @@ -11,7 +11,7 @@ check: all ./validate $(CORES) 1 clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_pr/benchmark/Makefile b/regressions/ck_pr/benchmark/Makefile index 669b2a2..f43e792 100644 --- a/regressions/ck_pr/benchmark/Makefile +++ b/regressions/ck_pr/benchmark/Makefile @@ -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 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 CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm diff --git a/regressions/ck_pr/validate/Makefile b/regressions/ck_pr/validate/Makefile index c255b03..9e4a82d 100644 --- a/regressions/ck_pr/validate/Makefile +++ b/regressions/ck_pr/validate/Makefile @@ -78,7 +78,7 @@ ck_pr_unary: ck_pr_unary.c $(CC) $(CFLAGS) -o ck_pr_unary ck_pr_unary.c clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=-D_GNU_SOURCE diff --git a/regressions/ck_queue/validate/Makefile b/regressions/ck_queue/validate/Makefile index 7a690d3..d6be3dc 100644 --- a/regressions/ck_queue/validate/Makefile +++ b/regressions/ck_queue/validate/Makefile @@ -20,7 +20,7 @@ ck_stailq: $(HEADER) ck_stailq.c $(CC) $(CFLAGS) -o ck_stailq ck_stailq.c clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_ring/benchmark/Makefile b/regressions/ck_ring/benchmark/Makefile index 7457654..4087ed1 100644 --- a/regressions/ck_ring/benchmark/Makefile +++ b/regressions/ck_ring/benchmark/Makefile @@ -8,7 +8,7 @@ latency: latency.c ../../../include/ck_ring.h $(CC) $(CFLAGS) -o latency latency.c clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=-D_GNU_SOURCE diff --git a/regressions/ck_ring/validate/Makefile b/regressions/ck_ring/validate/Makefile index cd63556..83d4273 100644 --- a/regressions/ck_ring/validate/Makefile +++ b/regressions/ck_ring/validate/Makefile @@ -28,7 +28,7 @@ ck_ring_spmc: ck_ring_spmc.c ../../../include/ck_ring.h ../../../src/ck_barrier_centralized.c clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_rwlock/benchmark/Makefile b/regressions/ck_rwlock/benchmark/Makefile index 59c0b53..6f739d9 100644 --- a/regressions/ck_rwlock/benchmark/Makefile +++ b/regressions/ck_rwlock/benchmark/Makefile @@ -11,7 +11,7 @@ throughput: throughput.c ../../../include/ck_rwlock.h $(CC) $(CFLAGS) -o throughput throughput.c clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_rwlock/validate/Makefile b/regressions/ck_rwlock/validate/Makefile index 2dbaa37..eeab170 100644 --- a/regressions/ck_rwlock/validate/Makefile +++ b/regressions/ck_rwlock/validate/Makefile @@ -11,7 +11,7 @@ check: all ./validate $(CORES) 1 clean: - rm -rf *.dSYM *~ *.o $(OBJECTS) + rm -rf *.dSYM *.exe *~ *.o $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_sequence/validate/Makefile b/regressions/ck_sequence/validate/Makefile index 28e7db0..bc2e5be 100644 --- a/regressions/ck_sequence/validate/Makefile +++ b/regressions/ck_sequence/validate/Makefile @@ -11,7 +11,7 @@ check: all ./ck_sequence $(CORES) 1 clean: - rm -rf *~ *.o $(OBJECTS) *.dSYM + rm -rf *~ *.o $(OBJECTS) *.dSYM *.exe include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_spinlock/benchmark/Makefile b/regressions/ck_spinlock/benchmark/Makefile index 61e70db..14bd901 100644 --- a/regressions/ck_spinlock/benchmark/Makefile +++ b/regressions/ck_spinlock/benchmark/Makefile @@ -74,7 +74,7 @@ ck_anderson.LATENCY: ck_anderson.c $(CC) -DLATENCY $(CFLAGS) -o ck_anderson.LATENCY ck_anderson.c clean: - rm -rf *.dSYM $(OBJECTS) + rm -rf *.dSYM *.exe $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm diff --git a/regressions/ck_spinlock/validate/Makefile b/regressions/ck_spinlock/validate/Makefile index 964085b..da37bae 100644 --- a/regressions/ck_spinlock/validate/Makefile +++ b/regressions/ck_spinlock/validate/Makefile @@ -47,7 +47,7 @@ ck_dec: ck_dec.c clean: 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 CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE -lm diff --git a/regressions/ck_stack/benchmark/Makefile b/regressions/ck_stack/benchmark/Makefile index 50e5a09..6e2df2a 100644 --- a/regressions/ck_stack/benchmark/Makefile +++ b/regressions/ck_stack/benchmark/Makefile @@ -8,7 +8,7 @@ latency: latency.c $(CC) $(CFLAGS) -o latency latency.c clean: - rm -rf *~ *.o *.dSYM $(OBJECTS) + rm -rf *~ *.o *.dSYM *.exe $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/ck_stack/validate/Makefile b/regressions/ck_stack/validate/Makefile index b81c166..519dca1 100644 --- a/regressions/ck_stack/validate/Makefile +++ b/regressions/ck_stack/validate/Makefile @@ -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 clean: - rm -rf *~ *.o *.dSYM $(OBJECTS) + rm -rf *~ *.o *.dSYM *.exe $(OBJECTS) include ../../../build/regressions.build CFLAGS+=$(PTHREAD_CFLAGS) -D_GNU_SOURCE diff --git a/regressions/common.h b/regressions/common.h index e6f9f5a..eec39cf 100644 --- a/regressions/common.h +++ b/regressions/common.h @@ -29,6 +29,7 @@ #include #include #include +#include #ifdef __linux__ #include @@ -46,7 +47,6 @@ #define DELTA_EPOCH 11644473600000000ULL #else #include -#include #include #endif @@ -137,6 +137,7 @@ common_gettimeofday(struct timeval *tv, void *tz) FILETIME ft; uint64_t tmp_time = 0; static bool tzflag = false; + struct timezone *tzp = NULL; if (tv != NULL) { GetSystemTimeAsFileTime(&ft); @@ -161,8 +162,7 @@ common_gettimeofday(struct timeval *tv, void *tz) tzflag = true; } - struct timezone *tzp = (struct timezone *)tz; - + tzp = (struct timezone *)tz; tzp->tz_minuteswest = _timezone / 60; tzp->tz_dsttime = _daylight; }