thread_mod_inited = 1;
-#ifndef HAVE_SEM_WAIT
+#ifndef HAVE_SEM_INIT
next_sem_ID_lock = xbt_os_mutex_init();
#endif
}
-void xbt_os_thread_mod_postexit(void) {
+void xbt_os_thread_mod_postexit(void)
+{
/* 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;
free(main_thread);
main_thread = NULL;
thread_mod_inited = 0;
-#ifndef HAVE_SEM_WAIT
+#ifndef HAVE_SEM_INIT
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
__xbt_ex_terminate = &__xbt_ex_terminate_default;
}
+int xbt_os_thread_atfork(void (*prepare)(void),
+ void (*parent)(void), void (*child)(void))
+{
+ return pthread_atfork(prepare, parent, child);
+}
+
static void *wrapper_start_routine(void *s)
{
xbt_os_thread_t t = s;
const char *xbt_os_thread_self_name(void)
{
- xbt_os_thread_t self = xbt_os_thread_self();
- return self ? self->name : "main";
+ xbt_os_thread_t me = xbt_os_thread_self();
+ return me ? me->name : "main";
}
void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_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));
+ THROW2(system_error, errcode,
+ "xbt_mutex_timedacquire(%p) failed: %s", mutex,
+ strerror(errcode));
}
errcode = pthread_mutex_timedlock(&(mutex->m), &ts_end);
-#else /* Well, let's reimplement it since those lazy libc dudes didn't */
+#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)
errcode = ETIMEDOUT;
-#endif /* HAVE_MUTEX_TIMEDLOCK */
+#endif /* HAVE_MUTEX_TIMEDLOCK */
switch (errcode) {
case 0:
THROW1(system_error, errno, "sem_init() failed: %s", strerror(errno));
res->ps = &(res->s);
-#else /* damn, no sem_init(). Reimplement it */
+#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);
/* 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));
+ THROW1(system_error, errno, "sem_unlink() failed: %s",
+ strerror(errno));
#endif
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));
+ THROW2(system_error, errcode,
+ "xbt_os_sem_timedacquire(%p) failed: %s", sem,
+ strerror(errcode));
}
} else {
DEBUG2("sem_timedwait(%p,%p)", sem->ps, &ts_end);
errcode = sem_timedwait(sem->s, &ts_end);
-#else /* Okay, reimplement this function then */
+#else /* Okay, reimplement this function then */
double start = xbt_os_time();
do {
errcode = sem_trywait(sem->ps);
case ETIMEDOUT:
THROW2(timeout_error, delay,
- "semaphore %p wasn't signaled before timeout (%f)", sem, delay);
+ "semaphore %p wasn't signaled before timeout (%f)", sem,
+ delay);
default:
THROW3(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", 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));
+ 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));
void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot get the value of the NULL semaphore");
+ 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));
+ THROW1(system_error, errno, "sem_getvalue() failed: %s",
+ strerror(errno));
}
/* ********************************* WINDOWS IMPLEMENTATION ************************************ */
"TlsFree() failed to cleanup the thread submodule");
}
+int xbt_os_thread_atfork(void (*prepare)(void),
+ void (*parent)(void), void (*child)(void))
+{
+ return 0;
+}
+
static DWORD WINAPI wrapper_start_routine(void *s)
{
xbt_os_thread_t t = (xbt_os_thread_t) s;
{
if (WAIT_OBJECT_0 != WaitForSingleObject(thread->handle, INFINITE))
- THROW0(system_error, (int) GetLastError(), "WaitForSingleObject failed");
+ THROW0(system_error, (int) GetLastError(),
+ "WaitForSingleObject failed");
if (thread_return) {
if (!GetExitCodeThread(thread->handle, (DWORD *) (*thread_return)))
- THROW0(system_error, (int) GetLastError(), "GetExitCodeThread failed");
+ THROW0(system_error, (int) GetLastError(),
+ "GetExitCodeThread failed");
}
CloseHandle(thread->handle);
if (delay < 0) {
xbt_os_cond_wait(cond, mutex);
} else {
- DEBUG3("xbt_cond_timedwait(%p,%p,%lu)", &(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);
/* wait failure */
if (WAIT_OBJECT_0 != WaitForSingleObject(sem->h, INFINITE))
- THROW1(system_error, GetLastError(), "WaitForSingleObject() failed: %s",
- strerror(GetLastError()));
+ THROW1(system_error, GetLastError(),
+ "WaitForSingleObject() failed: %s", strerror(GetLastError()));
EnterCriticalSection(&(sem->value_lock));
sem->value--;
LeaveCriticalSection(&(sem->value_lock));
void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
{
if (!sem)
- THROW0(arg_error, EINVAL, "Cannot get the value of the NULL semaphore");
+ THROW0(arg_error, EINVAL,
+ "Cannot get the value of the NULL semaphore");
EnterCriticalSection(&(sem->value_lock));
*svalue = sem->value;
