From 003b8c9e466747b44bc18315d87c311d8c1c3f6e Mon Sep 17 00:00:00 2001 From: "Wang, Gang" Date: Tue, 19 Jan 2016 16:28:17 -0800 Subject: [PATCH] =?UTF-8?q?Revert=20"Make=20fails:=20CLOCK=5FMONOTONIC=20d?= =?UTF-8?q?oes=20not=20available=20in=20OSX.=20check=5Fcommon.c=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- perf/Makefile.am | 2 +- perf/common.c | 17 +---------------- tests/Makefile.am | 8 ++++---- tests/check_common.c | 15 --------------- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/perf/Makefile.am b/perf/Makefile.am index 1382672..462a5f7 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -1,5 +1,5 @@ -LDADD = ../src/.libs/libpmalloc.la +LDADD = ../src/.libs/libpmalloc.la -lrt AM_CFLAGS = -I../src diff --git a/perf/common.c b/perf/common.c index b052543..63f9bae 100644 --- a/perf/common.c +++ b/perf/common.c @@ -9,27 +9,12 @@ Persistent Memory Library Example #include "pmalloc.h" #include "common.h" -#ifdef __MACH__ -#include -#include -#endif - unsigned int init_random(unsigned int seed) { unsigned int ret = seed; if (0 == seed) { struct timespec ts; - #ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time - clock_serv_t cclock; - mach_timespec_t mts; - host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock); - clock_get_time(cclock, &mts); - mach_port_deallocate(mach_task_self(), cclock); - ts.tv_sec = mts.tv_sec; - ts.tv_nsec = mts.tv_nsec; - #else - clock_gettime(CLOCK_MONOTONIC, &ts); - #endif + clock_gettime(CLOCK_MONOTONIC, &ts); ret = (unsigned)ts.tv_nsec; } srand(ret); diff --git a/tests/Makefile.am b/tests/Makefile.am index 2f464ac..00ed85f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,25 +7,25 @@ check_pmalloc_SOURCES = check_pmalloc.c check_common.c check_pmalloc_CFLAGS = -I../src @CHECK_CFLAGS@ -check_pmalloc_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ +check_pmalloc_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ -lrt check_pmrecycle_SOURCES = check_pmrecycle.c check_common.c check_pmrecycle_CFLAGS = -I../src @CHECK_CFLAGS@ -check_pmrecycle_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ +check_pmrecycle_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ -lrt check_pmclear_SOURCES = check_pmclear.c check_common.c check_pmclear_CFLAGS = -I../src @CHECK_CFLAGS@ -check_pmclear_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ +check_pmclear_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ -lrt check_pmsimulate_SOURCES = check_pmsimulate.c check_common.c check_pmsimulate_CFLAGS = -I../src @CHECK_CFLAGS@ -check_pmsimulate_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ +check_pmsimulate_LDADD = ../src/libpmalloc.la @CHECK_LIBS@ -lrt clean-local: rm -f *.data *.dat diff --git a/tests/check_common.c b/tests/check_common.c index 9d5d7c3..8b2563f 100644 --- a/tests/check_common.c +++ b/tests/check_common.c @@ -9,25 +9,10 @@ Persistent Memory Library Tests #include "pmalloc.h" #include "check_common.h" -#ifdef __MACH__ -#include -#include -#endif - void init_random() { struct timespec ts; - #ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time - clock_serv_t cclock; - mach_timespec_t mts; - host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock); - clock_get_time(cclock, &mts); - mach_port_deallocate(mach_task_self(), cclock); - ts.tv_sec = mts.tv_sec; - ts.tv_nsec = mts.tv_nsec; - #else clock_gettime(CLOCK_MONOTONIC, &ts); - #endif srand((unsigned)ts.tv_nsec); }