X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Futils.cpp;h=52c89342b29a4fbfbc0d2b71aec465f59264d319;hp=9c643cf8b2dec5634c703474d5b3e976a58f3346;hb=609c9a508cfdc7b42c46c4f21d17639204165a00;hpb=b4806214e905752617691f851717033fd3f266c2 diff --git a/source/time/utils.cpp b/source/time/utils.cpp index 9c643cf..52c8934 100644 --- a/source/time/utils.cpp +++ b/source/time/utils.cpp @@ -1,14 +1,4 @@ -#ifdef WIN32 -#include -#else -#include -#include -#include -#endif -#include #include "datetime.h" -#include "rawtime_private.h" -#include "timedelta.h" #include "timestamp.h" #include "utils.h" @@ -17,47 +7,10 @@ using namespace std; namespace Msp { namespace Time { -TimeStamp now() -{ -#ifndef WIN32 - timeval tv; - gettimeofday(&tv, 0); - return TimeStamp(timeval_to_rawtime(tv)); -#else - FILETIME ft; - GetSystemTimeAsFileTime(&ft); - return TimeStamp(filetime_to_rawtime(ft)); -#endif -} - string format_now(const string &fmt) { return DateTime(now()).format(fmt); } -TimeDelta get_cpu_time() -{ -#ifndef WIN32 - rusage ru; - getrusage(RUSAGE_SELF, &ru); - return (ru.ru_utime.tv_sec+ru.ru_stime.tv_sec)*sec + (ru.ru_utime.tv_usec+ru.ru_stime.tv_usec)*usec; -#else - //XXX Figure out the function to use on Win32 - return TimeDelta(); -#endif -} - -void sleep(const TimeDelta &d) -{ -#ifndef WIN32 - timespec ts = rawtime_to_timespec(d.raw()); - while(nanosleep(&ts, 0)==-1) - if(errno!=EINTR) - throw system_error("nanosleep"); -#else - Sleep((DWORD)(d/msec)); -#endif -} - } // namespace Time } // namespace Msp