A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix sem_init testing.
[simgrid.git]
/
src
/
xbt
/
xbt_os_thread.c
diff --git
a/src/xbt/xbt_os_thread.c
b/src/xbt/xbt_os_thread.c
index
d47334d
..
10f8266
100644
(file)
--- a/
src/xbt/xbt_os_thread.c
+++ b/
src/xbt/xbt_os_thread.c
@@
-2,8
+2,8
@@
/* 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 */
/* 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
- * All right
reserved.
*/
+/* Copyright
(c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All right
s reserved.
*/
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-72,7
+72,7
@@
static void _os_thread_ex_terminate(xbt_ex_t * e)
/* FIXME: there should be a configuration variable to choose to kill everyone or only this one */
}
/* FIXME: there should be a configuration variable to choose to kill everyone or only this one */
}
-void xbt_os_thread_mod_init(void)
+void xbt_os_thread_mod_
pre
init(void)
{
int errcode;
{
int errcode;
@@
-95,13
+95,13
@@
void xbt_os_thread_mod_init(void)
thread_mod_inited = 1;
thread_mod_inited = 1;
-#ifndef HAVE_SEM_
WA
IT
+#ifndef HAVE_SEM_
IN
IT
next_sem_ID_lock = xbt_os_mutex_init();
#endif
}
next_sem_ID_lock = xbt_os_mutex_init();
#endif
}
-void xbt_os_thread_mod_exit(void)
+void xbt_os_thread_mod_
post
exit(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 */
{
/* FIXME: don't try to free our key on shutdown.
Valgrind detects no leak if we don't, and whine if we try to */
@@
-113,7
+113,7
@@
void xbt_os_thread_mod_exit(void)
free(main_thread);
main_thread = NULL;
thread_mod_inited = 0;
free(main_thread);
main_thread = NULL;
thread_mod_inited = 0;
-#ifndef HAVE_SEM_
WA
IT
+#ifndef HAVE_SEM_
IN
IT
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
@@
-122,6
+122,12
@@
void xbt_os_thread_mod_exit(void)
__xbt_ex_terminate = &__xbt_ex_terminate_default;
}
__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;
static void *wrapper_start_routine(void *s)
{
xbt_os_thread_t t = s;
@@
-162,8
+168,8
@@
const char *xbt_os_thread_name(xbt_os_thread_t t)
const char *xbt_os_thread_self_name(void)
{
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)
}
void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return)
@@
-263,8
+269,9
@@
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
case ETIMEDOUT:
THROW1(timeout_error, 0, "mutex %p not ready", mutex);
default:
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));
}
}
@@
-280,7
+287,7
@@
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
errcode = pthread_mutex_timedlock(&(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 */
+#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));
double start = xbt_os_time();
do {
errcode = pthread_mutex_trylock(&(mutex->m));
@@
-291,7
+298,7
@@
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
if (errcode == EBUSY)
errcode = ETIMEDOUT;
if (errcode == EBUSY)
errcode = ETIMEDOUT;
-#endif /* HAVE_MUTEX_TIMEDLOCK */
+#endif
/* HAVE_MUTEX_TIMEDLOCK */
switch (errcode) {
case 0:
switch (errcode) {
case 0:
@@
-447,7
+454,7
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
THROW1(system_error, errno, "sem_init() failed: %s", strerror(errno));
res->ps = &(res->s);
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);
xbt_os_mutex_acquire(next_sem_ID_lock);
res->name = bprintf("/%d.%d", (*xbt_getpid) (), ++next_sem_ID);
@@
-464,7
+471,8
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
/* Remove the name from the semaphore namespace: we never join on it */
if (sem_unlink(res->name) < 0)
/* 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
#endif
@@
-497,8
+505,9
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
case ETIMEDOUT:
THROW1(timeout_error, 0, "semaphore %p not ready", sem);
default:
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 {
}
} else {
@@
-511,7
+520,7
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
DEBUG2("sem_timedwait(%p,%p)", sem->ps, &ts_end);
errcode = sem_timedwait(sem->s, &ts_end);
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);
double start = xbt_os_time();
do {
errcode = sem_trywait(sem->ps);
@@
-529,7
+538,8
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
case ETIMEDOUT:
THROW2(timeout_error, delay,
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,
default:
THROW3(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem,
@@
-553,10
+563,9
@@
void xbt_os_sem_destroy(xbt_os_sem_t sem)
THROW0(arg_error, EINVAL, "Cannot destroy the NULL sempahore");
#ifdef HAVE_SEM_INIT
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));
#else
if (sem_close(sem->ps) < 0)
THROW1(system_error, errno, "sem_close() failed: %s", strerror(errno));
@@
-569,15
+578,17
@@
void xbt_os_sem_destroy(xbt_os_sem_t sem)
void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
{
if (!sem)
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)
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 ************************************ */
}
/* ********************************* WINDOWS IMPLEMENTATION ************************************ */
-#elif defined(WIN32)
+#elif defined(
_XBT_
WIN32)
#include <math.h>
#include <math.h>
@@
-600,12
+611,12
@@
typedef struct xbt_os_thread_ {
/* key to the TLS containing the xbt_os_thread_t structure */
static unsigned long xbt_self_thread_key;
/* key to the TLS containing the xbt_os_thread_t structure */
static unsigned long xbt_self_thread_key;
-void xbt_os_thread_mod_init(void)
+void xbt_os_thread_mod_
pre
init(void)
{
xbt_self_thread_key = TlsAlloc();
}
{
xbt_self_thread_key = TlsAlloc();
}
-void xbt_os_thread_mod_exit(void)
+void xbt_os_thread_mod_
post
exit(void)
{
if (!TlsFree(xbt_self_thread_key))
{
if (!TlsFree(xbt_self_thread_key))
@@
-613,6
+624,12
@@
void xbt_os_thread_mod_exit(void)
"TlsFree() failed to cleanup the thread submodule");
}
"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;
static DWORD WINAPI wrapper_start_routine(void *s)
{
xbt_os_thread_t t = (xbt_os_thread_t) s;
@@
-667,12
+684,14
@@
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");
+ THROW0(system_error, (int) GetLastError(),
+ "WaitForSingleObject failed");
if (thread_return) {
if (!GetExitCodeThread(thread->handle, (DWORD *) (*thread_return)))
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);
}
CloseHandle(thread->handle);
@@
-862,8
+881,8
@@
void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex,
if (delay < 0) {
xbt_os_cond_wait(cond, mutex);
} else {
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);
/* lock the threads counter and increment it */
EnterCriticalSection(&cond->waiters_count_lock);
@@
-999,8
+1018,8
@@
void xbt_os_sem_acquire(xbt_os_sem_t sem)
/* wait failure */
if (WAIT_OBJECT_0 != WaitForSingleObject(sem->h, INFINITE))
/* 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));
EnterCriticalSection(&(sem->value_lock));
sem->value--;
LeaveCriticalSection(&(sem->value_lock));
@@
-1076,7
+1095,8
@@
void xbt_os_sem_destroy(xbt_os_sem_t sem)
void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
{
if (!sem)
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;
EnterCriticalSection(&(sem->value_lock));
*svalue = sem->value;