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 compilation error
[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
cb7a98e
..
2efd81e
100644
(file)
--- a/
src/xbt/xbt_os_thread.c
+++ b/
src/xbt/xbt_os_thread.c
@@
-1,15
+1,14
@@
-/* $Id$ */
-
/* xbt_os_thread -- portability layer over the pthread API */
/* 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 */
/* xbt_os_thread -- portability layer over the pthread API */
/* 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. */
+#include "gras_config.h"
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "xbt/ex_interface.h" /* We play crude games with exceptions */
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "xbt/ex_interface.h" /* We play crude games with exceptions */
@@
-42,10
+41,12
@@
static xbt_os_mutex_t next_sem_ID_lock;
typedef struct xbt_os_thread_ {
pthread_t t;
typedef struct xbt_os_thread_ {
pthread_t t;
+ int detached;
char *name;
void *param;
pvoid_f_pvoid_t start_routine;
char *name;
void *param;
pvoid_f_pvoid_t start_routine;
- ex_ctx_t *exception;
+ xbt_running_ctx_t *running_ctx;
+ void *extra_data;
} s_xbt_os_thread_t;
static xbt_os_thread_t main_thread = NULL;
} s_xbt_os_thread_t;
static xbt_os_thread_t main_thread = NULL;
@@
-54,15
+55,20
@@
static pthread_key_t xbt_self_thread_key;
static int thread_mod_inited = 0;
/* frees the xbt_os_thread_t corresponding to the current thread */
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 threa
d)
{
{
- 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 */
}
/* callback: context fetching */
-static
ex_ctx_t *_os_thread_ex
_ctx(void)
+static
xbt_running_ctx_t *_os_thread_get_running
_ctx(void)
{
{
- return xbt_os_thread_self()->
exception
;
+ return xbt_os_thread_self()->
running_ctx
;
}
/* callback: termination */
}
/* callback: termination */
@@
-74,7
+80,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;
@@
-82,76
+88,93
@@
void xbt_os_thread_mod_init(void)
return;
if ((errcode = pthread_key_create(&xbt_self_thread_key, NULL)))
return;
if ((errcode = pthread_key_create(&xbt_self_thread_key, NULL)))
- THROW
0
(system_error, errcode,
+ THROW
F
(system_error, errcode,
"pthread_key_create failed for xbt_self_thread_key");
"pthread_key_create failed for xbt_self_thread_key");
-
+
main_thread = xbt_new(s_xbt_os_thread_t, 1);
main_thread->name = (char *) "main";
main_thread->start_routine = NULL;
main_thread->param = NULL;
main_thread = xbt_new(s_xbt_os_thread_t, 1);
main_thread->name = (char *) "main";
main_thread->start_routine = NULL;
main_thread->param = NULL;
- main_thread->
exception = xbt_new(ex
_ctx_t, 1);
- XBT_
CTX_INITIALIZE(main_thread->exception
);
+ main_thread->
running_ctx = xbt_new(xbt_running
_ctx_t, 1);
+ XBT_
RUNNING_CTX_INITIALIZE(main_thread->running_ctx
);
- __xbt_ex_ctx = _os_thread_ex_ctx;
+ if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread)))
+ THROWF(system_error, errcode,
+ "pthread_setspecific failed for xbt_self_thread_key");
+
+
+ __xbt_running_ctx_fetch = _os_thread_get_running_ctx;
__xbt_ex_terminate = _os_thread_ex_terminate;
thread_mod_inited = 1;
__xbt_ex_terminate = _os_thread_ex_terminate;
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 */
// int errcode;
// if ((errcode=pthread_key_delete(xbt_self_thread_key)))
{
/* 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)))
- // THROW
0
(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key");
- free(main_thread->
exception
);
+ // THROW
F
(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key");
+ free(main_thread->
running_ctx
);
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
/* Restore the default exception setup */
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
/* Restore the default exception setup */
- __xbt_
ex_ctx
= &__xbt_ex_ctx_default;
+ __xbt_
running_ctx_fetch
= &__xbt_ex_ctx_default;
__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;
int errcode;
if ((errcode = pthread_setspecific(xbt_self_thread_key, t)))
static void *wrapper_start_routine(void *s)
{
xbt_os_thread_t t = s;
int errcode;
if ((errcode = pthread_setspecific(xbt_self_thread_key, t)))
- THROW
0
(system_error, errcode,
+ THROW
F
(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);
+ 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,
pvoid_f_pvoid_t start_routine,
}
xbt_os_thread_t xbt_os_thread_create(const char *name,
pvoid_f_pvoid_t start_routine,
- void *param)
+ void *param,
+ void *extra_data)
{
int errcode;
xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1);
{
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;
res_thread->name = xbt_strdup(name);
res_thread->start_routine = start_routine;
res_thread->param = param;
- res_thread->exception = xbt_new(ex_ctx_t, 1);
- XBT_CTX_INITIALIZE(res_thread->exception);
-
+ res_thread->running_ctx = xbt_new(xbt_running_ctx_t, 1);
+ XBT_RUNNING_CTX_INITIALIZE(res_thread->running_ctx);
+ res_thread->extra_data = extra_data;
+
if ((errcode = pthread_create(&(res_thread->t), NULL,
wrapper_start_routine, res_thread)))
if ((errcode = pthread_create(&(res_thread->t), NULL,
wrapper_start_routine, res_thread)))
- THROW
1
(system_error, errcode,
+ THROW
F
(system_error, errcode,
"pthread_create failed: %s", strerror(errcode));
return res_thread;
"pthread_create failed: %s", strerror(errcode));
return res_thread;
@@
-164,8
+187,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)
@@
-174,18
+197,9
@@
void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return)
int errcode;
if ((errcode = pthread_join(thread->t, thread_return)))
int errcode;
if ((errcode = pthread_join(thread->t, thread_return)))
- THROW
1
(system_error, errcode, "pthread_join failed: %s",
+ THROW
F
(system_error, errcode, "pthread_join failed: %s",
strerror(errcode));
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);
+ xbt_os_thread_free_thread_data(thread);
}
void xbt_os_thread_exit(int *retval)
}
void xbt_os_thread_exit(int *retval)
@@
-201,12
+215,16
@@
xbt_os_thread_t xbt_os_thread_self(void)
return NULL;
res = pthread_getspecific(xbt_self_thread_key);
return NULL;
res = pthread_getspecific(xbt_self_thread_key);
- if (!res)
- res = main_thread;
return res;
}
return res;
}
+void xbt_os_thread_detach(xbt_os_thread_t thread)
+{
+ thread->detached = 1;
+ pthread_detach(thread->t);
+}
+
#include <sched.h>
void xbt_os_thread_yield(void)
{
#include <sched.h>
void xbt_os_thread_yield(void)
{
@@
-233,7
+251,7
@@
xbt_os_mutex_t xbt_os_mutex_init(void)
int errcode;
if ((errcode = pthread_mutex_init(&(res->m), NULL)))
int errcode;
if ((errcode = pthread_mutex_init(&(res->m), NULL)))
- THROW
1
(system_error, errcode, "pthread_mutex_init() failed: %s",
+ THROW
F
(system_error, errcode, "pthread_mutex_init() failed: %s",
strerror(errcode));
return res;
strerror(errcode));
return res;
@@
-244,7
+262,7
@@
void xbt_os_mutex_acquire(xbt_os_mutex_t mutex)
int errcode;
if ((errcode = pthread_mutex_lock(&(mutex->m))))
int errcode;
if ((errcode = pthread_mutex_lock(&(mutex->m))))
- THROW
2
(system_error, errcode, "pthread_mutex_lock(%p) failed: %s",
+ THROW
F
(system_error, errcode, "pthread_mutex_lock(%p) failed: %s",
mutex, strerror(errcode));
}
mutex, strerror(errcode));
}
@@
-263,10
+281,11
@@
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
case 0:
return;
case ETIMEDOUT:
case 0:
return;
case ETIMEDOUT:
- THROW
1
(timeout_error, 0, "mutex %p not ready", mutex);
+ THROW
F
(timeout_error, 0, "mutex %p not ready", mutex);
default:
default:
- THROW2(system_error, errcode, "xbt_mutex_timedacquire(%p) failed: %s",
- mutex, strerror(errcode));
+ THROWF(system_error, errcode,
+ "xbt_mutex_timedacquire(%p) failed: %s", mutex,
+ strerror(errcode));
}
}
@@
-278,11
+297,11
@@
void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay)
ts_end.tv_sec = (time_t) floor(end);
ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000);
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);
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));
@@
-293,18
+312,18
@@
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:
return;
case ETIMEDOUT:
switch (errcode) {
case 0:
return;
case ETIMEDOUT:
- THROW
2
(timeout_error, delay,
+ THROW
F
(timeout_error, delay,
"mutex %p wasn't signaled before timeout (%f)", mutex, delay);
default:
"mutex %p wasn't signaled before timeout (%f)", mutex, delay);
default:
- THROW
3
(system_error, errcode,
+ THROW
F
(system_error, errcode,
"pthread_mutex_timedlock(%p,%f) failed: %s", mutex, delay,
strerror(errcode));
}
"pthread_mutex_timedlock(%p,%f) failed: %s", mutex, delay,
strerror(errcode));
}
@@
-316,7
+335,7
@@
void xbt_os_mutex_release(xbt_os_mutex_t mutex)
int errcode;
if ((errcode = pthread_mutex_unlock(&(mutex->m))))
int errcode;
if ((errcode = pthread_mutex_unlock(&(mutex->m))))
- THROW
2
(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s",
+ THROW
F
(system_error, errcode, "pthread_mutex_unlock(%p) failed: %s",
mutex, strerror(errcode));
}
mutex, strerror(errcode));
}
@@
-328,7
+347,7
@@
void xbt_os_mutex_destroy(xbt_os_mutex_t mutex)
return;
if ((errcode = pthread_mutex_destroy(&(mutex->m))))
return;
if ((errcode = pthread_mutex_destroy(&(mutex->m))))
- THROW
2
(system_error, errcode, "pthread_mutex_destroy(%p) failed: %s",
+ THROW
F
(system_error, errcode, "pthread_mutex_destroy(%p) failed: %s",
mutex, strerror(errcode));
free(mutex);
}
mutex, strerror(errcode));
free(mutex);
}
@@
-344,7
+363,7
@@
xbt_os_cond_t xbt_os_cond_init(void)
xbt_os_cond_t res = xbt_new(s_xbt_os_cond_t, 1);
int errcode;
if ((errcode = pthread_cond_init(&(res->c), NULL)))
xbt_os_cond_t res = xbt_new(s_xbt_os_cond_t, 1);
int errcode;
if ((errcode = pthread_cond_init(&(res->c), NULL)))
- THROW
1
(system_error, errcode, "pthread_cond_init() failed: %s",
+ THROW
F
(system_error, errcode, "pthread_cond_init() failed: %s",
strerror(errcode));
return res;
strerror(errcode));
return res;
@@
-354,7
+373,7
@@
void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex)
{
int errcode;
if ((errcode = pthread_cond_wait(&(cond->c), &(mutex->m))))
{
int errcode;
if ((errcode = pthread_cond_wait(&(cond->c), &(mutex->m))))
- THROW
3
(system_error, errcode, "pthread_cond_wait(%p,%p) failed: %s",
+ THROW
F
(system_error, errcode, "pthread_cond_wait(%p,%p) failed: %s",
cond, mutex, strerror(errcode));
}
cond, mutex, strerror(errcode));
}
@@
-371,18
+390,18
@@
void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex,
} else {
ts_end.tv_sec = (time_t) floor(end);
ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000);
} 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:
&ts_end);
switch ((errcode =
pthread_cond_timedwait(&(cond->c), &(mutex->m), &ts_end))) {
case 0:
return;
case ETIMEDOUT:
- THROW
3
(timeout_error, errcode,
+ THROW
F
(timeout_error, errcode,
"condition %p (mutex %p) wasn't signaled before timeout (%f)",
cond, mutex, delay);
default:
"condition %p (mutex %p) wasn't signaled before timeout (%f)",
cond, mutex, delay);
default:
- THROW
4
(system_error, errcode,
+ THROW
F
(system_error, errcode,
"pthread_cond_timedwait(%p,%p,%f) failed: %s", cond, mutex,
delay, strerror(errcode));
}
"pthread_cond_timedwait(%p,%p,%f) failed: %s", cond, mutex,
delay, strerror(errcode));
}
@@
-393,7
+412,7
@@
void xbt_os_cond_signal(xbt_os_cond_t cond)
{
int errcode;
if ((errcode = pthread_cond_signal(&(cond->c))))
{
int errcode;
if ((errcode = pthread_cond_signal(&(cond->c))))
- THROW
2
(system_error, errcode, "pthread_cond_signal(%p) failed: %s",
+ THROW
F
(system_error, errcode, "pthread_cond_signal(%p) failed: %s",
cond, strerror(errcode));
}
cond, strerror(errcode));
}
@@
-401,7
+420,7
@@
void xbt_os_cond_broadcast(xbt_os_cond_t cond)
{
int errcode;
if ((errcode = pthread_cond_broadcast(&(cond->c))))
{
int errcode;
if ((errcode = pthread_cond_broadcast(&(cond->c))))
- THROW
2
(system_error, errcode, "pthread_cond_broadcast(%p) failed: %s",
+ THROW
F
(system_error, errcode, "pthread_cond_broadcast(%p) failed: %s",
cond, strerror(errcode));
}
cond, strerror(errcode));
}
@@
-413,7
+432,7
@@
void xbt_os_cond_destroy(xbt_os_cond_t cond)
return;
if ((errcode = pthread_cond_destroy(&(cond->c))))
return;
if ((errcode = pthread_cond_destroy(&(cond->c))))
- THROW
2
(system_error, errcode, "pthread_cond_destroy(%p) failed: %s",
+ THROW
F
(system_error, errcode, "pthread_cond_destroy(%p) failed: %s",
cond, strerror(errcode));
free(cond);
}
cond, strerror(errcode));
free(cond);
}
@@
-446,13
+465,13
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
*/
#ifdef HAVE_SEM_INIT
if (sem_init(&(res->s), 0, value) != 0)
*/
#ifdef HAVE_SEM_INIT
if (sem_init(&(res->s), 0, value) != 0)
- THROW
1
(system_error, errno, "sem_init() failed: %s", strerror(errno));
+ THROW
F
(system_error, errno, "sem_init() failed: %s", strerror(errno));
res->ps = &(res->s);
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);
xbt_os_mutex_acquire(next_sem_ID_lock);
- res->name = bprintf("/%d
.%d", (*xbt_getpid) ()
, ++next_sem_ID);
+ res->name = bprintf("/%d
"
, ++next_sem_ID);
xbt_os_mutex_release(next_sem_ID_lock);
res->ps = sem_open(res->name, O_CREAT, 0644, value);
xbt_os_mutex_release(next_sem_ID_lock);
res->ps = sem_open(res->name, O_CREAT, 0644, value);
@@
-462,11
+481,12
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
res->ps = sem_open(res->name, O_CREAT, 0644, 1);
}
if ((res->ps == (sem_t *) SEM_FAILED))
res->ps = sem_open(res->name, O_CREAT, 0644, 1);
}
if ((res->ps == (sem_t *) SEM_FAILED))
- THROW
1
(system_error, errno, "sem_open() failed: %s", strerror(errno));
+ THROW
F
(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)
/* 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));
+ THROWF(system_error, errno, "sem_unlink() failed: %s",
+ strerror(errno));
#endif
#endif
@@
-476,9
+496,9
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
void xbt_os_sem_acquire(xbt_os_sem_t sem)
{
if (!sem)
void xbt_os_sem_acquire(xbt_os_sem_t sem)
{
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
+ THROW
F
(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
if (sem_wait(sem->ps) < 0)
if (sem_wait(sem->ps) < 0)
- THROW
1
(system_error, errno, "sem_wait() failed: %s", strerror(errno));
+ THROW
F
(system_error, errno, "sem_wait() failed: %s", strerror(errno));
}
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
}
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
@@
-486,7
+506,7
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
int errcode;
if (!sem)
int errcode;
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
+ THROW
F
(arg_error, EINVAL, "Cannot acquire of the NULL semaphore");
if (delay < 0) {
xbt_os_sem_acquire(sem);
if (delay < 0) {
xbt_os_sem_acquire(sem);
@@
-497,10
+517,11
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
case 0:
return;
case ETIMEDOUT:
case 0:
return;
case ETIMEDOUT:
- THROW
1
(timeout_error, 0, "semaphore %p not ready", sem);
+ THROW
F
(timeout_error, 0, "semaphore %p not ready", sem);
default:
default:
- THROW2(system_error, errcode, "xbt_os_sem_timedacquire(%p) failed: %s",
- sem, strerror(errcode));
+ THROWF(system_error, errcode,
+ "xbt_os_sem_timedacquire(%p) failed: %s", sem,
+ strerror(errcode));
}
} else {
}
} else {
@@
-510,10
+531,10
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
ts_end.tv_sec = (time_t) floor(end);
ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000);
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);
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);
@@
-530,11
+551,12
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
return;
case ETIMEDOUT:
return;
case ETIMEDOUT:
- THROW2(timeout_error, delay,
- "semaphore %p wasn't signaled before timeout (%f)", sem, delay);
+ THROWF(timeout_error, delay,
+ "semaphore %p wasn't signaled before timeout (%f)", sem,
+ delay);
default:
default:
- THROW
3
(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem,
+ THROW
F
(system_error, errcode, "sem_timedwait(%p,%f) failed: %s", sem,
delay, strerror(errcode));
}
}
delay, strerror(errcode));
}
}
@@
-543,25
+565,24
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double delay)
void xbt_os_sem_release(xbt_os_sem_t sem)
{
if (!sem)
void xbt_os_sem_release(xbt_os_sem_t sem)
{
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot release of the NULL semaphore");
+ THROW
F
(arg_error, EINVAL, "Cannot release of the NULL semaphore");
if (sem_post(sem->ps) < 0)
if (sem_post(sem->ps) < 0)
- THROW
1
(system_error, errno, "sem_post() failed: %s", strerror(errno));
+ THROW
F
(system_error, errno, "sem_post() failed: %s", strerror(errno));
}
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
if (!sem)
}
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot destroy the NULL sempahore");
+ THROW
F
(arg_error, EINVAL, "Cannot destroy the NULL sempahore");
#ifdef HAVE_SEM_INIT
#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)
+ THROWF(system_error, errno, "sem_destroy() failed: %s",
+ strerror(errno));
#else
if (sem_close(sem->ps) < 0)
#else
if (sem_close(sem->ps) < 0)
- THROW
1
(system_error, errno, "sem_close() failed: %s", strerror(errno));
+ THROW
F
(system_error, errno, "sem_close() failed: %s", strerror(errno));
xbt_free(sem->name);
#endif
xbt_free(sem->name);
#endif
@@
-571,15
+592,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");
+ THROWF(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));
+ THROWF(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>
@@
-589,6
+612,7
@@
typedef struct xbt_os_thread_ {
unsigned long id; /* the win thread id */
pvoid_f_pvoid_t start_routine;
void *param;
unsigned long id; /* the win thread id */
pvoid_f_pvoid_t start_routine;
void *param;
+ void *extra_data;
} s_xbt_os_thread_t;
/* so we can specify the size of the stack of the threads */
} s_xbt_os_thread_t;
/* so we can specify the size of the stack of the threads */
@@
-602,26
+626,32
@@
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))
- THROW
0
(system_error, (int) GetLastError(),
+ THROW
F
(system_error, (int) GetLastError(),
"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;
DWORD *rv;
if (!TlsSetValue(xbt_self_thread_key, t))
static DWORD WINAPI wrapper_start_routine(void *s)
{
xbt_os_thread_t t = (xbt_os_thread_t) s;
DWORD *rv;
if (!TlsSetValue(xbt_self_thread_key, t))
- THROW
0
(system_error, (int) GetLastError(),
+ THROW
F
(system_error, (int) GetLastError(),
"TlsSetValue of data describing the created thread failed");
rv = (DWORD *) ((t->start_routine) (t->param));
"TlsSetValue of data describing the created thread failed");
rv = (DWORD *) ((t->start_routine) (t->param));
@@
-633,7
+663,8
@@
static DWORD WINAPI wrapper_start_routine(void *s)
xbt_os_thread_t xbt_os_thread_create(const char *name,
pvoid_f_pvoid_t start_routine,
xbt_os_thread_t xbt_os_thread_create(const char *name,
pvoid_f_pvoid_t start_routine,
- void *param)
+ void *param,
+ void *extra_data)
{
xbt_os_thread_t t = xbt_new(s_xbt_os_thread_t, 1);
{
xbt_os_thread_t t = xbt_new(s_xbt_os_thread_t, 1);
@@
-641,14
+672,14
@@
xbt_os_thread_t xbt_os_thread_create(const char *name,
t->name = xbt_strdup(name);
t->start_routine = start_routine;
t->param = param;
t->name = xbt_strdup(name);
t->start_routine = start_routine;
t->param = param;
-
+ t->extra_data = extra_data;
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);
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);
- THROW
0
(system_error, (int) GetLastError(), "CreateThread failed");
+ THROW
F
(system_error, (int) GetLastError(), "CreateThread failed");
}
return t;
}
return t;
@@
-669,12
+700,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");
+ THROWF(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");
+ THROWF(system_error, (int) GetLastError(),
+ "GetExitCodeThread failed");
}
CloseHandle(thread->handle);
}
CloseHandle(thread->handle);
@@
-693,6
+726,12
@@
void xbt_os_thread_exit(int *retval)
ExitThread(0);
}
ExitThread(0);
}
+void xbt_os_thread_detach(xbt_os_thread_t thread)
+{
+ THROW_UNIMPLEMENTED;
+}
+
+
xbt_os_thread_t xbt_os_thread_self(void)
{
return TlsGetValue(xbt_self_thread_key);
xbt_os_thread_t xbt_os_thread_self(void)
{
return TlsGetValue(xbt_self_thread_key);
@@
-713,7
+752,7
@@
void xbt_os_thread_yield(void)
void xbt_os_thread_cancel(xbt_os_thread_t t)
{
if (!TerminateThread(t->handle, 0))
void xbt_os_thread_cancel(xbt_os_thread_t t)
{
if (!TerminateThread(t->handle, 0))
- THROW
0
(system_error, (int) GetLastError(), "TerminateThread failed");
+ THROW
F
(system_error, (int) GetLastError(), "TerminateThread failed");
}
/****** mutex related functions ******/
}
/****** mutex related functions ******/
@@
-792,7
+831,7
@@
xbt_os_cond_t xbt_os_cond_init(void)
if (!res->events[SIGNAL]) {
DeleteCriticalSection(&res->waiters_count_lock);
free(res);
if (!res->events[SIGNAL]) {
DeleteCriticalSection(&res->waiters_count_lock);
free(res);
- THROW
0
(system_error, 0, "CreateEvent failed for the signals");
+ THROW
F
(system_error, 0, "CreateEvent failed for the signals");
}
/* Create a manual-reset event. */
}
/* Create a manual-reset event. */
@@
-803,7
+842,7
@@
xbt_os_cond_t xbt_os_cond_init(void)
DeleteCriticalSection(&res->waiters_count_lock);
CloseHandle(res->events[SIGNAL]);
free(res);
DeleteCriticalSection(&res->waiters_count_lock);
CloseHandle(res->events[SIGNAL]);
free(res);
- THROW
0
(system_error, 0, "CreateEvent failed for the broadcasts");
+ THROW
F
(system_error, 0, "CreateEvent failed for the broadcasts");
}
return res;
}
return res;
@@
-827,7
+866,7
@@
void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex)
wait_result = WaitForMultipleObjects(2, cond->events, FALSE, INFINITE);
if (wait_result == WAIT_FAILED)
wait_result = WaitForMultipleObjects(2, cond->events, FALSE, INFINITE);
if (wait_result == WAIT_FAILED)
- THROW
0
(system_error, 0,
+ THROW
F
(system_error, 0,
"WaitForMultipleObjects failed, so we cannot wait on the condition");
/* we have a signal lock the condition */
"WaitForMultipleObjects failed, so we cannot wait on the condition");
/* we have a signal lock the condition */
@@
-846,7
+885,7
@@
void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex)
*/
if (is_last_waiter)
if (!ResetEvent(cond->events[BROADCAST]))
*/
if (is_last_waiter)
if (!ResetEvent(cond->events[BROADCAST]))
- THROW
0
(system_error, 0, "ResetEvent failed");
+ THROW
F
(system_error, 0, "ResetEvent failed");
/* relock the mutex associated with the condition in accordance with the posix thread specification */
EnterCriticalSection(&mutex->lock);
/* relock the mutex associated with the condition in accordance with the posix thread specification */
EnterCriticalSection(&mutex->lock);
@@
-864,8
+903,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);
+
XBT_DEBUG("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);
@@
-880,11
+919,11
@@
void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex,
switch (wait_result) {
case WAIT_TIMEOUT:
switch (wait_result) {
case WAIT_TIMEOUT:
- THROW
3
(timeout_error, GetLastError(),
+ THROW
F
(timeout_error, GetLastError(),
"condition %p (mutex %p) wasn't signaled before timeout (%f)",
cond, mutex, delay);
case WAIT_FAILED:
"condition %p (mutex %p) wasn't signaled before timeout (%f)",
cond, mutex, delay);
case WAIT_FAILED:
- THROW
0
(system_error, GetLastError(),
+ THROW
F
(system_error, GetLastError(),
"WaitForMultipleObjects failed, so we cannot wait on the condition");
}
"WaitForMultipleObjects failed, so we cannot wait on the condition");
}
@@
-904,7
+943,7
@@
void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex,
*/
if (is_last_waiter)
if (!ResetEvent(cond->events[BROADCAST]))
*/
if (is_last_waiter)
if (!ResetEvent(cond->events[BROADCAST]))
- THROW
0
(system_error, 0, "ResetEvent failed");
+ THROW
F
(system_error, 0, "ResetEvent failed");
/* relock the mutex associated with the condition in accordance with the posix thread specification */
EnterCriticalSection(&mutex->lock);
/* relock the mutex associated with the condition in accordance with the posix thread specification */
EnterCriticalSection(&mutex->lock);
@@
-922,7
+961,7
@@
void xbt_os_cond_signal(xbt_os_cond_t cond)
if (have_waiters)
if (!SetEvent(cond->events[SIGNAL]))
if (have_waiters)
if (!SetEvent(cond->events[SIGNAL]))
- THROW
0
(system_error, 0, "SetEvent failed");
+ THROW
F
(system_error, 0, "SetEvent failed");
xbt_os_thread_yield();
}
xbt_os_thread_yield();
}
@@
-957,7
+996,7
@@
void xbt_os_cond_destroy(xbt_os_cond_t cond)
xbt_free(cond);
if (error)
xbt_free(cond);
if (error)
- THROW
0
(system_error, 0, "Error while destroying the condition");
+ THROW
F
(system_error, 0, "Error while destroying the condition");
}
typedef struct xbt_os_sem_ {
}
typedef struct xbt_os_sem_ {
@@
-975,14
+1014,14
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
xbt_os_sem_t res;
if (value > INT_MAX)
xbt_os_sem_t res;
if (value > INT_MAX)
- THROW
1
(arg_error, value,
+ THROW
F
(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))) {
"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))) {
- THROW
1
(system_error, GetLastError(), "CreateSemaphore() failed: %s",
+ THROW
F
(system_error, GetLastError(), "CreateSemaphore() failed: %s",
strerror(GetLastError()));
return NULL;
}
strerror(GetLastError()));
return NULL;
}
@@
-997,12
+1036,12
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
void xbt_os_sem_acquire(xbt_os_sem_t sem)
{
if (!sem)
void xbt_os_sem_acquire(xbt_os_sem_t sem)
{
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
+ THROW
F
(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
/* wait failure */
if (WAIT_OBJECT_0 != WaitForSingleObject(sem->h, INFINITE))
/* wait failure */
if (WAIT_OBJECT_0 != WaitForSingleObject(sem->h, INFINITE))
- THROW
1(system_error, GetLastError(), "WaitForSingleObject() failed: %s"
,
- strerror(GetLastError()));
+ THROW
F(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));
@@
-1015,7
+1054,7
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout)
double end = timeout + xbt_os_time();
if (!sem)
double end = timeout + xbt_os_time();
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
+ THROW
F
(arg_error, EINVAL, "Cannot acquire the NULL semaphore");
if (timeout < 0) {
xbt_os_sem_acquire(sem);
if (timeout < 0) {
xbt_os_sem_acquire(sem);
@@
-1034,13
+1073,13
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout)
return;
case WAIT_TIMEOUT:
return;
case WAIT_TIMEOUT:
- THROW
2
(timeout_error, GetLastError(),
+ THROW
F
(timeout_error, GetLastError(),
"semaphore %p wasn't signaled before timeout (%f)", sem,
timeout);
return;
default:
"semaphore %p wasn't signaled before timeout (%f)", sem,
timeout);
return;
default:
- THROW
3
(system_error, GetLastError(),
+ THROW
F
(system_error, GetLastError(),
"WaitForSingleObject(%p,%f) failed: %s", sem, timeout,
strerror(GetLastError()));
}
"WaitForSingleObject(%p,%f) failed: %s", sem, timeout,
strerror(GetLastError()));
}
@@
-1050,10
+1089,10
@@
void xbt_os_sem_timedacquire(xbt_os_sem_t sem, double timeout)
void xbt_os_sem_release(xbt_os_sem_t sem)
{
if (!sem)
void xbt_os_sem_release(xbt_os_sem_t sem)
{
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot release the NULL semaphore");
+ THROW
F
(arg_error, EINVAL, "Cannot release the NULL semaphore");
if (!ReleaseSemaphore(sem->h, 1, NULL))
if (!ReleaseSemaphore(sem->h, 1, NULL))
- THROW
1
(system_error, GetLastError(), "ReleaseSemaphore() failed: %s",
+ THROW
F
(system_error, GetLastError(), "ReleaseSemaphore() failed: %s",
strerror(GetLastError()));
EnterCriticalSection(&(sem->value_lock));
sem->value++;
strerror(GetLastError()));
EnterCriticalSection(&(sem->value_lock));
sem->value++;
@@
-1063,10
+1102,10
@@
void xbt_os_sem_release(xbt_os_sem_t sem)
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
if (!sem)
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
if (!sem)
- THROW
0
(arg_error, EINVAL, "Cannot destroy the NULL semaphore");
+ THROW
F
(arg_error, EINVAL, "Cannot destroy the NULL semaphore");
if (!CloseHandle(sem->h))
if (!CloseHandle(sem->h))
- THROW
1
(system_error, GetLastError(), "CloseHandle() failed: %s",
+ THROW
F
(system_error, GetLastError(), "CloseHandle() failed: %s",
strerror(GetLastError()));
DeleteCriticalSection(&(sem->value_lock));
strerror(GetLastError()));
DeleteCriticalSection(&(sem->value_lock));
@@
-1078,11
+1117,23
@@
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");
+ THROWF(arg_error, EINVAL,
+ "Cannot get the value of the NULL semaphore");
EnterCriticalSection(&(sem->value_lock));
*svalue = sem->value;
LeaveCriticalSection(&(sem->value_lock));
}
EnterCriticalSection(&(sem->value_lock));
*svalue = sem->value;
LeaveCriticalSection(&(sem->value_lock));
}
+
#endif
#endif
+
+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;
+}