From 1ab127b8091f2629cbb8191c075ea671b2d76a11 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 6 Mar 2016 02:23:50 +0100 Subject: [PATCH] first cleanups in the WIN32 preprocessor stuff --- include/xbt/base.h | 23 ++------- src/simix/smx_global.cpp | 18 ++++--- src/surf/surf_interface.cpp | 8 ++-- src/xbt/xbt_os_time.c | 93 ++++++------------------------------- 4 files changed, 30 insertions(+), 112 deletions(-) diff --git a/include/xbt/base.h b/include/xbt/base.h index 050bedf173..f79b495bf6 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -63,7 +63,7 @@ # 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 ) @@ -71,7 +71,7 @@ # 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 */ @@ -159,7 +159,7 @@ * http://unixwiz.net/techtips/win32-callconv.html <-- good documentation */ -#ifdef _XBT_WIN32 +#ifdef _WIN32 # ifndef _XBT_CALL # define _XBT_CALL __cdecl # endif @@ -206,7 +206,7 @@ # 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 @@ -232,21 +232,6 @@ #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 diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index a61a3d8480..1bea3ddd2a 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -75,8 +75,8 @@ static void _XBT_CALL inthandler(int ignored) exit(1); } -#ifndef WIN32 -static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context) +#ifndef _WIN32 +static void segvhandler(int signum, siginfo_t *siginfo, void *context) { if (siginfo->si_signo == SIGSEGV && siginfo->si_code == SEGV_ACCERR) { fprintf(stderr, @@ -103,9 +103,9 @@ static void _XBT_CALL segvhandler(int signum, siginfo_t *siginfo, void *context) #else fprintf(stderr, "Sadly, your system does not support --cfg=smpi/privatize_global_variables:yes (yet).\n"); -#endif +#endif /* HAVE_PRIVATIZATION */ } -#endif +#endif /* HAVE_SMPI */ } raise(signum); } @@ -124,8 +124,7 @@ static void install_segvhandler(void) stack.ss_flags = 0; if (sigaltstack(&stack, &old_stack) == -1) { - XBT_WARN("Failed to register alternate signal stack: %s", - strerror(errno)); + XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno)); return; } if (!(old_stack.ss_flags & SS_DISABLE)) { @@ -140,8 +139,7 @@ static void install_segvhandler(void) sigemptyset(&action.sa_mask); if (sigaction(SIGSEGV, &action, &old_action) == -1) { - XBT_WARN("Failed to register signal handler for SIGSEGV: %s", - strerror(errno)); + XBT_WARN("Failed to register signal handler for SIGSEGV: %s", strerror(errno)); return; } if ((old_action.sa_flags & SA_SIGINFO) || old_action.sa_handler != SIG_DFL) { @@ -152,7 +150,7 @@ static void install_segvhandler(void) } } -#endif +#endif /* _WIN32 */ /********************************* SIMIX **************************************/ double SIMIX_timer_next(void) @@ -244,7 +242,7 @@ void SIMIX_global_init(int *argc, char **argv) /* Prepare to display some more info when dying on Ctrl-C pressing */ signal(SIGINT, inthandler); -#ifndef WIN32 +#ifndef _WIN32 install_segvhandler(); #endif /* register a function to be called by SURF after the environment creation */ diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index e1424f4741..40f3e9d226 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -114,7 +114,7 @@ double surf_get_clock(void) return NOW; } -#ifdef _XBT_WIN32 +#ifdef _WIN32 # define FILE_DELIM "\\" #else # define FILE_DELIM "/" /* FIXME: move to better location */ @@ -144,7 +144,7 @@ FILE *surf_fopen(const char *name, const char *mode) return NULL; } -#ifdef _XBT_WIN32 +#ifdef _WIN32 #include #define MAX_DRIVE 26 static const char *disk_drives_letter_table[MAX_DRIVE] = { @@ -163,7 +163,7 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = { const char *__surf_get_initial_path(void) { -#ifdef _XBT_WIN32 +#ifdef _WIN32 unsigned i; char current_directory[MAX_PATH + 1] = { 0 }; unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); @@ -191,7 +191,7 @@ const char *__surf_get_initial_path(void) */ int __surf_is_absolute_file_path(const char *file_path) { -#ifdef _XBT_WIN32 +#ifdef _WIN32 WIN32_FIND_DATA wfd = { 0 }; HANDLE hFile = FindFirstFile(file_path, &wfd); diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index e6171866b0..4c6d37ad4e 100644 --- a/src/xbt/xbt_os_time.c +++ b/src/xbt/xbt_os_time.c @@ -12,7 +12,7 @@ #include "src/portable.h" #include /* floor */ -#ifdef _XBT_WIN32 +#ifdef _WIN32 #include #include #endif @@ -42,17 +42,8 @@ double xbt_os_time(void) #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; @@ -64,7 +55,6 @@ double xbt_os_time(void) 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)); @@ -76,7 +66,7 @@ double xbt_os_time(void) void xbt_os_sleep(double sec) { -#ifdef _XBT_WIN32 +#ifdef _WIN32 Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000)); #elif HAVE_NANOSLEEP @@ -107,7 +97,7 @@ void xbt_os_sleep(double sec) 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; @@ -135,7 +125,7 @@ double xbt_os_timer_elapsed(xbt_os_timer_t timer) ((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) - @@ -156,18 +146,9 @@ void xbt_os_walltimer_start(xbt_os_timer_t timer) 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; @@ -179,7 +160,6 @@ void xbt_os_walltimer_start(xbt_os_timer_t timer) 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)); @@ -197,18 +177,9 @@ void xbt_os_walltimer_resume(xbt_os_timer_t timer) 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; @@ -220,7 +191,6 @@ void xbt_os_walltimer_resume(xbt_os_timer_t timer) 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)); @@ -233,16 +203,7 @@ void xbt_os_walltimer_stop(xbt_os_timer_t timer) 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; @@ -254,7 +215,6 @@ void xbt_os_walltimer_stop(xbt_os_timer_t timer) timer->stop.tv_sec = (long) (tm / 1000000L); timer->stop.tv_usec = (long) (tm % 1000000L); -# endif #else timer->stop = (unsigned long int) (time(NULL)); #endif @@ -270,12 +230,9 @@ void xbt_os_cputimer_start(xbt_os_timer_t timer) 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); @@ -288,7 +245,6 @@ void xbt_os_cputimer_start(xbt_os_timer_t timer) 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 } @@ -302,12 +258,9 @@ void xbt_os_cputimer_resume(xbt_os_timer_t timer) 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); @@ -320,8 +273,6 @@ void xbt_os_cputimer_resume(xbt_os_timer_t timer) 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 } @@ -331,10 +282,7 @@ void xbt_os_cputimer_stop(xbt_os_timer_t timer) 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); @@ -347,7 +295,6 @@ void xbt_os_cputimer_stop(xbt_os_timer_t timer) 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 } @@ -370,10 +317,7 @@ void xbt_os_threadtimer_start(xbt_os_timer_t timer) 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); @@ -386,7 +330,6 @@ void xbt_os_threadtimer_start(xbt_os_timer_t timer) 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 } @@ -409,12 +352,9 @@ void xbt_os_threadtimer_resume(xbt_os_timer_t timer) 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); @@ -427,7 +367,6 @@ void xbt_os_threadtimer_resume(xbt_os_timer_t timer) 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 } @@ -444,10 +383,7 @@ void xbt_os_threadtimer_stop(xbt_os_timer_t timer) 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); @@ -460,6 +396,5 @@ void xbt_os_threadtimer_stop(xbt_os_timer_t timer) 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 } -- 2.20.1