X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39713cc1fba008481093955f535fe26eaeae4906..f968cbbb699423fa252994ff42de77f8671ac7eb:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index ac9df60d23..3b58603ffa 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -2,14 +2,14 @@ /* Used in RL to get win/lin portability, and in SG when CONTEXT_THREAD */ /* in SG, when using HAVE_UCONTEXT_CONTEXTS, xbt_os_thread_stub is used instead */ -/* Copyright (c) 2007-2015. The SimGrid Team. +/* Copyright (c) 2007-2018. The SimGrid Team. * All rights 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. */ #include "src/internal_config.h" -#ifdef HAVE_PTHREAD_SETAFFINITY +#if HAVE_PTHREAD_SETAFFINITY #define _GNU_SOURCE #include #endif @@ -25,7 +25,8 @@ #include #include -#if defined(WIN32) +#if defined(_WIN32) +#include #elif defined(__MACH__) && defined(__APPLE__) #include #include @@ -36,28 +37,24 @@ #include "xbt/sysdep.h" #include "xbt/ex.h" -#include "src/xbt/ex_interface.h" /* We play crude games with exceptions */ -#include "src/portable.h" +#include "src/internal_config.h" #include "xbt/xbt_os_time.h" /* Portable time facilities */ #include "xbt/xbt_os_thread.h" /* This module */ #include "src/xbt_modinter.h" /* Initialization/finalization of this module */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)"); - -/* use named sempahore when sem_init() does not work */ -#ifndef HAVE_SEM_INIT +/* 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; #endif typedef struct xbt_os_thread_ { pthread_t t; - int detached; 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; @@ -75,26 +72,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; - - free(thread->running_ctx); 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) -{ - xbt_ex_display(e); - xbt_abort(); - /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */ -} - void xbt_os_thread_mod_preinit(void) { if (thread_mod_inited) @@ -102,29 +83,23 @@ void xbt_os_thread_mod_preinit(void) int errcode = pthread_key_create(&xbt_self_thread_key, NULL); xbt_assert(errcode == 0, "pthread_key_create failed for xbt_self_thread_key"); - + 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->running_ctx = xbt_new(xbt_running_ctx_t, 1); 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)"); - - __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; -#ifndef HAVE_SEM_INIT +#if !HAVE_SEM_INIT next_sem_ID_lock = xbt_os_mutex_init(); #endif } @@ -137,19 +112,22 @@ 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"); - free(main_thread->running_ctx); + free(main_thread->name); free(main_thread); main_thread = NULL; thread_mod_inited = 0; -#ifndef HAVE_SEM_INIT +#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. + * + * The only known user of this wrapper is mmalloc_preinit(), but it is absolutely mandatory there: + * when used with tesh, mmalloc *must* be mutex protected and resistant to forks. + * This functionality is the only way to get it working (by ensuring that the mutex is consistently released on forks) + */ + /* this function is critical to tesh+mmalloc, don't mess with it */ int xbt_os_thread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { @@ -163,33 +141,31 @@ static void *wrapper_start_routine(void *s) int errcode = pthread_setspecific(xbt_self_thread_key, t); xbt_assert(errcode == 0, "pthread_setspecific failed for xbt_self_thread_key"); - void *res = t->start_routine(t->param); - if (t->detached) - xbt_os_thread_free_thread_data(t); - return res; + return t->start_routine(t->param); } - 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); - res_thread->detached = 0; 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); xbt_assert(errcode == 0, "pthread_create failed: %s", strerror(errcode)); return res_thread; } -int xbt_os_thread_bind(xbt_os_thread_t thread, int cpu){ +/** Bind the thread to the given core, if possible. + * + * If pthread_setaffinity_np is not usable on that (non-gnu) platform, this function does nothing. + */ +int xbt_os_thread_bind(XBT_ATTRIB_UNUSED xbt_os_thread_t thread, XBT_ATTRIB_UNUSED int cpu) +{ int errcode = 0; -#ifdef HAVE_PTHREAD_SETAFFINITY +#if HAVE_PTHREAD_SETAFFINITY pthread_t pthread = thread->t; cpu_set_t cpuset; CPU_ZERO(&cpuset); @@ -219,16 +195,16 @@ void xbt_os_thread_setstacksize(int stack_size) size_t rem = sz % alignment[i]; if (rem != 0 || sz == 0) { size_t sz2 = sz - rem + alignment[i]; - XBT_DEBUG("pthread_attr_setstacksize failed for %zd, try again with %zd", sz, sz2); + XBT_DEBUG("pthread_attr_setstacksize failed for %zu, try again with %zu", sz, sz2); sz = sz2; res = pthread_attr_setstacksize(&thread_attr, sz); } } if (res == EINVAL) - XBT_WARN("invalid stack size (maybe too big): %zd", sz); + XBT_WARN("invalid stack size (maybe too big): %zu", sz); else if (res != 0) - XBT_WARN("unknown error %d in pthread stacksize setting: %zd", res, sz); + XBT_WARN("unknown error %d in pthread stacksize setting: %zu", res, sz); } void xbt_os_thread_setguardsize(int guard_size) @@ -239,19 +215,14 @@ void xbt_os_thread_setguardsize(int guard_size) size_t sz = guard_size; int res = pthread_attr_setguardsize(&thread_attr, sz); if (res) - XBT_WARN("pthread_attr_setguardsize failed (%d) for size: %zd", res, sz); + XBT_WARN("pthread_attr_setguardsize failed (%d) for size: %zu", res, sz); #endif } -const char *xbt_os_thread_name(xbt_os_thread_t t) -{ - return t->name; -} - 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) @@ -267,7 +238,7 @@ void xbt_os_thread_exit(int *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; @@ -281,20 +252,21 @@ void xbt_os_thread_key_create(xbt_os_thread_key_t* key) 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_key_destroy(xbt_os_thread_key_t key) +{ + int errcode = pthread_key_delete(key); + xbt_assert(errcode == 0, "pthread_key_delete failed"); +} +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"); } -void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) { - return pthread_getspecific(key); -} - -void xbt_os_thread_detach(xbt_os_thread_t thread) +void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) { - thread->detached = 1; - pthread_detach(thread->t); + return pthread_getspecific(key); } #include @@ -303,11 +275,6 @@ void xbt_os_thread_yield(void) sched_yield(); } -void xbt_os_thread_cancel(xbt_os_thread_t t) -{ - pthread_cancel(t->t); -} - /****** mutex related functions ******/ typedef struct xbt_os_mutex_ { pthread_mutex_t m; @@ -370,32 +337,6 @@ void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex) xbt_assert(errcode==0, "pthread_cond_wait(%p,%p) failed: %s", cond, mutex, strerror(errcode)); } - -void xbt_os_cond_timedwait(xbt_os_cond_t cond, xbt_os_mutex_t mutex, double delay) -{ - int errcode; - struct timespec ts_end; - double end = delay + xbt_os_time(); - - if (delay < 0) { - xbt_os_cond_wait(cond, mutex); - } else { - ts_end.tv_sec = (time_t) floor(end); - ts_end.tv_nsec = (long) ((end - ts_end.tv_sec) * 1000000000); - 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: - THROWF(timeout_error, errcode, - "condition %p (mutex %p) wasn't signaled before timeout (%f)", - cond, mutex, delay); - default: - THROWF(system_error, errcode, "pthread_cond_timedwait(%p,%p,%f) failed: %s", cond, mutex, delay, strerror(errcode)); - } - } -} - void xbt_os_cond_signal(xbt_os_cond_t cond) { int errcode = pthread_cond_signal(&(cond->c)); @@ -419,7 +360,7 @@ void xbt_os_cond_destroy(xbt_os_cond_t cond) } typedef struct xbt_os_sem_ { -#ifndef HAVE_SEM_INIT +#if !HAVE_SEM_INIT char *name; #endif sem_t s; @@ -438,7 +379,7 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) * Any attempt to use it leads to ENOSYS (function not implemented). * If such a prehistoric system is detected, do the job with sem_open instead */ -#ifdef HAVE_SEM_INIT +#if HAVE_SEM_INIT if (sem_init(&(res->s), 0, value) != 0) THROWF(system_error, errno, "sem_init() failed: %s", strerror(errno)); res->ps = &(res->s); @@ -446,13 +387,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); - res->name = bprintf("/%d", ++next_sem_ID); + res->name = bprintf("/sg-%d", ++next_sem_ID); 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'; + sem_unlink(res->name); res->ps = sem_open(res->name, O_CREAT, 0644, value); } if (res->ps == (sem_t *) SEM_FAILED) @@ -482,27 +425,17 @@ void xbt_os_sem_release(xbt_os_sem_t sem) void xbt_os_sem_destroy(xbt_os_sem_t sem) { -#ifdef HAVE_SEM_INIT +#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); - #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