From 06f33ff1ee0c0e8345cb6d5b84ce5db9f043203d Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Fri, 23 Mar 2012 13:12:26 +0100 Subject: [PATCH] Remove last platform specific code form thread.cpp A somewhat tricky function pointer cast allows us to move the platform specifics to lock.h, the cast is tricky because return type is not the same of the casted function in Linux (for Windows return type is a DWORD that is a long) but this should not be a problem as long as the size is the same; From: http://stackoverflow.com/questions/188839/function-pointer-cast-to-different-signature "OpenSSL was only casting functions pointers to other function types taking and returning the same number of values of the same exact sizes, and this (assuming you're not dealing with floating-point) happens to be safe across all the platforms and calling conventions I know of. However, anything else is potentially unsafe." No functional change. Signed-off-by: Marco Costalba --- src/lock.h | 5 +++-- src/thread.cpp | 10 ++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/lock.h b/src/lock.h index 1e71305e..85d32a5c 100644 --- a/src/lock.h +++ b/src/lock.h @@ -27,6 +27,7 @@ typedef pthread_mutex_t Lock; typedef pthread_cond_t WaitCondition; typedef pthread_t ThreadHandle; +typedef void*(*start_fn)(void*); # define lock_init(x) pthread_mutex_init(&(x), NULL) # define lock_grab(x) pthread_mutex_lock(&(x)) @@ -37,7 +38,7 @@ typedef pthread_t ThreadHandle; # define cond_signal(x) pthread_cond_signal(&(x)) # define cond_wait(x,y) pthread_cond_wait(&(x),&(y)) # define cond_timedwait(x,y,z) pthread_cond_timedwait(&(x),&(y),z) -# define thread_create(x,f,id) !pthread_create(&(x),NULL,f,&(id)) +# define thread_create(x,f,id) !pthread_create(&(x),NULL,(start_fn)f,&(id)) # define thread_join(x) pthread_join(x, NULL) #else @@ -67,7 +68,7 @@ typedef HANDLE ThreadHandle; # define cond_signal(x) SetEvent(x) # define cond_wait(x,y) { lock_release(y); WaitForSingleObject(x, INFINITE); lock_grab(y); } # define cond_timedwait(x,y,z) { lock_release(y); WaitForSingleObject(x,z); lock_grab(y); } -# define thread_create(x,f,id) (x = CreateThread(NULL,0,f,&(id),0,NULL), x != NULL) +# define thread_create(x,f,id) (x = CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)f,&(id),0,NULL), x != NULL) # define thread_join(x) { WaitForSingleObject(x, INFINITE); CloseHandle(x); } #endif diff --git a/src/thread.cpp b/src/thread.cpp index 31c5961d..5c23aa50 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -36,13 +36,7 @@ namespace { extern "C" { // and last thread are special. First one is the main search thread while the // last one mimics a timer, they run in main_loop() and timer_loop(). -#if defined(_WIN32) || defined(_WIN64) - DWORD WINAPI start_routine(LPVOID thread) { -#else - void* start_routine(void* thread) { -#endif - - Thread* th = (Thread*)thread; + long start_routine(Thread* th) { if (th->threadID == 0) th->main_loop(); @@ -299,7 +293,7 @@ bool ThreadsManager::available_slave_exists(int master) const { template Value ThreadsManager::split(Position& pos, Stack* ss, Value alpha, Value beta, Value bestValue, Move* bestMove, Depth depth, - Move threatMove, int moveCount, MovePicker *mp, int nodeType) { + Move threatMove, int moveCount, MovePicker* mp, int nodeType) { assert(pos.pos_is_ok()); assert(bestValue > -VALUE_INFINITE); assert(bestValue <= alpha); -- 2.39.2