regressions: Make clean and gettimeofday fixes.

ck_pring
David Joseph 12 years ago
parent a4cd7f2ef2
commit 7b94d7c13d

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -29,6 +29,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
#ifdef __linux__
#include <sched.h>
@ -46,7 +47,6 @@
#define DELTA_EPOCH 11644473600000000ULL
#else
#include <signal.h>
#include <sys/time.h>
#include <unistd.h>
#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;
}

Loading…
Cancel
Save