# define XBT_ATTRIB_UNUSED
# define _XBT_GNUC_CONSTRUCTOR(prio)
# define _XBT_GNUC_DESTRUCTOR(prio)
-# define _XBT_NEED_INIT_PRAGMA 1
+# define _XBT_NEED_INIT_PRAGMA 1
#else
# define XBT_ATTRIB_PRINTF( format_idx, arg_idx )
# define XBT_ATTRIB_SCANF( format_idx, arg_idx )
# define XBT_ATTRIB_UNUSED
# define _XBT_GNUC_CONSTRUCTOR(prio)
# define _XBT_GNUC_DESTRUCTOR(prio)
-# define _XBT_NEED_INIT_PRAGMA 1
+# define _XBT_NEED_INIT_PRAGMA 1
#endif /* gcc or MSVC else */
* http://unixwiz.net/techtips/win32-callconv.html <-- good documentation
*/
-#ifdef _XBT_WIN32
+#ifdef _WIN32
# ifndef _XBT_CALL
# define _XBT_CALL __cdecl
# endif
# define XBT_PRIVATE
/* Link against the DLL */
-#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT))
+#elif (defined(_WIN32) && !defined(DLL_EXPORT))
# define XBT_PUBLIC(type) __declspec(dllimport) type
# define XBT_EXPORT_NO_IMPORT(type) type
# define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type
#endif
-#ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */
- #if defined(_WIN64)
- typedef __int64 ssize_t;
- #else
- typedef long ssize_t;
- #endif
-
-/* Microsoft wants to improve the code quality blah blah blah */
-/* See: https://msdn.microsoft.com/en-us/library/8ef0s5kh.aspx */
- /* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
- #define _CRT_NONSTDC_NO_WARNINGS
- /* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
- #define _CRT_SECURE_NO_WARNINGS
-#endif
-
#if !defined (max) && !defined(__cplusplus)
# define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#include "src/portable.h"
#include <math.h> /* floor */
-#ifdef _XBT_WIN32
+#ifdef _WIN32
#include <sys/timeb.h>
#include <windows.h>
#endif
#ifdef HAVE_GETTIMEOFDAY
struct timeval tv;
gettimeofday(&tv, NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
struct timeval tv;
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- struct _timeb tm;
-
- _ftime(&tm);
-
- tv.tv_sec = tm.time;
- tv.tv_usec = tm.millitm * 1000;
-
-# else
FILETIME ft;
unsigned __int64 tm;
tv.tv_sec = (long) (tm / 1000000L);
tv.tv_usec = (long) (tm % 1000000L);
-# endif /* windows version checker */
#else /* not windows, no gettimeofday => poor resolution */
return (double) (time(NULL));
void xbt_os_sleep(double sec)
{
-#ifdef _XBT_WIN32
+#ifdef _WIN32
Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000));
#elif HAVE_NANOSLEEP
struct s_xbt_os_timer {
#ifdef HAVE_POSIX_GETTIME
struct timespec start, stop, elapse;
-#elif defined(HAVE_GETTIMEOFDAY) || defined(_XBT_WIN32)
+#elif defined(HAVE_GETTIMEOFDAY) || defined(_WIN32)
struct timeval start, stop, elapse;
#else
unsigned long int start, stop, elapse;
((double) timer->elapse.tv_sec ) +
((((double) timer->stop.tv_nsec) -
((double) timer->start.tv_nsec) + ((double) timer->elapse.tv_nsec )) / 1e9);
-#elif defined(HAVE_GETTIMEOFDAY) || defined(_XBT_WIN32)
+#elif defined(HAVE_GETTIMEOFDAY) || defined(_WIN32)
return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec)
+ ((double) timer->elapse.tv_sec ) +
((((double) timer->stop.tv_usec) -
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- struct _timeb tm;
-
- _ftime(&tm);
-
- timer->start.tv_sec = tm.time;
- timer->start.tv_usec = tm.millitm * 1000;
-
-# else
FILETIME ft;
unsigned __int64 tm;
timer->start.tv_sec = (long) (tm / 1000000L);
timer->start.tv_usec = (long) (tm % 1000000L);
-# endif /* windows version checker */
#else
timer->elapse = 0;
timer->start = (unsigned long int) (time(NULL));
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- struct _timeb tm;
-
- _ftime(&tm);
-
- timer->start.tv_sec = tm.time;
- timer->start.tv_usec = tm.millitm * 1000;
-
-# else
FILETIME ft;
unsigned __int64 tm;
timer->start.tv_sec = (long) (tm / 1000000L);
timer->start.tv_usec = (long) (tm % 1000000L);
-# endif
#else
timer->elapse = timer->stop - timer->start;
timer->start = (unsigned long int) (time(NULL));
clock_gettime(CLOCK_REALTIME, &(timer->stop));
#elif defined(HAVE_GETTIMEOFDAY)
gettimeofday(&(timer->stop), NULL);
-#elif defined(_XBT_WIN32)
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- struct _timeb tm;
-
- _ftime(&tm);
-
- timer->stop.tv_sec = tm.time;
- timer->stop.tv_usec = tm.millitm * 1000;
-
-# else
+#elif defined(_WIN32)
FILETIME ft;
unsigned __int64 tm;
timer->stop.tv_sec = (long) (tm / 1000000L);
timer->stop.tv_usec = (long) (tm % 1000000L);
-# endif
#else
timer->stop = (unsigned long int) (time(NULL));
#endif
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- THROW_UNIMPLEMENTED;
-# else
HANDLE h = GetCurrentProcess();
FILETIME creationTime, exitTime, kernelTime, userTime;
GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
utm /= 10;
timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-# endif /* windows version checker */
#endif
}
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- THROW_UNIMPLEMENTED;
-# else
HANDLE h = GetCurrentProcess();
FILETIME creationTime, exitTime, kernelTime, userTime;
GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
utm /= 10;
timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-# endif /* windows version checker */
-
#endif
}
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->stop));
#elif defined(HAVE_GETTIMEOFDAY)
gettimeofday(&(timer->stop), NULL);
-#elif defined(_XBT_WIN32)
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- THROW_UNIMPLEMENTED;
-# else
+#elif defined(_WIN32)
HANDLE h = GetCurrentProcess();
FILETIME creationTime, exitTime, kernelTime, userTime;
GetProcessTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
utm /= 10;
timer->stop.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
timer->stop.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-# endif /* windows version checker */
#endif
}
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- THROW_UNIMPLEMENTED;
-# else
+#elif defined(_WIN32)
HANDLE h = GetCurrentThread();
FILETIME creationTime, exitTime, kernelTime, userTime;
GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
utm /= 10;
timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-# endif /* windows version checker */
#endif
}
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
gettimeofday(&(timer->start), NULL);
-#elif defined(_XBT_WIN32)
+#elif defined(_WIN32)
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- THROW_UNIMPLEMENTED;
-# else
HANDLE h = GetCurrentThread();
FILETIME creationTime, exitTime, kernelTime, userTime;
GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
utm /= 10;
timer->start.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
timer->start.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-# endif /* windows version checker */
#endif
}
timer->stop.tv_sec = thi->system_time.seconds + thi->user_time.seconds;
#elif defined(HAVE_GETTIMEOFDAY)//if nothing else is available, return just time
gettimeofday(&(timer->stop), NULL);
-#elif defined(_XBT_WIN32)
-# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400)
- THROW_UNIMPLEMENTED;
-# else
+#elif defined(_WIN32)
HANDLE h = GetCurrentThread();
FILETIME creationTime, exitTime, kernelTime, userTime;
GetThreadTimes(h, &creationTime, &exitTime, &kernelTime, &userTime);
utm /= 10;
timer->stop.tv_sec = (long) (ktm / 1000000L) + (long) (utm / 1000000L);
timer->stop.tv_usec = (long) (ktm % 1000000L) + (long) (utm % 1000000L);
-# endif /* windows version checker */
#endif
}