Remove deprecated things

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

diff --git a/source/time/utils.cpp b/source/time/utils.cpp
index 49acd7791180616be36d56f29f0af99a30a55e42..52c89342b29a4fbfbc0d2b71aec465f59264d319 100644 (file)
--- a/source/time/utils.cpp
+++ b/source/time/utils.cpp
@@ -1,83 +1,15 @@
-/*
-This file is part of libmspframework     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <sys/resource.h>
-#include <sys/time.h>
-#endif
-#include "timedelta.h"
+#include "datetime.h"
 #include "timestamp.h"
-#include "units.h"
 #include "utils.h"
 
+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 int64_t 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+(int64_t)ft.dwHighDateTime<<32)/10;
-       }
-       
-       FILETIME ft;
-       GetSystemTimeAsFileTime(&ft);
-       return TimeStamp((ft.dwLowDateTime+(int64_t)ft.dwHighDateTime<<32)/10-epoch);
-#endif
-}
-
-/**
-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)
+string format_now(const string &fmt)
 {
-#ifndef WIN32
-       timespec ts;
-       d.fill_timespec(ts);
-       return nanosleep(&ts, 0);
-#else
-       Sleep(d/msec);
-       return 0;
-#endif
+       return DateTime(now()).format(fmt);
 }
 
 } // namespace Time