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
tidy the scope of some more locals
[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
b80fb31
..
b83e310
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,8
+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 sempahore when sem_init() does not work */
+/* use named semaphore 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;
@@
-58,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;
@@
-76,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)
{
@@
-107,19
+96,14
@@
void xbt_os_thread_mod_preinit(void)
main_thread = xbt_new(s_xbt_os_thread_t, 1);
main_thread->name = NULL;
main_thread->detached = 0;
main_thread = xbt_new(s_xbt_os_thread_t, 1);
main_thread->name = NULL;
main_thread->detached = 0;
- main_thread->name =
(char *) "main"
;
+ main_thread->name =
xbt_strdup("main")
;
main_thread->param = NULL;
main_thread->start_routine = NULL;
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);
pthread_attr_init(&thread_attr);
@@
-138,17
+122,13
@@
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->
name
);
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.
@@
-177,7
+157,6
@@
static void *wrapper_start_routine(void *s)
return res;
}
return res;
}
-
xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, void *extra_data)
{
xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1);
xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, void *extra_data)
{
xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1);
@@
-185,8
+164,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);
@@
-258,7
+235,7
@@
void xbt_os_thread_setguardsize(int guard_size)
const char *xbt_os_thread_self_name(void)
{
xbt_os_thread_t me = xbt_os_thread_self();
const char *xbt_os_thread_self_name(void)
{
xbt_os_thread_t me = xbt_os_thread_self();
- return me ? me->name : "main";
+ return me ?
(const char *)
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)
@@
-274,7
+251,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;
@@
-288,13
+265,14
@@
void xbt_os_thread_key_create(xbt_os_thread_key_t* key)
xbt_assert(errcode==0 , "pthread_key_create failed");
}
xbt_assert(errcode==0 , "pthread_key_create failed");
}
-void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value)
{
-
+void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value)
+{
int errcode = pthread_setspecific(key, value);
xbt_assert(errcode==0, "pthread_setspecific failed");
}
int errcode = pthread_setspecific(key, value);
xbt_assert(errcode==0, "pthread_setspecific failed");
}
-void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) {
+void* xbt_os_thread_get_specific(xbt_os_thread_key_t key)
+{
return pthread_getspecific(key);
}
return pthread_getspecific(key);
}
@@
-427,13
+405,15
@@
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", ++next_sem_ID);
+ res->name = bprintf("/
sg-
%d", ++next_sem_ID);
xbt_os_mutex_release(next_sem_ID_lock);
xbt_os_mutex_release(next_sem_ID_lock);
+ sem_unlink(res->name);
res->ps = sem_open(res->name, O_CREAT, 0644, value);
if ((res->ps == (sem_t *) SEM_FAILED) && (errno == ENAMETOOLONG)) {
/* Old darwins only allow 13 chars. Did you create *that* amount of semaphores? */
res->name[13] = '\0';
res->ps = sem_open(res->name, O_CREAT, 0644, value);
if ((res->ps == (sem_t *) SEM_FAILED) && (errno == ENAMETOOLONG)) {
/* Old darwins only allow 13 chars. Did you create *that* amount of semaphores? */
res->name[13] = '\0';
+ sem_unlink(res->name);
res->ps = sem_open(res->name, O_CREAT, 0644, value);
}
if (res->ps == (sem_t *) SEM_FAILED)
res->ps = sem_open(res->name, O_CREAT, 0644, value);
}
if (res->ps == (sem_t *) SEM_FAILED)
@@
-465,25
+445,15
@@
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
#if HAVE_SEM_INIT
if (sem_destroy(sem->ps) < 0)
{
#if HAVE_SEM_INIT
if (sem_destroy(sem->ps) < 0)
- THROWF(system_error, errno, "sem_destroy() failed: %s",
- strerror(errno));
+ THROWF(system_error, errno, "sem_destroy() failed: %s", strerror(errno));
#else
if (sem_close(sem->ps) < 0)
THROWF(system_error, errno, "sem_close() failed: %s", strerror(errno));
xbt_free(sem->name);
#else
if (sem_close(sem->ps) < 0)
THROWF(system_error, errno, "sem_close() failed: %s", strerror(errno));
xbt_free(sem->name);
-
#endif
xbt_free(sem);
}
#endif
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