X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/844de0597296879c91593ae0604d5718498b81e3..f67e9f5d0e553ae935bd6cad29df46f1565173bf:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 411aa1652f..1a19ba5ac6 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -2,7 +2,7 @@ /* 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-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -45,65 +45,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS typedef struct xbt_os_thread_ { pthread_t t; - char *name; void *param; pvoid_f_pvoid_t start_routine; } s_xbt_os_thread_t; -static xbt_os_thread_t main_thread = NULL; - -/* thread-specific data containing the xbt_os_thread_t structure */ -static pthread_key_t xbt_self_thread_key; -static int thread_mod_inited = 0; - -/* defaults attribute for pthreads */ -//FIXME: find where to put this -static pthread_attr_t thread_attr; - -/* frees the xbt_os_thread_t corresponding to the current thread */ -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->name); - free(thread); -} - -void xbt_os_thread_mod_preinit(void) -{ - if (thread_mod_inited) - return; - - 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->name = xbt_strdup("main"); - main_thread->param = NULL; - main_thread->start_routine = NULL; - - 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)"); - - pthread_attr_init(&thread_attr); - - thread_mod_inited = 1; -} - -void xbt_os_thread_mod_postexit(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))) - // THROWF(system_error,errcode,"pthread_key_delete failed for xbt_self_thread_key"); - free(main_thread->name); - free(main_thread); - main_thread = NULL; - thread_mod_inited = 0; -} /** Calls pthread_atfork() if present, and raise an exception otherwise. * @@ -118,117 +62,6 @@ int xbt_os_thread_atfork(void (*prepare)(void), void (*parent)(void), void (*chi return pthread_atfork(prepare, parent, child); } -static void *wrapper_start_routine(void *s) -{ - xbt_os_thread_t t = s; - - int errcode = pthread_setspecific(xbt_self_thread_key, t); - xbt_assert(errcode == 0, "pthread_setspecific failed for xbt_self_thread_key"); - - 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) -{ - xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1); - res_thread->name = xbt_strdup(name); - res_thread->start_routine = start_routine; - res_thread->param = param; - - 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; -} - -/** 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; -#if HAVE_PTHREAD_SETAFFINITY - pthread_t pthread = thread->t; - cpu_set_t cpuset; - CPU_ZERO(&cpuset); - CPU_SET(cpu, &cpuset); - errcode = pthread_setaffinity_np(pthread, sizeof(cpu_set_t), &cpuset); -#endif - return errcode; -} - -void xbt_os_thread_setstacksize(int stack_size) -{ - size_t alignment[] = { - xbt_pagesize, -#ifdef PTHREAD_STACK_MIN - PTHREAD_STACK_MIN, -#endif - 0 - }; - - xbt_assert(stack_size >= 0, "stack size %d is negative, maybe it exceeds MAX_INT?", stack_size); - - size_t sz = stack_size; - int res = pthread_attr_setstacksize(&thread_attr, sz); - - for (int i = 0; res == EINVAL && alignment[i] > 0; i++) { - /* Invalid size, try again with next multiple of alignment[i]. */ - 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 %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): %zu", sz); - else if (res != 0) - XBT_WARN("unknown error %d in pthread stacksize setting: %zu", res, sz); -} - -void xbt_os_thread_setguardsize(int guard_size) -{ -#ifdef WIN32 - THROW_UNIMPLEMENTED; //pthread_attr_setguardsize is not implemented in pthread.h on windows -#else - size_t sz = guard_size; - int res = pthread_attr_setguardsize(&thread_attr, sz); - if (res) - XBT_WARN("pthread_attr_setguardsize failed (%d) for size: %zu", res, sz); -#endif -} - -const char *xbt_os_thread_self_name(void) -{ - xbt_os_thread_t me = xbt_os_thread_self(); - return me ? (const char *)me->name : "main"; -} - -void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return) -{ - int errcode = pthread_join(thread->t, thread_return); - - xbt_assert(errcode==0, "pthread_join failed: %s", strerror(errcode)); - xbt_os_thread_free_thread_data(thread); -} - -void xbt_os_thread_exit(int *retval) -{ - pthread_exit(retval); -} - -xbt_os_thread_t xbt_os_thread_self(void ) -{ - if (!thread_mod_inited) - return NULL; - - return pthread_getspecific(xbt_self_thread_key); -} - /****** mutex related functions ******/ typedef struct xbt_os_mutex_ { pthread_mutex_t m;