X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Futils.cpp;h=52c89342b29a4fbfbc0d2b71aec465f59264d319;hp=d69febcb0a52a2326b2f7cf05c39cc92e18607a2;hb=be8ea216d23bf36bdfb2d3e302638782575fc136;hpb=1f0843257065789231a9949e0a81b79afd7bbebe diff --git a/source/time/utils.cpp b/source/time/utils.cpp index d69febc..52c8934 100644 --- a/source/time/utils.cpp +++ b/source/time/utils.cpp @@ -1,15 +1,5 @@ -#ifdef WIN32 -#include -#else -#include -#include -#include -#endif -#include #include "datetime.h" -#include "timedelta.h" #include "timestamp.h" -#include "units.h" #include "utils.h" using namespace std; @@ -17,64 +7,10 @@ using namespace std; namespace Msp { namespace Time { -TimeStamp now() -{ -#ifndef WIN32 - timeval tv; - gettimeofday(&tv, 0); - return TimeStamp(tv.tv_sec*1000000LL+tv.tv_usec); -#else - static RawTime epoch = 0; - if(!epoch) - { - SYSTEMTIME st; - st.wYear = 1970; - st.wMonth = 1; - st.wDay = 1; - st.wHour = 0; - st.wMinute = 0; - st.wSecond = 0; - st.wMilliseconds = 0; - - FILETIME ft; - SystemTimeToFileTime(&st, &ft); - epoch = (ft.dwLowDateTime+(static_cast(ft.dwHighDateTime)<<32))/10; - } - - FILETIME ft; - GetSystemTimeAsFileTime(&ft); - return TimeStamp((ft.dwLowDateTime+(static_cast(ft.dwHighDateTime)<<32))/10-epoch); -#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 = d; - while(nanosleep(&ts, 0)==-1) - if(errno!=EINTR) - throw system_error("nanosleep"); -#else - Sleep((DWORD)(d/msec)); -#endif -} - } // namespace Time } // namespace Msp