X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Futils.cpp;h=52c89342b29a4fbfbc0d2b71aec465f59264d319;hp=123b2d9192c11edfb2fda29f1a7aa22d6cb6cd66;hb=HEAD;hpb=967785734be5c3fc6f75da122c2d93ebbb338271

diff --git a/source/time/utils.cpp b/source/time/utils.cpp
index 123b2d9..52c8934 100644
--- a/source/time/utils.cpp
+++ b/source/time/utils.cpp
@@ -1,13 +1,5 @@
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <sys/resource.h>
-#include <sys/time.h>
-#endif
 #include "datetime.h"
-#include "timedelta.h"
 #include "timestamp.h"
-#include "units.h"
 #include "utils.h"
 
 using namespace std;
@@ -15,72 +7,10 @@ using namespace std;
 namespace Msp {
 namespace Time {
 
-/**
-Returns the current timestamp.
-*/
-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<RawTime>(ft.dwHighDateTime)<<32))/10;
-	}
-	
-	FILETIME ft;
-	GetSystemTimeAsFileTime(&ft);
-	return TimeStamp((ft.dwLowDateTime+(static_cast<RawTime>(ft.dwHighDateTime)<<32))/10-epoch);
-#endif
-}
-
 string format_now(const string &fmt)
 {
 	return DateTime(now()).format(fmt);
 }
 
-/**
-Returns the CPU time used by the program so far.
-*/
-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
-}
-
-/**
-Sleeps for the given time.
-*/
-int sleep(const TimeDelta &d)
-{
-#ifndef WIN32
-	timespec ts = d;
-	return nanosleep(&ts, 0);
-#else
-	Sleep((DWORD)(d/msec));
-	return 0;
-#endif
-}
-
 } // namespace Time
 } // namespace Msp