diff options
author | Rickard Green <[email protected]> | 2010-12-09 15:09:50 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2010-12-14 16:58:41 +0100 |
commit | 267a5e7f6e0d578b3c9224fb87b78f76a9300c87 (patch) | |
tree | 39ca64b0dba29207e42c5572b59537028c7dab88 /erts/lib_src | |
parent | b297bfdd47b0a39831d8cc2541aeb910f9af0bca (diff) | |
download | otp-267a5e7f6e0d578b3c9224fb87b78f76a9300c87.tar.gz otp-267a5e7f6e0d578b3c9224fb87b78f76a9300c87.tar.bz2 otp-267a5e7f6e0d578b3c9224fb87b78f76a9300c87.zip |
Remove unused ethread time functionality
Diffstat (limited to 'erts/lib_src')
-rw-r--r-- | erts/lib_src/pthread/ethread.c | 26 | ||||
-rw-r--r-- | erts/lib_src/win/ethread.c | 39 |
2 files changed, 0 insertions, 65 deletions
diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c index 7e5f92655c..fc6aef2d1f 100644 --- a/erts/lib_src/pthread/ethread.c +++ b/erts/lib_src/pthread/ethread.c @@ -349,32 +349,6 @@ ethr_leave_ts_event(ethr_ts_event *tsep) } /* - * Current time - */ - -int -ethr_time_now(ethr_timeval *time) -{ - int res; - struct timeval tv; -#if ETHR_XCHK - if (ethr_not_inited__) { - ETHR_ASSERT(0); - return EACCES; - } - if (!time) { - ETHR_ASSERT(0); - return EINVAL; - } -#endif - - res = gettimeofday(&tv, NULL); - time->tv_sec = (long) tv.tv_sec; - time->tv_nsec = ((long) tv.tv_usec)*1000; - return res; -} - -/* * Thread specific data */ diff --git a/erts/lib_src/win/ethread.c b/erts/lib_src/win/ethread.c index 63cf99e317..e51d921c24 100644 --- a/erts/lib_src/win/ethread.c +++ b/erts/lib_src/win/ethread.c @@ -128,28 +128,6 @@ static unsigned __stdcall thr_wrapper(LPVOID vtwd) return 0; } -#ifdef __GNUC__ -#define LL_LITERAL(X) X##LL -#else -#define LL_LITERAL(X) X##i64 -#endif - -#define EPOCH_JULIAN_DIFF LL_LITERAL(11644473600) - -static ETHR_INLINE void -get_curr_time(long *sec, long *nsec) -{ - SYSTEMTIME t; - FILETIME ft; - LONGLONG lft; - - GetSystemTime(&t); - SystemTimeToFileTime(&t, &ft); - memcpy(&lft, &ft, sizeof(lft)); - *nsec = ((long) (lft % LL_LITERAL(10000000)))*100; - *sec = (long) ((lft / LL_LITERAL(10000000)) - EPOCH_JULIAN_DIFF); -} - /* internal exports */ int @@ -517,23 +495,6 @@ ethr_equal_tids(ethr_tid tid1, ethr_tid tid2) return tid1.id == tid2.id && tid1.id != ETHR_INVALID_TID_ID; } -int -ethr_time_now(ethr_timeval *time) -{ -#if ETHR_XCHK - if (ethr_not_inited__) { - ETHR_ASSERT(0); - return EACCES; - } - if (!time) { - ETHR_ASSERT(0); - return EINVAL; - } -#endif - get_curr_time(&time->tv_sec, &time->tv_nsec); - return 0; -} - /* * Thread specific data */ |