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
xbt_fifo are no longer used, remove the code
[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
0c1ae33
..
6208210
100644
(file)
--- a/
src/xbt/xbt_os_thread.c
+++ b/
src/xbt/xbt_os_thread.c
@@
-37,7
+37,6
@@
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "xbt/sysdep.h"
#include "xbt/ex.h"
-#include "src/xbt/ex_interface.h" /* We play crude games with exceptions */
#include "src/internal_config.h"
#include "xbt/xbt_os_time.h" /* Portable time facilities */
#include "xbt/xbt_os_thread.h" /* This module */
#include "src/internal_config.h"
#include "xbt/xbt_os_time.h" /* Portable time facilities */
#include "xbt/xbt_os_thread.h" /* This module */
@@
-45,7
+44,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)");
-/* use named sem
pa
hore when sem_init() does not work */
+/* use named sem
ap
hore when sem_init() does not work */
#if !HAVE_SEM_INIT
static int next_sem_ID = 0;
static xbt_os_mutex_t next_sem_ID_lock;
#if !HAVE_SEM_INIT
static int next_sem_ID = 0;
static xbt_os_mutex_t next_sem_ID_lock;
@@
-57,7
+56,6
@@
typedef struct xbt_os_thread_ {
char *name;
void *param;
pvoid_f_pvoid_t start_routine;
char *name;
void *param;
pvoid_f_pvoid_t start_routine;
- xbt_running_ctx_t *running_ctx;
void *extra_data;
} s_xbt_os_thread_t;
static xbt_os_thread_t main_thread = NULL;
void *extra_data;
} s_xbt_os_thread_t;
static xbt_os_thread_t main_thread = NULL;
@@
-75,18
+73,10
@@
static void xbt_os_thread_free_thread_data(xbt_os_thread_t thread)
{
if (thread == main_thread) /* just killed main thread */
main_thread = NULL;
{
if (thread == main_thread) /* just killed main thread */
main_thread = NULL;
-
- free(thread->running_ctx);
free(thread->name);
free(thread);
}
free(thread->name);
free(thread);
}
-/* callback: context fetching */
-static xbt_running_ctx_t *_os_thread_get_running_ctx(void)
-{
- return xbt_os_thread_self()->running_ctx;
-}
-
/* callback: termination */
static void _os_thread_ex_terminate(xbt_ex_t * e)
{
/* callback: termination */
static void _os_thread_ex_terminate(xbt_ex_t * e)
{
@@
-109,17
+99,12
@@
void xbt_os_thread_mod_preinit(void)
main_thread->name = (char *) "main";
main_thread->param = NULL;
main_thread->start_routine = NULL;
main_thread->name = (char *) "main";
main_thread->param = NULL;
main_thread->start_routine = NULL;
- main_thread->running_ctx = xbt_new(xbt_running_ctx_t, 1);
main_thread->extra_data = NULL;
main_thread->extra_data = NULL;
- XBT_RUNNING_CTX_INITIALIZE(main_thread->running_ctx);
if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread)))
THROWF(system_error, errcode,
"Impossible to set the SimGrid identity descriptor to the main thread (pthread_setspecific failed)");
if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread)))
THROWF(system_error, errcode,
"Impossible to set the SimGrid identity descriptor to the main thread (pthread_setspecific failed)");
- __xbt_running_ctx_fetch = _os_thread_get_running_ctx;
- __xbt_ex_terminate = _os_thread_ex_terminate;
-
pthread_attr_init(&thread_attr);
thread_mod_inited = 1;
pthread_attr_init(&thread_attr);
thread_mod_inited = 1;
@@
-137,17
+122,12
@@
void xbt_os_thread_mod_postexit(void)
// if ((errcode=pthread_key_delete(xbt_self_thread_key)))
// THROWF(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key");
// if ((errcode=pthread_key_delete(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;
thread_mod_inited = 0;
#if !HAVE_SEM_INIT
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
free(main_thread);
main_thread = NULL;
thread_mod_inited = 0;
#if !HAVE_SEM_INIT
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
-
- /* Restore the default exception setup */
- __xbt_running_ctx_fetch = &__xbt_ex_ctx_default;
- __xbt_ex_terminate = &__xbt_ex_terminate_default;
}
/** Calls pthread_atfork() if present, and raise an exception otherwise.
}
/** Calls pthread_atfork() if present, and raise an exception otherwise.
@@
-183,8
+163,6
@@
xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_ro
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->running_ctx = xbt_new(xbt_running_ctx_t, 1);
- XBT_RUNNING_CTX_INITIALIZE(res_thread->running_ctx);
res_thread->extra_data = extra_data;
int errcode = pthread_create(&(res_thread->t), &thread_attr, wrapper_start_routine, res_thread);
res_thread->extra_data = extra_data;
int errcode = pthread_create(&(res_thread->t), &thread_attr, wrapper_start_routine, res_thread);
@@
-272,7
+250,7
@@
void xbt_os_thread_exit(int *retval)
pthread_exit(retval);
}
pthread_exit(retval);
}
-xbt_os_thread_t xbt_os_thread_self(void)
+xbt_os_thread_t xbt_os_thread_self(void
)
{
if (!thread_mod_inited)
return NULL;
{
if (!thread_mod_inited)
return NULL;
@@
-473,13
+451,6
@@
void xbt_os_sem_destroy(xbt_os_sem_t sem)
xbt_free(sem);
}
xbt_free(sem);
}
-void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue)
-{
- if (sem_getvalue(&(sem->s), svalue) < 0)
- THROWF(system_error, errno, "sem_getvalue() failed: %s",
- strerror(errno));
-}
-
/** @brief Returns the amount of cores on the current host */
int xbt_os_get_numcores(void) {
#ifdef WIN32
/** @brief Returns the amount of cores on the current host */
int xbt_os_get_numcores(void) {
#ifdef WIN32