Commit ff505515 authored by william's avatar william

use system monotonic time instead of clock()

parent a605dc78
...@@ -34,8 +34,13 @@ else ...@@ -34,8 +34,13 @@ else
SOFLAGS = -shared SOFLAGS = -shared
endif endif
ifeq ($(shell -uname -s), Linux)
LIBS = -lrt
endif
bench.so: bench.c bench.so: bench.c
$(CC) -o $@ $< $(CPPFLAGS) -DLUA_COMPAT_ALL $(CFLAGS) -Wno-unused-function $(SOFLAGS) $(CC) -o $@ $< $(CPPFLAGS) -DLUA_COMPAT_ALL $(CFLAGS) -Wno-unused-function $(SOFLAGS) $(LIBS)
bench-wheel8.so: CPPFLAGS+=-DWHEEL_BIT=3 -DWHEEL_NUM=$(WHEEL_NUM) bench-wheel8.so: CPPFLAGS+=-DWHEEL_BIT=3 -DWHEEL_NUM=$(WHEEL_NUM)
......
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#if __APPLE__
#include <mach/mach_time.h>
#endif
#include <lua.h> #include <lua.h>
#include <lualib.h> #include <lualib.h>
#include <lauxlib.h> #include <lauxlib.h>
...@@ -24,11 +28,29 @@ struct bench { ...@@ -24,11 +28,29 @@ struct bench {
struct timeout *timeout; struct timeout *timeout;
struct benchops ops; struct benchops ops;
timeout_t curtime; timeout_t curtime;
#if __APPLE__
mach_timebase_info_data_t timebase;
#endif
}; /* struct bench */ }; /* struct bench */
static int bench_clock(lua_State *L) { static int bench_clock(lua_State *L) {
lua_pushnumber(L, (double)clock() / CLOCKS_PER_SEC); #if __APPLE__
struct bench *B = lua_touserdata(L, 1);
unsigned long long abt;
abt = mach_absolute_time();
abt = abt * B->timebase.numer / B->timebase.denom;
lua_pushnumber(L, (double)abt / 1000000000L);
#else
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
lua_pushnumber(L, (double)ts.tv_sec + ((double)ts.tv_nsec / 1000000000L));
#endif
return 1; return 1;
} /* bench_clock() */ } /* bench_clock() */
...@@ -45,6 +67,10 @@ static int bench_new(lua_State *L) { ...@@ -45,6 +67,10 @@ static int bench_new(lua_State *L) {
B = lua_newuserdata(L, sizeof *B); B = lua_newuserdata(L, sizeof *B);
memset(B, 0, sizeof *B); memset(B, 0, sizeof *B);
#if __APPLE__
mach_timebase_info(&B->timebase);
#endif
luaL_getmetatable(L, "BENCH*"); luaL_getmetatable(L, "BENCH*");
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment