X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dfe761f4bc8d35a74c3da5fabe99630c0788001f..d6ae7b948dffd7f9268106a86f9de21d7d0a3621:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 0405622652..46196d6be7 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -4,7 +4,7 @@ /* Used in RL to get win/lin portability, and in SG when CONTEXT_THREAD */ /* in SG, when using CONTEXT_UCONTEXT, xbt_os_thread_stub is used instead */ -/* Copyright 2006,2007 Malek Cherier, Martin Quinson +/* Copyright 2006,2007 Malek Cherier, Martin Quinson * All right reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -22,9 +22,23 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os,xbt,"Synchronization mechanism (OS-l /* ********************************* PTHREAD IMPLEMENTATION ************************************ */ #ifdef HAVE_PTHREAD_H + #include #include +#ifdef HAVE_MUTEX_TIMEDLOCK +/* redefine the function header since we fail to get this from system headers on amd (at least) */ +int pthread_mutex_timedlock(pthread_mutex_t *mutex, + const struct timespec *abs_timeout); +#endif + + +/* use named sempahore when sem_init() does not work */ +#ifndef HAVE_SEM_INIT + static int next_sem_ID = 0; + static xbt_os_mutex_t next_sem_ID_lock; +#endif + typedef struct xbt_os_thread_ { pthread_t t; char *name; @@ -58,10 +72,10 @@ static void _os_thread_ex_terminate(xbt_ex_t * e) { void xbt_os_thread_mod_init(void) { int errcode; - + if (thread_mod_inited) return; - + if ((errcode=pthread_key_create(&xbt_self_thread_key, NULL))) THROW0(system_error,errcode,"pthread_key_create failed for xbt_self_thread_key"); @@ -76,26 +90,39 @@ void xbt_os_thread_mod_init(void) { __xbt_ex_terminate = _os_thread_ex_terminate; thread_mod_inited = 1; + + #ifndef HAVE_SEM_WAIT + next_sem_ID_lock = xbt_os_mutex_init(); + #endif + } void xbt_os_thread_mod_exit(void) { - /* FIXME: don't try to free our key on shutdown. + /* FIXME: don't try to free our key on shutdown. Valgrind detects no leak if we don't, and whine if we try to */ // int errcode; - + // if ((errcode=pthread_key_delete(xbt_self_thread_key))) // THROW0(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key"); + free(main_thread->exception); + free(main_thread); + main_thread = NULL; + thread_mod_inited=0; +#ifndef HAVE_SEM_WAIT + xbt_os_mutex_destroy(next_sem_ID_lock); +#endif } static void * wrapper_start_routine(void *s) { - xbt_os_thread_t t = s; + xbt_os_thread_t t = s; int errcode; if ((errcode=pthread_setspecific(xbt_self_thread_key,t))) THROW0(system_error,errcode, - "pthread_setspecific failed for xbt_self_thread_key"); - + "pthread_setspecific failed for xbt_self_thread_key"); + return (*(t->start_routine))(t->param); } + xbt_os_thread_t xbt_os_thread_create(const char*name, pvoid_f_pvoid_t start_routine, void* param) { @@ -107,10 +134,10 @@ xbt_os_thread_t xbt_os_thread_create(const char*name, res_thread->param = param; res_thread->exception = xbt_new(ex_ctx_t, 1); XBT_CTX_INITIALIZE(res_thread->exception); - - if ((errcode = pthread_create(&(res_thread->t), NULL, + + if ((errcode = pthread_create(&(res_thread->t), NULL, wrapper_start_routine, res_thread))) - THROW1(system_error,errcode, + THROW1(system_error,errcode, "pthread_create failed: %s",strerror(errcode)); return res_thread; @@ -124,22 +151,25 @@ const char* xbt_os_thread_self_name(void) { xbt_os_thread_t self = xbt_os_thread_self(); return self?self->name:"main"; } -void +void xbt_os_thread_join(xbt_os_thread_t thread,void ** thread_return) { - - int errcode; - + + int errcode; + if ((errcode = pthread_join(thread->t,thread_return))) THROW1(system_error,errcode, "pthread_join failed: %s", strerror(errcode)); if (thread->exception) free(thread->exception); + if (thread->name) + free(thread->name); + if (thread == main_thread) /* just killed main thread */ main_thread = NULL; - free(thread); -} + free(thread); +} void xbt_os_thread_exit(int *retval) { pthread_exit(retval); @@ -150,7 +180,7 @@ xbt_os_thread_t xbt_os_thread_self(void) { if (!thread_mod_inited) return NULL; - + res = pthread_getspecific(xbt_self_thread_key); if (!res) res = main_thread; @@ -171,28 +201,89 @@ typedef struct xbt_os_mutex_ { pthread_mutex_t m; } s_xbt_os_mutex_t; +#include +#include + xbt_os_mutex_t xbt_os_mutex_init(void) { xbt_os_mutex_t res = xbt_new(s_xbt_os_mutex_t,1); int errcode; - + if ((errcode = pthread_mutex_init(&(res->m),NULL))) THROW1(system_error,errcode,"pthread_mutex_init() failed: %s", strerror(errcode)); - + return res; } -void xbt_os_mutex_lock(xbt_os_mutex_t mutex) { +void xbt_os_mutex_acquire(xbt_os_mutex_t mutex) { int errcode; - + if ((errcode=pthread_mutex_lock(&(mutex->m)))) THROW2(system_error,errcode,"pthread_mutex_lock(%p) failed: %s", mutex, strerror(errcode)); } -void xbt_os_mutex_unlock(xbt_os_mutex_t mutex) { + +void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) { int errcode; - + + if (delay < 0) { + xbt_os_mutex_acquire(mutex); + + } else if (delay == 0) { + errcode=pthread_mutex_trylock(&(mutex->m)); + + switch (errcode) { + case 0: + return; + case ETIMEDOUT: + THROW1(timeout_error,0,"mutex %p not ready",mutex); + default: + THROW2(system_error,errcode,"xbt_mutex_timedacquire(%p) failed: %s",mutex, strerror(errcode)); + } + + + } else { + +#ifdef HAVE_MUTEX_TIMEDLOCK + struct timespec ts_end; + double end = delay + xbt_os_time(); + + ts_end.tv_sec = (time_t) floor(end); + ts_end.tv_nsec = (long) ( ( end - ts_end.tv_sec) * 1000000000); + DEBUG2("pthread_mutex_timedlock(%p,%p)",&(mutex->m), &ts_end); + + errcode=pthread_mutex_timedlock(&(mutex->m),&ts_end); + +#else /* Well, let's reimplement it since those lazy libc dudes didn't */ + double start = xbt_os_time(); + do { + errcode = pthread_mutex_trylock(&(mutex->m)); + if (errcode == EBUSY) + xbt_os_thread_yield(); + } while (errcode == EBUSY && xbt_os_time()-start m)))) THROW2(system_error,errcode,"pthread_mutex_unlock(%p) failed: %s", mutex, strerror(errcode)); @@ -200,9 +291,9 @@ void xbt_os_mutex_unlock(xbt_os_mutex_t mutex) { void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) { int errcode; - + if (!mutex) return; - + if ((errcode=pthread_mutex_destroy(&(mutex->m)))) THROW2(system_error,errcode,"pthread_mutex_destroy(%p) failed: %s", mutex, strerror(errcode)); @@ -232,13 +323,12 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) { cond,mutex, strerror(errcode)); } -#include -#include + void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double delay) { int errcode; struct timespec ts_end; double end = delay + xbt_os_time(); - + if (delay < 0) { xbt_os_cond_wait(cond,mutex); } else { @@ -254,7 +344,7 @@ void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double dela default: THROW4(system_error,errcode,"pthread_cond_timedwait(%p,%p,%f) failed: %s", cond,mutex, delay, strerror(errcode)); - } + } } } @@ -264,7 +354,7 @@ void xbt_os_cond_signal(xbt_os_cond_t cond) { THROW2(system_error,errcode,"pthread_cond_signal(%p) failed: %s", cond, strerror(errcode)); } - + void xbt_os_cond_broadcast(xbt_os_cond_t cond){ int errcode; if ((errcode=pthread_cond_broadcast(&(cond->c)))) @@ -288,112 +378,154 @@ void *xbt_os_thread_getparam(void) { } typedef struct xbt_os_sem_ { + #ifndef HAVE_SEM_INIT + char* name; + #endif sem_t s; - int pshared; - unsigned int value; - const char* name; + sem_t *ps; }s_xbt_os_sem_t ; +#ifndef SEM_FAILED +#define SEM_FAILED (-1) +#endif + xbt_os_sem_t -xbt_os_sem_init(int pshared, unsigned int value) -{ - xbt_os_sem_t res = xbt_new(s_xbt_os_sem_t,1); - - if(sem_init(&(res->s),pshared,value) < 0) - THROW1(system_error,errno,"sem_init() failed: %s", - strerror(errno)); +xbt_os_sem_init(unsigned int value) { + xbt_os_sem_t res = xbt_new(s_xbt_os_sem_t,1); + + /* On some systems (MAC OS X), only the stub of sem_init is to be found. + * Any attempt to use it leads to ENOSYS (function not implemented). + * If such a prehistoric system is detected, do the job with sem_open instead + */ +#ifdef HAVE_SEM_INIT + if(sem_init(&(res->s),0,value) != 0) + THROW1(system_error,errno,"sem_init() failed: %s", strerror(errno)); + res->ps = &(res->s); - res->pshared = pshared; - res->value = value; +#else /* damn, no sem_init(). Reimplement it */ + + xbt_os_mutex_acquire(next_sem_ID_lock); + res->name = bprintf("/%d.%d",(*xbt_getpid)(),++next_sem_ID); + xbt_os_mutex_release(next_sem_ID_lock); + + res->ps = sem_open(res->name, O_CREAT, 0644, value); + if ((res->ps == (sem_t *)SEM_FAILED) && (errno == ENAMETOOLONG)) { + /* Old darwins only allow 13 chars. Did you create *that* amount of semaphores? */ + res->name[13] = '\0'; + res->ps = sem_open(res->name, O_CREAT, 0644, 1); + } + if ((res->ps == (sem_t *)SEM_FAILED)) + THROW1(system_error,errno,"sem_open() failed: %s",strerror(errno)); + /* Remove the name from the semaphore namespace: we never join on it */ + if(sem_unlink(res->name) < 0) + THROW1(system_error,errno,"sem_unlink() failed: %s", strerror(errno)); + +#endif + return res; } -void -xbt_os_sem_wait(xbt_os_sem_t sem) -{ - if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_wait() failed: %s", - strerror(EINVAL)); - - if(sem_wait(&(sem->s)) < 0) - THROW1(system_error,errno,"sem_wait() failed: %s", - strerror(errno)); +void +xbt_os_sem_acquire(xbt_os_sem_t sem) { + if(!sem) + THROW0(arg_error,EINVAL,"Cannot acquire of the NULL semaphore"); + if(sem_wait(sem->ps) < 0) + THROW1(system_error,errno,"sem_wait() failed: %s", strerror(errno)); } -void xbt_os_sem_timedwait(xbt_os_sem_t sem,const struct timespec* abs_timeout) -{ - if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_timedwait() failed: %s", - strerror(EINVAL)); - - /* only throw an exception if the global variable errno is different than ETIMEDOUT : - * (the semaphore could not be locked before the specified timeout expired) - */ - if((sem_timedwait(&(sem->s),abs_timeout) < 0) && (ETIMEDOUT != errno)) - THROW1(system_error,errno,"sem_wait() failed: %s", - strerror(errno)); -} +void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay) { + int errcode; -void -xbt_os_sem_post(xbt_os_sem_t sem) -{ - if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_post() failed: %s", - strerror(EINVAL)); - - if(sem_post(&(sem->s)) < 0) - THROW1(system_error,errno,"sem_post() failed: %s", - strerror(errno)); + if(!sem) + THROW0(arg_error,EINVAL,"Cannot acquire of the NULL semaphore"); + + if (delay < 0) { + xbt_os_sem_acquire(sem); + } else if (delay==0) { + errcode = sem_trywait(sem->ps); + + switch (errcode) { + case 0: + return; + case ETIMEDOUT: + THROW1(timeout_error,0,"semaphore %p not ready",sem); + default: + THROW2(system_error,errcode,"xbt_os_sem_timedacquire(%p) failed: %s",sem, strerror(errcode)); + } + + } else { +#ifdef HAVE_SEM_WAIT + struct timespec ts_end; + double end = delay + xbt_os_time(); + + ts_end.tv_sec = (time_t) floor(end); + ts_end.tv_nsec = (long) ( ( end - ts_end.tv_sec) * 1000000000); + DEBUG2("sem_timedwait(%p,%p)",sem->ps,&ts_end); + errcode = sem_timedwait(sem->s,&ts_end); + +#else /* Okay, reimplement this function then */ + double start = xbt_os_time(); + do { + errcode = sem_trywait(sem->ps); + if (errcode == EBUSY) + xbt_os_thread_yield(); + } while (errcode == EBUSY && xbt_os_time()-start s)) < 0) - THROW1(system_error,errno,"sem_close() failed: %s", - strerror(errno)); -} + THROW0(arg_error,EINVAL,"Cannot release of the NULL semaphore"); -xbt_os_sem_t -xbt_os_sem_open(const char *name, int oflag, mode_t mode, unsigned int value) -{ - sem_t* ps; - xbt_os_sem_t res = xbt_new(s_xbt_os_sem_t,1); - - if(SEM_FAILED == (ps = sem_open(name,oflag, mode, value))) - THROW1(system_error,errno,"sem_open() failed: %s", + if(sem_post(sem->ps) < 0) + THROW1(system_error,errno,"sem_post() failed: %s", strerror(errno)); - - res->s = *ps; - res->value = value; - - return res; } void xbt_os_sem_destroy(xbt_os_sem_t sem) { - if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_destroy() failed: %s", - strerror(EINVAL)); - - if(sem_destroy(&(sem->s)) < 0) - THROW1(system_error,errno,"sem_destroy() failed: %s", + if(!sem) + THROW0(arg_error,EINVAL,"Cannot destroy the NULL sempahore"); + +#ifdef HAVE_SEM_INIT + if(sem_destroy(sem->ps)) < 0) + THROW1(system_error,errno,"sem_destroy() failed: %s", strerror(errno)); +#else + if(sem_close(sem->ps) < 0) + THROW1(system_error,errno,"sem_close() failed: %s", + strerror(errno)); + xbt_free(sem->name); + +#endif + xbt_free(sem); } void xbt_os_sem_get_value(xbt_os_sem_t sem, int* svalue) { if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_getvalue() failed: %s", - strerror(EINVAL)); - + THROW0(arg_error,EINVAL,"Cannot get the value of the NULL semaphore"); + if(sem_getvalue(&(sem->s),svalue) < 0) THROW1(system_error,errno,"sem_getvalue() failed: %s", strerror(errno)); @@ -403,6 +535,8 @@ xbt_os_sem_get_value(xbt_os_sem_t sem, int* svalue) #elif defined(WIN32) +#include + typedef struct xbt_os_thread_ { char *name; HANDLE handle; /* the win thread handle */ @@ -426,42 +560,43 @@ void xbt_os_thread_mod_init(void) { xbt_self_thread_key = TlsAlloc(); } void xbt_os_thread_mod_exit(void) { - - if (!TlsFree(xbt_self_thread_key)) + + if (!TlsFree(xbt_self_thread_key)) THROW0(system_error,(int)GetLastError(),"TlsFree() failed to cleanup the thread submodule"); } static DWORD WINAPI wrapper_start_routine(void *s) { xbt_os_thread_t t = (xbt_os_thread_t)s; - void* rv; - + DWORD* rv; + if(!TlsSetValue(xbt_self_thread_key,t)) THROW0(system_error,(int)GetLastError(),"TlsSetValue of data describing the created thread failed"); - - rv = (*(t->start_routine))(t->param); - return *((DWORD*)rv); + rv = (DWORD*)((t->start_routine)(t->param)); + + return rv ? *rv : 0; + } xbt_os_thread_t xbt_os_thread_create(const char *name,pvoid_f_pvoid_t start_routine, void* param) { - + xbt_os_thread_t t = xbt_new(s_xbt_os_thread_t,1); t->name = xbt_strdup(name); t->start_routine = start_routine ; t->param = param; - + t->handle = CreateThread(NULL,XBT_DEFAULT_THREAD_STACK_SIZE, (LPTHREAD_START_ROUTINE)wrapper_start_routine, t,STACK_SIZE_PARAM_IS_A_RESERVATION,&(t->id)); - + if(!t->handle) { xbt_free(t); THROW0(system_error,(int)GetLastError(),"CreateThread failed"); } - + return t; } @@ -474,20 +609,23 @@ const char* xbt_os_thread_self_name(void) { return t?t->name:"main"; } -void +void xbt_os_thread_join(xbt_os_thread_t thread,void ** thread_return) { - if(WAIT_OBJECT_0 != WaitForSingleObject(thread->handle,INFINITE)) + if(WAIT_OBJECT_0 != WaitForSingleObject(thread->handle,INFINITE)) THROW0(system_error,(int)GetLastError(), "WaitForSingleObject failed"); - + if(thread_return){ - + if(!GetExitCodeThread(thread->handle,(DWORD*)(*thread_return))) THROW0(system_error,(int)GetLastError(), "GetExitCodeThread failed"); } - + CloseHandle(thread->handle); - free(thread->name); + + if(thread->name) + free(thread->name); + free(thread); } @@ -512,13 +650,14 @@ void xbt_os_thread_yield(void) { Sleep(0); } void xbt_os_thread_cancel(xbt_os_thread_t t) { - THROW_UNIMPLEMENTED; + if(!TerminateThread(t->handle,0)) + THROW0(system_error,(int)GetLastError(), "TerminateThread failed"); } /****** mutex related functions ******/ typedef struct xbt_os_mutex_ { /* KEEP IT IN SYNC WITH xbt_thread.c */ - CRITICAL_SECTION lock; + CRITICAL_SECTION lock; } s_xbt_os_mutex_t; xbt_os_mutex_t xbt_os_mutex_init(void) { @@ -526,26 +665,29 @@ xbt_os_mutex_t xbt_os_mutex_init(void) { /* initialize the critical section object */ InitializeCriticalSection(&(res->lock)); - + return res; } -void xbt_os_mutex_lock(xbt_os_mutex_t mutex) { - +void xbt_os_mutex_acquire(xbt_os_mutex_t mutex) { EnterCriticalSection(& mutex->lock); } -void xbt_os_mutex_unlock(xbt_os_mutex_t mutex) { +void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) { + THROW_UNIMPLEMENTED; +} - LeaveCriticalSection (& mutex->lock); +void xbt_os_mutex_release(xbt_os_mutex_t mutex) { + + LeaveCriticalSection (&mutex->lock); } void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) { if (!mutex) return; - - DeleteCriticalSection(& mutex->lock); + + DeleteCriticalSection(& mutex->lock); free(mutex); } @@ -559,7 +701,7 @@ void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) { typedef struct xbt_os_cond_ { /* KEEP IT IN SYNC WITH xbt_thread.c */ HANDLE events[MAX_EVENTS]; - + unsigned int waiters_count; /* the number of waiters */ CRITICAL_SECTION waiters_count_lock; /* protect access to waiters_count */ } s_xbt_os_cond_t; @@ -567,31 +709,31 @@ typedef struct xbt_os_cond_ { xbt_os_cond_t xbt_os_cond_init(void) { xbt_os_cond_t res = xbt_new0(s_xbt_os_cond_t,1); - + memset(& res->waiters_count_lock,0,sizeof(CRITICAL_SECTION)); - + /* initialize the critical section object */ InitializeCriticalSection(& res->waiters_count_lock); - + res->waiters_count = 0; - + /* Create an auto-reset event */ - res->events[SIGNAL] = CreateEvent (NULL, FALSE, FALSE, NULL); - + res->events[SIGNAL] = CreateEvent (NULL, FALSE, FALSE, NULL); + if(!res->events[SIGNAL]){ DeleteCriticalSection(& res->waiters_count_lock); free(res); THROW0(system_error,0,"CreateEvent failed for the signals"); } - + /* Create a manual-reset event. */ res->events[BROADCAST] = CreateEvent (NULL, TRUE, FALSE,NULL); - + if(!res->events[BROADCAST]){ - - DeleteCriticalSection(& res->waiters_count_lock); + + DeleteCriticalSection(& res->waiters_count_lock); CloseHandle(res->events[SIGNAL]); - free(res); + free(res); THROW0(system_error,0,"CreateEvent failed for the broadcasts"); } @@ -599,7 +741,7 @@ xbt_os_cond_t xbt_os_cond_init(void) { } void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) { - + unsigned long wait_result; int is_last_waiter; @@ -607,39 +749,39 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) { EnterCriticalSection (& cond->waiters_count_lock); cond->waiters_count++; LeaveCriticalSection (& cond->waiters_count_lock); - + /* unlock the mutex associate with the condition */ LeaveCriticalSection (& mutex->lock); - + /* wait for a signal (broadcast or no) */ wait_result = WaitForMultipleObjects (2, cond->events, FALSE, INFINITE); - + if(wait_result == WAIT_FAILED) THROW0(system_error,0,"WaitForMultipleObjects failed, so we cannot wait on the condition"); - + /* we have a signal lock the condition */ EnterCriticalSection (& cond->waiters_count_lock); cond->waiters_count--; - + /* it's the last waiter or it's a broadcast ? */ is_last_waiter = ((wait_result == WAIT_OBJECT_0 + BROADCAST - 1) && (cond->waiters_count == 0)); - + LeaveCriticalSection (& cond->waiters_count_lock); - + /* yes it's the last waiter or it's a broadcast * only reset the manual event (the automatic event is reset in the WaitForMultipleObjects() function - * by the system. + * by the system. */ if (is_last_waiter) if(!ResetEvent (cond->events[BROADCAST])) THROW0(system_error,0,"ResetEvent failed"); - + /* relock the mutex associated with the condition in accordance with the posix thread specification */ EnterCriticalSection (& mutex->lock); } void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double delay) { - - unsigned long wait_result = WAIT_TIMEOUT; + + unsigned long wait_result = WAIT_TIMEOUT; int is_last_waiter; unsigned long end = (unsigned long)(delay * 1000); @@ -647,43 +789,43 @@ void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double dela if (delay < 0) { xbt_os_cond_wait(cond,mutex); } else { - DEBUG3("xbt_cond_timedwait(%p,%p,%ul)",&(cond->events),&(mutex->lock),end); + DEBUG3("xbt_cond_timedwait(%p,%p,%lu)",&(cond->events),&(mutex->lock),end); /* lock the threads counter and increment it */ EnterCriticalSection (& cond->waiters_count_lock); cond->waiters_count++; LeaveCriticalSection (& cond->waiters_count_lock); - + /* unlock the mutex associate with the condition */ LeaveCriticalSection (& mutex->lock); /* wait for a signal (broadcast or no) */ - + wait_result = WaitForMultipleObjects (2, cond->events, FALSE, end); - + switch(wait_result) { case WAIT_TIMEOUT: THROW3(timeout_error,GetLastError(),"condition %p (mutex %p) wasn't signaled before timeout (%f)",cond,mutex, delay); case WAIT_FAILED: THROW0(system_error,GetLastError(),"WaitForMultipleObjects failed, so we cannot wait on the condition"); } - + /* we have a signal lock the condition */ EnterCriticalSection (& cond->waiters_count_lock); cond->waiters_count--; - + /* it's the last waiter or it's a broadcast ? */ is_last_waiter = ((wait_result == WAIT_OBJECT_0 + BROADCAST - 1) && (cond->waiters_count == 0)); - + LeaveCriticalSection (& cond->waiters_count_lock); - + /* yes it's the last waiter or it's a broadcast * only reset the manual event (the automatic event is reset in the WaitForMultipleObjects() function - * by the system. + * by the system. */ if (is_last_waiter) if(!ResetEvent (cond->events[BROADCAST])) THROW0(system_error,0,"ResetEvent failed"); - + /* relock the mutex associated with the condition in accordance with the posix thread specification */ EnterCriticalSection (& mutex->lock); } @@ -696,11 +838,11 @@ void xbt_os_cond_signal(xbt_os_cond_t cond) { EnterCriticalSection (& cond->waiters_count_lock); have_waiters = cond->waiters_count > 0; LeaveCriticalSection (& cond->waiters_count_lock); - + if (have_waiters) if(!SetEvent(cond->events[SIGNAL])) THROW0(system_error,0,"SetEvent failed"); - + xbt_os_thread_yield(); } @@ -710,26 +852,26 @@ void xbt_os_cond_broadcast(xbt_os_cond_t cond){ EnterCriticalSection (& cond->waiters_count_lock); have_waiters = cond->waiters_count > 0; LeaveCriticalSection (& cond->waiters_count_lock); - + if (have_waiters) SetEvent(cond->events[BROADCAST]); } void xbt_os_cond_destroy(xbt_os_cond_t cond){ int error = 0; - + if (!cond) return; - + if(!CloseHandle(cond->events[SIGNAL])) error = 1; - + if(!CloseHandle(cond->events[BROADCAST])) error = 1; - + DeleteCriticalSection(& cond->waiters_count_lock); - + xbt_free(cond); - + if (error) THROW0(system_error,0,"Error while destroying the condition"); } @@ -737,44 +879,41 @@ void xbt_os_cond_destroy(xbt_os_cond_t cond){ typedef struct xbt_os_sem_ { HANDLE h; unsigned int value; - const char* name; CRITICAL_SECTION value_lock; /* protect access to value of the semaphore */ }s_xbt_os_sem_t ; +#ifndef INT_MAX +# define INT_MAX 32767 /* let's be safe by underestimating this value: this is for 16bits only */ +#endif + xbt_os_sem_t -xbt_os_sem_init(int pshared, unsigned int value) +xbt_os_sem_init(unsigned int value) { xbt_os_sem_t res; - - if(0 != pshared) - THROW1(arg_error,EPERM,"xbt_os_sem_init() failed: %s", - strerror(EPERM)); - + if(value > INT_MAX) - THROW1(arg_error,EINVAL,"xbt_os_sem_init() failed: %s", - strerror(EINVAL)); - + THROW1(arg_error,value,"Semaphore initial value too big: %ud cannot be stored as a signed int",value); + res = (xbt_os_sem_t)xbt_new0(s_xbt_os_sem_t,1); - + if(!(res->h = CreateSemaphore(NULL,value,(long)INT_MAX,NULL))) { THROW1(system_error,GetLastError(),"CreateSemaphore() failed: %s", strerror(GetLastError())); return NULL; } - + res->value = value; - + InitializeCriticalSection(&(res->value_lock)); - + return res; } -void -xbt_os_sem_wait(xbt_os_sem_t sem) +void +xbt_os_sem_acquire(xbt_os_sem_t sem) { if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_wait() failed: %s", - strerror(EINVAL)); + THROW0(arg_error,EINVAL,"Cannot acquire the NULL semaphore"); /* wait failure */ if(WAIT_OBJECT_0 != WaitForSingleObject(sem->h,INFINITE)) @@ -785,55 +924,51 @@ xbt_os_sem_wait(xbt_os_sem_t sem) LeaveCriticalSection(&(sem->value_lock)); } -void xbt_os_sem_timedwait(xbt_os_sem_t sem,const struct timespec* abs_timeout) +void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout) { - long timeout; - struct timeval tv; - + long seconds; + long milliseconds; + double end = timeout + xbt_os_time(); + if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_timedwait() failed: %s", - strerror(EINVAL)); - - if(!abs_timeout) - timeout = INFINITE; - else + THROW0(arg_error,EINVAL,"Cannot acquire the NULL semaphore"); + + if (timeout < 0) { - if(gettimeofday(&tv, NULL) < 0) - THROW1(system_error,errno,"gettimeofday() failed: %s", - strerror(errno)); - - timeout = ((long) (abs_timeout->tv_sec - tv.tv_sec) * 1e3 + (long)((abs_timeout->tv_nsec / 1e3) - tv.tv_usec) / 1e3); + xbt_os_sem_acquire(sem); } - - switch(WaitForSingleObject(sem->h,timeout)) + else /* timeout can be zero <-> try acquire ) */ { - case WAIT_OBJECT_0: - EnterCriticalSection(&(sem->value_lock)); - sem->value--; - LeaveCriticalSection(&(sem->value_lock)); - return; - - case WAIT_TIMEOUT: - /* it's not an exception : - * (semaphore could not be locked before the specified timeout expired) - */ - return; - - default: - - THROW1(system_error,GetLastError(),"WaitForSingleObject() failed: %s", - strerror(GetLastError())); + + seconds = (long) floor(end); + milliseconds = (long)( ( end - seconds) * 1000); + milliseconds += (seconds * 1000); + + switch(WaitForSingleObject(sem->h,milliseconds)) + { + case WAIT_OBJECT_0: + EnterCriticalSection(&(sem->value_lock)); + sem->value--; + LeaveCriticalSection(&(sem->value_lock)); + return; + + case WAIT_TIMEOUT: + THROW2(timeout_error,GetLastError(),"semaphore %p wasn't signaled before timeout (%f)",sem,timeout); + return; + + default: + THROW3(system_error,GetLastError(),"WaitForSingleObject(%p,%f) failed: %s",sem,timeout, strerror(GetLastError())); + } } } -void -xbt_os_sem_post(xbt_os_sem_t sem) +void +xbt_os_sem_release(xbt_os_sem_t sem) { if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_post() failed: %s", - strerror(EINVAL)); - - if(!ReleaseSemaphore(sem->h,1, NULL)) + THROW0(arg_error,EINVAL,"Cannot release the NULL semaphore"); + + if(!ReleaseSemaphore(sem->h,1, NULL)) THROW1(system_error,GetLastError(),"ReleaseSemaphore() failed: %s", strerror(GetLastError())); EnterCriticalSection (&(sem->value_lock)); @@ -841,43 +976,29 @@ xbt_os_sem_post(xbt_os_sem_t sem) LeaveCriticalSection(&(sem->value_lock)); } -xbt_os_sem_t -xbt_os_sem_open(const char *name, int oflag, mode_t mode, unsigned int value) -{ - THROW_UNIMPLEMENTED; -} - -void -xbt_os_sem_close(xbt_os_sem_t sem) -{ - THROW_UNIMPLEMENTED; -} - void xbt_os_sem_destroy(xbt_os_sem_t sem) { if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_destroy() failed: %s", - strerror(EINVAL)); - - if(!CloseHandle(sem->h)) + THROW0(arg_error,EINVAL,"Cannot destroy the NULL semaphore"); + + if(!CloseHandle(sem->h)) THROW1(system_error,GetLastError(),"CloseHandle() failed: %s", strerror(GetLastError())); - + DeleteCriticalSection(&(sem->value_lock)); - - xbt_free(sem); - + + xbt_free(sem); + } void xbt_os_sem_get_value(xbt_os_sem_t sem, int* svalue) { if(!sem) - THROW1(arg_error,EINVAL,"xbt_os_sem_get_value() failed: %s", - strerror(EINVAL)); - - EnterCriticalSection(&(sem->value_lock)); + THROW0(arg_error,EINVAL,"Cannot get the value of the NULL semaphore"); + + EnterCriticalSection(&(sem->value_lock)); *svalue = sem->value; LeaveCriticalSection(&(sem->value_lock)); }