typedef struct xbt_os_thread_ {
pthread_t t;
+ int detached;
char *name;
void *param;
pvoid_f_pvoid_t start_routine;
static int thread_mod_inited = 0;
/* frees the xbt_os_thread_t corresponding to the current thread */
-static void xbt_os_thread_free_thread_data(void *d)
+static void xbt_os_thread_free_thread_data(xbt_os_thread_t thread)
{
- free(d);
+ if (thread == main_thread) /* just killed main thread */
+ main_thread = NULL;
+
+ free(thread->running_ctx);
+ free(thread->name);
+ free(thread);
}
/* callback: context fetching */
return;
if ((errcode = pthread_key_create(&xbt_self_thread_key, NULL)))
- THROW0(system_error, errcode,
+ THROWF(system_error, errcode,
"pthread_key_create failed for xbt_self_thread_key");
main_thread = xbt_new(s_xbt_os_thread_t, 1);
XBT_RUNNING_CTX_INITIALIZE(main_thread->running_ctx);
if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread)))
- THROW0(system_error, errcode,
+ THROWF(system_error, errcode,
"pthread_setspecific failed for xbt_self_thread_key");
// int errcode;
// if ((errcode=pthread_key_delete(xbt_self_thread_key)))
- // THROW0(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key");
+ // THROWF(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key");
free(main_thread->running_ctx);
free(main_thread);
main_thread = NULL;
int errcode;
if ((errcode = pthread_setspecific(xbt_self_thread_key, t)))
- THROW0(system_error, errcode,
+ THROWF(system_error, errcode,
"pthread_setspecific failed for xbt_self_thread_key");
- return (*(t->start_routine)) (t->param);
+ void *res = (*(t->start_routine)) (t->param);
+ if (t->detached)
+ xbt_os_thread_free_thread_data(t);
+ return res;
}
xbt_os_thread_t xbt_os_thread_create(const char *name,
int errcode;
xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1);
+ res_thread->detached = 0;
res_thread->name = xbt_strdup(name);
res_thread->start_routine = start_routine;
res_thread->param = param;
if ((errcode = pthread_create(&(res_thread->t), NULL,
wrapper_start_routine, res_thread)))
- THROW1(system_error, errcode,
+ THROWF(system_error, errcode,
"pthread_create failed: %s", strerror(errcode));
return res_thread;
return me ? me->name : "main";
}
-void xbt_os_thread_set_extra_data(void *data)
-{
- xbt_os_thread_self()->extra_data = data;
-}
-
-void *xbt_os_thread_get_extra_data(void)
-{
- return xbt_os_thread_self()->extra_data;
-}
-
void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return)
{
int errcode;
if ((errcode = pthread_join(thread->t, thread_return)))
- THROW1(system_error, errcode, "pthread_join failed: %s",
+ THROWF(system_error, errcode, "pthread_join failed: %s",
strerror(errcode));
- if (thread->running_ctx)
- free(thread->running_ctx);
-
- if (thread->name)
- free(thread->name);
-
- if (thread == main_thread) /* just killed main thread */
- main_thread = NULL;
-
- free(thread);
+ xbt_os_thread_free_thread_data(thread);
}
void xbt_os_thread_exit(int *retval)
return res;
}
+void xbt_os_thread_key_create(xbt_os_thread_key_t* key) {
+
+ int errcode;
+ if ((errcode = pthread_key_create(key, NULL)))
+ THROWF(system_error, errcode, "pthread_key_create failed");
+}
+
+void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) {
+
+ int errcode;
+ if ((errcode = pthread_setspecific(key, value)))
+ THROWF(system_error, errcode, "pthread_setspecific failed");
+}
+
+void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) {
+ return pthread_getspecific(key);
+}
+
void xbt_os_thread_detach(xbt_os_thread_t thread)
{
+ thread->detached = 1;
pthread_detach(thread->t);
}
int errcode;
if ((errcode = pthread_mutex_init(&(res->m), NULL)))
- THROW1(system_error, errcode, "pthread_mutex_init() failed: %s",
+ THROWF(system_error, errcode, "pthread_mutex_init() failed: %s",
strerror(errcode));
return res;
int errcode;
if ((errcode = pthread_mutex_lock(&(mutex->m))))
- THROW2(system_error, errcode, "pthread_mutex_lock(%p) failed: %s",
+ THROWF(system_error, errcode, "pthread_mutex_lock(%p) failed: %s",
mutex, strerror(errcode));
}
case 0:
return;
case ETIMEDOUT:
- THROW1(timeout_error, 0, "mutex %p not ready", mutex);
+ THROWF(timeout_error, 0, "mutex %p not ready", mutex);
default:
- THROW2(system_error, errcode,
+ THROWF(system_error, errcode,
"xbt_mutex_timedacquire(%p) failed: %s", mutex,
strerror(errcode));
}
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);
+ XBT_DEBUG("pthread_mutex_timedlock(%p,%p)", &(mutex->m), &ts_end);
errcode = pthread_mutex_timedlock(&(mutex->m), &ts_end);
return;
case ETIMEDOUT:
- THROW2(timeout_error, delay,
+ THROWF(timeout_error, delay,
"mutex %p wasn't signaled before timeout (%f)", mutex, delay);
default:
- THROW3(system_error, errcode,
+ THROWF(system_error, errcode,
"pthread_mutex_timedlock(%p,%f) failed: %s", mutex, delay,
strerror(errcode));
}
int errcode;
if ((errcode = pthread_mutex_unlock(&(mutex->m))))
- THROW2(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s",
+ THROWF(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s",
mutex, strerror(errcode));
}
return;
if ((errcode = pthread_mutex_destroy(&(mutex->m))))
- THROW2(system_error, errcode, "pthread_mutex_destroy(%p) failed: %s",
+ THROWF(system_error, errcode, "pthread_mutex_destroy(%p) failed: %s",
mutex, strerror(errcode));
free(mutex);
}
xbt_os_cond_t res = xbt_new(s_xbt_os_cond_t, 1);
int errcode;
if ((errcode = pthread_cond_init(&(res->c), NULL)))
- THROW1(system_error, errcode, "pthread_cond_init() failed: %s",
+ THROWF(system_error, errcode, "pthread_cond_init() failed: %s",
strerror(errcode));
return res;
{
int errcode;
if ((errcode = pthread_cond_wait(&(cond->c), &(mutex->m))))
- THROW3(system_error, errcode, "pthread_cond_wait(%p,%p) failed: %s",
+ THROWF(system_error, errcode, "pthread_cond_wait(%p,%p) failed: %s",
cond, mutex, strerror(errcode));
}
} else {
ts_end.tv_sec = (time_t) floor(end);
ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000);
- DEBUG3("pthread_cond_timedwait(%p,%p,%p)", &(cond->c), &(mutex->m),
+ XBT_DEBUG("pthread_cond_timedwait(%p,%p,%p)", &(cond->c), &(mutex->m),
&ts_end);
switch ((errcode =
pthread_cond_timedwait(&(cond->c), &(mutex->m), &ts_end))) {
case 0:
return;
case ETIMEDOUT:
- THROW3(timeout_error, errcode,
+ THROWF(timeout_error, errcode,
"condition %p (mutex %p) wasn't signaled before timeout (%f)",
cond, mutex, delay);
default:
- THROW4(system_error, errcode,
+ THROWF(system_error, errcode,
"pthread_cond_timedwait(%p,%p,%f) failed: %s", cond, mutex,
delay, strerror(errcode));
}
{
int errcode;
if ((errcode = pthread_cond_signal(&(cond->c))))
- THROW2(system_error, errcode, "pthread_cond_signal(%p) failed: %s",
+ THROWF(system_error, errcode, "pthread_cond_signal(%p) failed: %s",
cond, strerror(errcode));
}
{
int errcode;
if ((errcode = pthread_cond_broadcast(&(cond->c))))
- THROW2(system_error, errcode, "pthread_cond_broadcast(%p) failed: %s",
+ THROWF(system_error, errcode, "pthread_cond_broadcast(%p) failed: %s",
cond, strerror(errcode));
}
return;
if ((errcode = pthread_cond_destroy(&(cond->c))))
- THROW2(system_error, errcode, "pthread_cond_destroy(%p) failed: %s",
+ THROWF(system_error, errcode, "pthread_cond_destroy(%p) failed: %s",
cond, strerror(errcode));
free(cond);
}
*/
#ifdef HAVE_SEM_INIT
if (sem_init(&(res->s), 0, value) != 0)
- THROW1(system_error, errno, "sem_init() failed: %s", strerror(errno));
+ THROWF(system_error, errno, "sem_init() failed: %s", strerror(errno));
res->ps = &(res->s);
#else /* damn, no sem_init(). Reimplement it */
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));
+ THROWF(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",
+ THROWF(system_error, errno, "sem_unlink() failed: %s",
strerror(errno));
#endif
void xbt_os_sem_acquire(xbt_os_sem_t sem)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
+ THROWF(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));
+ THROWF(system_error, errno, "sem_wait() failed: %s", strerror(errno));
}
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
int errcode;
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
+ THROWF(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
if (delay < 0) {
xbt_os_sem_acquire(sem);
case 0:
return;
case ETIMEDOUT:
- THROW1(timeout_error, 0, "semaphore %p not ready", sem);
+ THROWF(timeout_error, 0, "semaphore %p not ready", sem);
default:
- THROW2(system_error, errcode,
+ THROWF(system_error, errcode,
"xbt_os_sem_timedacquire(%p) failed: %s", sem,
strerror(errcode));
}
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);
+ XBT_DEBUG("sem_timedwait(%p,%p)", sem->ps, &ts_end);
errcode = sem_timedwait(sem->s, &ts_end);
#else /* Okay, reimplement this function then */
return;
case ETIMEDOUT:
- THROW2(timeout_error, delay,
+ THROWF(timeout_error, delay,
"semaphore %p wasn't signaled before timeout (%f)", sem,
delay);
default:
- THROW3(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem,
+ THROWF(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem,
delay, strerror(errcode));
}
}
void xbt_os_sem_release(xbt_os_sem_t sem)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot release of the NULL semaphore");
+ THROWF(arg_error, EINVAL, "Cannot release of the NULL semaphore");
if (sem_post(sem->ps) < 0)
- THROW1(system_error, errno, "sem_post() failed: %s", strerror(errno));
+ THROWF(system_error, errno, "sem_post() failed: %s", strerror(errno));
}
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot destroy the NULL sempahore");
+ THROWF(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",
+ THROWF(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));
+ THROWF(system_error, errno, "sem_close() failed: %s", strerror(errno));
xbt_free(sem->name);
#endif
void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
{
if (!sem)
- THROW0(arg_error, EINVAL,
+ THROWF(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",
+ THROWF(system_error, errno, "sem_getvalue() failed: %s",
strerror(errno));
}
{
if (!TlsFree(xbt_self_thread_key))
- THROW0(system_error, (int) GetLastError(),
+ THROWF(system_error, (int) GetLastError(),
"TlsFree() failed to cleanup the thread submodule");
}
DWORD *rv;
if (!TlsSetValue(xbt_self_thread_key, t))
- THROW0(system_error, (int) GetLastError(),
+ THROWF(system_error, (int) GetLastError(),
"TlsSetValue of data describing the created thread failed");
rv = (DWORD *) ((t->start_routine) (t->param));
if (!t->handle) {
xbt_free(t);
- THROW0(system_error, (int) GetLastError(), "CreateThread failed");
+ THROWF(system_error, (int) GetLastError(), "CreateThread failed");
}
return t;
{
if (WAIT_OBJECT_0 != WaitForSingleObject(thread->handle, INFINITE))
- THROW0(system_error, (int) GetLastError(),
+ THROWF(system_error, (int) GetLastError(),
"WaitForSingleObject failed");
if (thread_return) {
if (!GetExitCodeThread(thread->handle, (DWORD *) (*thread_return)))
- THROW0(system_error, (int) GetLastError(),
+ THROWF(system_error, (int) GetLastError(),
"GetExitCodeThread failed");
}
ExitThread(0);
}
+void xbt_os_thread_key_create(xbt_os_thread_key_t* key) {
+
+ *key = TlsAlloc();
+}
+
+void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) {
+
+ if (!TlsSetValue(key, value))
+ THROWF(system_error, (int) GetLastError(), "TlsSetValue() failed");
+}
+
+void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) {
+ return TlsGetValue(key);
+}
+
void xbt_os_thread_detach(xbt_os_thread_t thread)
{
THROW_UNIMPLEMENTED;
void xbt_os_thread_cancel(xbt_os_thread_t t)
{
if (!TerminateThread(t->handle, 0))
- THROW0(system_error, (int) GetLastError(), "TerminateThread failed");
+ THROWF(system_error, (int) GetLastError(), "TerminateThread failed");
}
/****** mutex related functions ******/
if (!res->events[SIGNAL]) {
DeleteCriticalSection(&res->waiters_count_lock);
free(res);
- THROW0(system_error, 0, "CreateEvent failed for the signals");
+ THROWF(system_error, 0, "CreateEvent failed for the signals");
}
/* Create a manual-reset event. */
DeleteCriticalSection(&res->waiters_count_lock);
CloseHandle(res->events[SIGNAL]);
free(res);
- THROW0(system_error, 0, "CreateEvent failed for the broadcasts");
+ THROWF(system_error, 0, "CreateEvent failed for the broadcasts");
}
return res;
wait_result = WaitForMultipleObjects(2, cond->events, FALSE, INFINITE);
if (wait_result == WAIT_FAILED)
- THROW0(system_error, 0,
+ THROWF(system_error, 0,
"WaitForMultipleObjects failed, so we cannot wait on the condition");
/* we have a signal lock the condition */
*/
if (is_last_waiter)
if (!ResetEvent(cond->events[BROADCAST]))
- THROW0(system_error, 0, "ResetEvent failed");
+ THROWF(system_error, 0, "ResetEvent failed");
/* relock the mutex associated with the condition in accordance with the posix thread specification */
EnterCriticalSection(&mutex->lock);
if (delay < 0) {
xbt_os_cond_wait(cond, mutex);
} else {
- DEBUG3("xbt_cond_timedwait(%p,%p,%lu)", &(cond->events),
+ XBT_DEBUG("xbt_cond_timedwait(%p,%p,%lu)", &(cond->events),
&(mutex->lock), end);
/* lock the threads counter and increment it */
switch (wait_result) {
case WAIT_TIMEOUT:
- THROW3(timeout_error, GetLastError(),
+ THROWF(timeout_error, GetLastError(),
"condition %p (mutex %p) wasn't signaled before timeout (%f)",
cond, mutex, delay);
case WAIT_FAILED:
- THROW0(system_error, GetLastError(),
+ THROWF(system_error, GetLastError(),
"WaitForMultipleObjects failed, so we cannot wait on the condition");
}
*/
if (is_last_waiter)
if (!ResetEvent(cond->events[BROADCAST]))
- THROW0(system_error, 0, "ResetEvent failed");
+ THROWF(system_error, 0, "ResetEvent failed");
/* relock the mutex associated with the condition in accordance with the posix thread specification */
EnterCriticalSection(&mutex->lock);
if (have_waiters)
if (!SetEvent(cond->events[SIGNAL]))
- THROW0(system_error, 0, "SetEvent failed");
+ THROWF(system_error, 0, "SetEvent failed");
xbt_os_thread_yield();
}
xbt_free(cond);
if (error)
- THROW0(system_error, 0, "Error while destroying the condition");
+ THROWF(system_error, 0, "Error while destroying the condition");
}
typedef struct xbt_os_sem_ {
xbt_os_sem_t res;
if (value > INT_MAX)
- THROW1(arg_error, value,
+ THROWF(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",
+ THROWF(system_error, GetLastError(), "CreateSemaphore() failed: %s",
strerror(GetLastError()));
return NULL;
}
void xbt_os_sem_acquire(xbt_os_sem_t sem)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
+ THROWF(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
/* wait failure */
if (WAIT_OBJECT_0 != WaitForSingleObject(sem->h, INFINITE))
- THROW1(system_error, GetLastError(),
+ THROWF(system_error, GetLastError(),
"WaitForSingleObject() failed: %s", strerror(GetLastError()));
EnterCriticalSection(&(sem->value_lock));
sem->value--;
double end = timeout + xbt_os_time();
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
+ THROWF(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
if (timeout < 0) {
xbt_os_sem_acquire(sem);
return;
case WAIT_TIMEOUT:
- THROW2(timeout_error, GetLastError(),
+ THROWF(timeout_error, GetLastError(),
"semaphore %p wasn't signaled before timeout (%f)", sem,
timeout);
return;
default:
- THROW3(system_error, GetLastError(),
+ THROWF(system_error, GetLastError(),
"WaitForSingleObject(%p,%f) failed: %s", sem, timeout,
strerror(GetLastError()));
}
void xbt_os_sem_release(xbt_os_sem_t sem)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot release the NULL semaphore");
+ THROWF(arg_error, EINVAL, "Cannot release the NULL semaphore");
if (!ReleaseSemaphore(sem->h, 1, NULL))
- THROW1(system_error, GetLastError(), "ReleaseSemaphore() failed: %s",
+ THROWF(system_error, GetLastError(), "ReleaseSemaphore() failed: %s",
strerror(GetLastError()));
EnterCriticalSection(&(sem->value_lock));
sem->value++;
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot destroy the NULL semaphore");
+ THROWF(arg_error, EINVAL, "Cannot destroy the NULL semaphore");
if (!CloseHandle(sem->h))
- THROW1(system_error, GetLastError(), "CloseHandle() failed: %s",
+ THROWF(system_error, GetLastError(), "CloseHandle() failed: %s",
strerror(GetLastError()));
DeleteCriticalSection(&(sem->value_lock));
void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
{
if (!sem)
- THROW0(arg_error, EINVAL,
+ THROWF(arg_error, EINVAL,
"Cannot get the value of the NULL semaphore");
EnterCriticalSection(&(sem->value_lock));
LeaveCriticalSection(&(sem->value_lock));
}
+
#endif
+
+/***** reentrant mutexes *****/
+typedef struct xbt_os_rmutex_ {
+ xbt_os_mutex_t mutex;
+ xbt_os_thread_t owner;
+ int count;
+} s_xbt_os_rmutex_t;
+
+void xbt_os_thread_set_extra_data(void *data)
+{
+ xbt_os_thread_self()->extra_data = data;
+}
+
+void *xbt_os_thread_get_extra_data(void)
+{
+ return xbt_os_thread_self()->extra_data;
+}
+
+xbt_os_rmutex_t xbt_os_rmutex_init(void)
+{
+ xbt_os_rmutex_t rmutex = xbt_new0(struct xbt_os_rmutex_, 0);
+ rmutex->mutex = xbt_os_mutex_init();
+ rmutex->owner = NULL;
+ rmutex->count = 0;
+ return rmutex;
+}
+
+void xbt_os_rmutex_acquire(xbt_os_rmutex_t rmutex)
+{
+ xbt_os_thread_t self = xbt_os_thread_self();
+
+ if (self == NULL) {
+ /* the thread module is not initialized yet */
+ rmutex->owner = NULL;
+ return;
+ }
+
+ if (self != rmutex->owner) {
+ xbt_os_mutex_acquire(rmutex->mutex);
+ rmutex->owner = self;
+ rmutex->count = 1;
+ } else {
+ rmutex->count++;
+ }
+}
+
+void xbt_os_rmutex_release(xbt_os_rmutex_t rmutex)
+{
+ if (rmutex->owner == NULL) {
+ /* the thread module was not initialized */
+ return;
+ }
+
+ xbt_assert(rmutex->owner == xbt_os_thread_self());
+
+ if (--rmutex->count == 0) {
+ rmutex->owner = NULL;
+ xbt_os_mutex_release(rmutex->mutex);
+ }
+}
+
+void xbt_os_rmutex_destroy(xbt_os_rmutex_t rmutex)
+{
+ xbt_os_mutex_destroy(rmutex->mutex);
+ xbt_free(rmutex);
+}
