X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Futils.cpp;h=7da0aede047aab2e9f2a839005879a61f187df78;hb=62a984b46e08740d19cb055f01be3365982f6b9d;hp=ad0d24550338f7c22117057a2354d42f93e6c09e;hpb=80bbee2f401b4af71cb1b80508bdb0d2bb61fa40;p=libs%2Fcore.git

diff --git a/source/time/utils.cpp b/source/time/utils.cpp
index ad0d245..7da0aed 100644
--- a/source/time/utils.cpp
+++ b/source/time/utils.cpp
@@ -1,14 +1,11 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
 #ifdef WIN32
 #include <windows.h>
 #else
 #include <sys/resource.h>
 #include <sys/time.h>
+#include <cerrno>
 #endif
+#include <msp/core/systemerror.h>
 #include "datetime.h"
 #include "timedelta.h"
 #include "timestamp.h"
@@ -30,26 +27,26 @@ TimeStamp now()
 	gettimeofday(&tv, 0);
 	return TimeStamp(tv.tv_sec*1000000LL+tv.tv_usec);
 #else
-	static int64_t epoch=0;
+	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;
+		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+(int64_t)ft.dwHighDateTime<<32)/10;
+		epoch = (ft.dwLowDateTime+(static_cast<RawTime>(ft.dwHighDateTime)<<32))/10;
 	}
 	
 	FILETIME ft;
 	GetSystemTimeAsFileTime(&ft);
-	return TimeStamp((ft.dwLowDateTime+(int64_t)ft.dwHighDateTime<<32)/10-epoch);
+	return TimeStamp((ft.dwLowDateTime+(static_cast<RawTime>(ft.dwHighDateTime)<<32))/10-epoch);
 #endif
 }
 
@@ -76,15 +73,15 @@ TimeDelta get_cpu_time()
 /**
 Sleeps for the given time.
 */
-int sleep(const TimeDelta &d)
+void sleep(const TimeDelta &d)
 {
 #ifndef WIN32
-	timespec ts;
-	d.fill_timespec(ts);
-	return nanosleep(&ts, 0);
+	timespec ts = d;
+	while(nanosleep(&ts, 0)==-1)
+		if(errno!=EINTR)
+			throw system_error("nanosleep");
 #else
 	Sleep((DWORD)(d/msec));
-	return 0;
 #endif
 }