X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec16845133f5f1b5262d2d77d8ba22824fa8a446..40a3ba5bf8e115fc26d30155fafaca3d09c05fbd:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 2efd81eb2d..c6b858e2bd 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -2,13 +2,13 @@ /* Used in RL to get win/lin portability, and in SG when CONTEXT_THREAD */ /* in SG, when using CONTEXT_UCONTEXT, xbt_os_thread_stub is used instead */ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2013. 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 "gras_config.h" +#include "internal_config.h" #include "xbt/sysdep.h" #include "xbt/ex.h" #include "xbt/ex_interface.h" /* We play crude games with exceptions */ @@ -23,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, /* ********************************* PTHREAD IMPLEMENTATION ************************************ */ #ifdef HAVE_PTHREAD_H -#include +#include #include #ifdef HAVE_MUTEX_TIMEDLOCK @@ -54,6 +54,11 @@ static xbt_os_thread_t main_thread = NULL; static pthread_key_t xbt_self_thread_key; static int thread_mod_inited = 0; +/* attribute structure to handle pthread stack size changing */ +//FIXME: find where to put this +static pthread_attr_t attr; +static int thread_attr_inited = 0; + /* frees the xbt_os_thread_t corresponding to the current thread */ static void xbt_os_thread_free_thread_data(xbt_os_thread_t thread) { @@ -75,8 +80,7 @@ static xbt_running_ctx_t *_os_thread_get_running_ctx(void) static void _os_thread_ex_terminate(xbt_ex_t * e) { xbt_ex_display(e); - - abort(); + xbt_abort(); /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */ } @@ -135,10 +139,15 @@ void xbt_os_thread_mod_postexit(void) __xbt_ex_terminate = &__xbt_ex_terminate_default; } +/* 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)) { +#ifdef WIN32 + THROW_UNIMPLEMENTED; //pthread_atfork is not implemented in pthread.h on windows +#else return pthread_atfork(prepare, parent, child); +#endif } static void *wrapper_start_routine(void *s) @@ -150,12 +159,13 @@ static void *wrapper_start_routine(void *s) THROWF(system_error, errcode, "pthread_setspecific failed for xbt_self_thread_key"); - void *res = (*(t->start_routine)) (t->param); + void *res = t->start_routine(t->param); if (t->detached) xbt_os_thread_free_thread_data(t); return res; } + xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, @@ -172,14 +182,50 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, XBT_RUNNING_CTX_INITIALIZE(res_thread->running_ctx); res_thread->extra_data = extra_data; - if ((errcode = pthread_create(&(res_thread->t), NULL, + if ((errcode = pthread_create(&(res_thread->t), thread_attr_inited!=0? &attr: NULL, wrapper_start_routine, res_thread))) THROWF(system_error, errcode, "pthread_create failed: %s", strerror(errcode)); + + return res_thread; } + +void xbt_os_thread_setstacksize(int stack_size) +{ + size_t sz; + int res; + + if (stack_size < 0) + xbt_die("stack size %d is negative, maybe it exceeds MAX_INT?", stack_size); + + sz = stack_size; + pthread_attr_init(&attr); + res = pthread_attr_setstacksize(&attr, sz); + +#ifdef PTHREAD_STACK_MIN + if (res == EINVAL) { + /* Invalid size, try again with a multiple of PTHREAD_STACK_MIN. */ + size_t rem = sz % PTHREAD_STACK_MIN; + if (rem != 0 || sz == 0) { + size_t sz2 = sz - rem + PTHREAD_STACK_MIN; + XBT_DEBUG("pthread_attr_setstacksize failed for %#zx, try again with %#zx", + sz, sz2); + sz = sz2; + res = pthread_attr_setstacksize(&attr, sz); + } + } +#endif + + if (res == EINVAL) + XBT_WARN("invalid stack size (maybe too big): %#zx", sz); + else if (res != 0) + XBT_WARN("unknown error %d in pthread stacksize setting: %#zx", res, sz); + thread_attr_inited = 1; +} + const char *xbt_os_thread_name(xbt_os_thread_t t) { return t->name; @@ -219,6 +265,24 @@ xbt_os_thread_t xbt_os_thread_self(void) return res; } +void xbt_os_thread_key_create(xbt_os_thread_key_t* key) { + + int errcode; + if ((errcode = pthread_key_create(key, NULL))) + THROWF(system_error, errcode, "pthread_key_create failed"); +} + +void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) { + + int errcode; + if ((errcode = pthread_setspecific(key, value))) + THROWF(system_error, errcode, "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) { thread->detached = 1; @@ -284,7 +348,7 @@ void xbt_os_mutex_timedacquire(xbt_os_mutex_t mutex, double delay) THROWF(timeout_error, 0, "mutex %p not ready", mutex); default: THROWF(system_error, errcode, - "xbt_mutex_timedacquire(%p) failed: %s", mutex, + "xbt_os_mutex_timedacquire(%p) failed: %s", mutex, strerror(errcode)); } @@ -478,7 +542,7 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int 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, 1); + 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)); @@ -621,8 +685,8 @@ typedef struct xbt_os_thread_ { #endif /* the default size of the stack of the threads (in bytes)*/ -#define XBT_DEFAULT_THREAD_STACK_SIZE 4096 - +#define XBT_DEFAULT_THREAD_STACK_SIZE 4096 +static int stack_size=0; /* key to the TLS containing the xbt_os_thread_t structure */ static unsigned long xbt_self_thread_key; @@ -673,7 +737,7 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, t->start_routine = start_routine; t->param = param; t->extra_data = extra_data; - t->handle = CreateThread(NULL, XBT_DEFAULT_THREAD_STACK_SIZE, + t->handle = CreateThread(NULL, stack_size==0 ? XBT_DEFAULT_THREAD_STACK_SIZE : stack_size, (LPTHREAD_START_ROUTINE) wrapper_start_routine, t, STACK_SIZE_PARAM_IS_A_RESERVATION, &(t->id)); @@ -685,6 +749,11 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, return t; } +void xbt_os_thread_setstacksize(int size) +{ + stack_size = size; +} + const char *xbt_os_thread_name(xbt_os_thread_t t) { return t->name; @@ -712,8 +781,7 @@ void xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return) CloseHandle(thread->handle); - if (thread->name) - free(thread->name); + free(thread->name); free(thread); } @@ -726,6 +794,21 @@ void xbt_os_thread_exit(int *retval) ExitThread(0); } +void xbt_os_thread_key_create(xbt_os_thread_key_t* key) { + + *key = TlsAlloc(); +} + +void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value) { + + if (!TlsSetValue(key, value)) + THROWF(system_error, (int) GetLastError(), "TlsSetValue() failed"); +} + +void* xbt_os_thread_get_specific(xbt_os_thread_key_t key) { + return TlsGetValue(key); +} + void xbt_os_thread_detach(xbt_os_thread_t thread) { THROW_UNIMPLEMENTED; @@ -1128,6 +1211,40 @@ void xbt_os_sem_get_value(xbt_os_sem_t sem, int *svalue) #endif + +/** @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 MACOS + 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 +} + + +/***** reentrant mutexes *****/ +typedef struct xbt_os_rmutex_ { + xbt_os_mutex_t mutex; + xbt_os_thread_t owner; + int count; +} s_xbt_os_rmutex_t; + void xbt_os_thread_set_extra_data(void *data) { xbt_os_thread_self()->extra_data = data; @@ -1135,5 +1252,55 @@ void xbt_os_thread_set_extra_data(void *data) void *xbt_os_thread_get_extra_data(void) { - return xbt_os_thread_self()->extra_data; + xbt_os_thread_t self = xbt_os_thread_self(); + return self? self->extra_data : NULL; +} + +xbt_os_rmutex_t xbt_os_rmutex_init(void) +{ + xbt_os_rmutex_t rmutex = xbt_new0(struct xbt_os_rmutex_, 1); + rmutex->mutex = xbt_os_mutex_init(); + rmutex->owner = NULL; + rmutex->count = 0; + return rmutex; +} + +void xbt_os_rmutex_acquire(xbt_os_rmutex_t rmutex) +{ + xbt_os_thread_t self = xbt_os_thread_self(); + + if (self == NULL) { + /* the thread module is not initialized yet */ + rmutex->owner = NULL; + return; + } + + if (self != rmutex->owner) { + xbt_os_mutex_acquire(rmutex->mutex); + rmutex->owner = self; + rmutex->count = 1; + } else { + rmutex->count++; + } +} + +void xbt_os_rmutex_release(xbt_os_rmutex_t rmutex) +{ + if (rmutex->owner == NULL) { + /* the thread module was not initialized */ + return; + } + + xbt_assert(rmutex->owner == xbt_os_thread_self()); + + if (--rmutex->count == 0) { + rmutex->owner = NULL; + xbt_os_mutex_release(rmutex->mutex); + } +} + +void xbt_os_rmutex_destroy(xbt_os_rmutex_t rmutex) +{ + xbt_os_mutex_destroy(rmutex->mutex); + xbt_free(rmutex); }