Isolate platform-dependent RawTime conversion functions to a private header

[libs/core.git] / source / time / utils.cpp

diff --git a/source/time/utils.cpp b/source/time/utils.cpp
index 1d0b8d0ec93d9d1fc08fa5041099ba34349d5d81..b59a8af0ea944fdde78cf77d4ee5c38cf4b6aa15 100644 (file)
--- a/source/time/utils.cpp
+++ b/source/time/utils.cpp
@@ -1,17 +1,13 @@
-/* $Id$
-
-This file is part of libmspcore     
-Copyright © 2006-2008  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 "rawtime_private.h"
 #include "timedelta.h"
 #include "timestamp.h"
 #include "units.h"
@@ -22,9 +18,6 @@ using namespace std;
 namespace Msp {
 namespace Time {
 
-/**
-Returns the current timestamp.
-*/
 TimeStamp now()
 {
 #ifndef WIN32
@@ -60,9 +53,6 @@ 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
@@ -75,18 +65,15 @@ TimeDelta get_cpu_time()
 #endif
 }
 
-/**
-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 = rawtime_to_timespec(d.raw());
+       while(nanosleep(&ts, 0)==-1)
+               if(errno!=EINTR)
+                       throw system_error("nanosleep");
 #else
        Sleep((DWORD)(d/msec));
-       return 0;
 #endif
 }