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
Replace, when possible, calls to bprintf() by calls to xbt_strdup().
[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
10f8266
..
2cd9d87
100644
(file)
--- a/
src/xbt/xbt_os_thread.c
+++ b/
src/xbt/xbt_os_thread.c
@@
-8,6
+8,7
@@
/* 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 */
@@
-40,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;
@@
-52,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 */
@@
-82,15
+90,20
@@
void xbt_os_thread_mod_preinit(void)
if ((errcode = pthread_key_create(&xbt_self_thread_key, NULL)))
THROW0(system_error, errcode,
"pthread_key_create failed for xbt_self_thread_key");
if ((errcode = pthread_key_create(&xbt_self_thread_key, NULL)))
THROW0(system_error, errcode,
"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)))
+ THROW0(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;
@@
-109,7
+122,7
@@
void xbt_os_thread_mod_postexit(void)
// if ((errcode=pthread_key_delete(xbt_self_thread_key)))
// THROW0(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key");
// 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->
running_ctx
);
free(main_thread);
main_thread = NULL;
thread_mod_inited = 0;
free(main_thread);
main_thread = NULL;
thread_mod_inited = 0;
@@
-118,7
+131,7
@@
void xbt_os_thread_mod_postexit(void)
#endif
/* Restore the default exception setup */
#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;
}
@@
-137,22
+150,28
@@
static void *wrapper_start_routine(void *s)
THROW0(system_error, errcode,
"pthread_setspecific failed for xbt_self_thread_key");
THROW0(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,
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)))
THROW1(system_error, errcode,
if ((errcode = pthread_create(&(res_thread->t), NULL,
wrapper_start_routine, res_thread)))
THROW1(system_error, errcode,
@@
-180,16
+199,7
@@
void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return)
if ((errcode = pthread_join(thread->t, thread_return)))
THROW1(system_error, errcode, "pthread_join failed: %s",
strerror(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);
+ xbt_os_thread_free_thread_data(thread);
}
void xbt_os_thread_exit(int *retval)
}
void xbt_os_thread_exit(int *retval)
@@
-205,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)
{
@@
-283,7
+297,7
@@
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);
@@
-376,7
+390,7
@@
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))) {
&ts_end);
switch ((errcode =
pthread_cond_timedwait(&(cond->c), &(mutex->m), &ts_end))) {
@@
-457,7
+471,7
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
#else /* damn, no sem_init(). Reimplement it */
xbt_os_mutex_acquire(next_sem_ID_lock);
#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);
+ 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);
@@
-517,7
+531,7
@@
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);
#else /* Okay, reimplement this function then */
errcode = sem_timedwait(sem->s, &ts_end);
#else /* Okay, reimplement this function then */
@@
-598,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 */
@@
-648,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);
@@
-656,7
+672,7
@@
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));
t->handle = CreateThread(NULL, XBT_DEFAULT_THREAD_STACK_SIZE,
(LPTHREAD_START_ROUTINE) wrapper_start_routine,
t, STACK_SIZE_PARAM_IS_A_RESERVATION, &(t->id));
@@
-710,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);
@@
-881,7
+903,7
@@
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),
+
XBT_DEBUG
("xbt_cond_timedwait(%p,%p,%lu)", &(cond->events),
&(mutex->lock), end);
/* lock the threads counter and increment it */
&(mutex->lock), end);
/* lock the threads counter and increment it */
@@
-1103,4
+1125,15
@@
void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
LeaveCriticalSection(&(sem->value_lock));
}
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;
+}