X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf0ebedfe4a6fd8a14784135e912725b7e027d6f..aa8c0aedd4f2031f1a7356a5b0ff6569ab262b64:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 79242cdf5a..a469b4d050 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -2,8 +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-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. */ @@ -44,27 +43,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)"); -/* 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; - char *name; void *param; pvoid_f_pvoid_t start_routine; - void *extra_data; } 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 */ @@ -72,7 +61,6 @@ 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); } @@ -81,44 +69,20 @@ 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; - main_thread->extra_data = 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; - -#if !HAVE_SEM_INIT - next_sem_ID_lock = xbt_os_mutex_init(); -#endif } 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; -#if !HAVE_SEM_INIT - xbt_os_mutex_destroy(next_sem_ID_lock); -#endif } /** Calls pthread_atfork() if present, and raise an exception otherwise. @@ -138,19 +102,14 @@ 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, void *extra_data) +xbt_os_thread_t xbt_os_thread_create(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; - 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)); @@ -219,12 +178,6 @@ void xbt_os_thread_setguardsize(int guard_size) #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); @@ -238,14 +191,6 @@ 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; @@ -288,116 +233,3 @@ void xbt_os_mutex_destroy(xbt_os_mutex_t mutex) xbt_assert(errcode == 0, "pthread_mutex_destroy(%p) failed: %s", mutex, strerror(errcode)); free(mutex); } - -typedef struct xbt_os_sem_ { -#if !HAVE_SEM_INIT - char *name; -#endif - sem_t s; - sem_t *ps; -} s_xbt_os_sem_t; - -#ifndef SEM_FAILED -#define SEM_FAILED (-1) -#endif - -xbt_os_sem_t xbt_os_sem_init(unsigned int value) -{ - xbt_os_sem_t res = xbt_new(s_xbt_os_sem_t, 1); - - /* On some systems (MAC OS X), only the stub of sem_init is to be found. - * 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 - */ -#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); - -#else /* damn, no sem_init(). Reimplement it */ - - xbt_os_mutex_acquire(next_sem_ID_lock); - 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) - THROWF(system_error, errno, "sem_open() failed: %s", strerror(errno)); - - /* Remove the name from the semaphore namespace: we never join on it */ - if (sem_unlink(res->name) < 0) - THROWF(system_error, errno, "sem_unlink() failed: %s", - strerror(errno)); - -#endif - - return res; -} - -void xbt_os_sem_acquire(xbt_os_sem_t sem) -{ - if (sem_wait(sem->ps) < 0) - THROWF(system_error, errno, "sem_wait() failed: %s", strerror(errno)); -} - -void xbt_os_sem_release(xbt_os_sem_t sem) -{ - if (sem_post(sem->ps) < 0) - THROWF(system_error, errno, "sem_post() failed: %s", strerror(errno)); -} - -void xbt_os_sem_destroy(xbt_os_sem_t sem) -{ -#if HAVE_SEM_INIT - if (sem_destroy(sem->ps) < 0) - 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); -} - -/** @brief Returns the amount of cores on the current host */ -int xbt_os_get_numcores(void) { -#ifdef WIN32 - SYSTEM_INFO sysinfo; - GetSystemInfo(&sysinfo); - return sysinfo.dwNumberOfProcessors; -#elif defined(__APPLE__) && defined(__MACH__) - int nm[2]; - size_t len = 4; - uint32_t count; - - nm[0] = CTL_HW; nm[1] = HW_AVAILCPU; - sysctl(nm, 2, &count, &len, NULL, 0); - - if(count < 1) { - nm[1] = HW_NCPU; - sysctl(nm, 2, &count, &len, NULL, 0); - if(count < 1) { count = 1; } - } - return count; -#else - return sysconf(_SC_NPROCESSORS_ONLN); -#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) -{ - xbt_os_thread_t thread = xbt_os_thread_self(); - return thread ? thread->extra_data : NULL; -}