X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9a6652301a5b9708bd74a7fc7e9ae57f26d36f8..1e19722bba40db422336bb1330356a609b138ed0:/src/xbt/xbt_os_thread.c diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c index 08e82d5563..91db34bd79 100644 --- a/src/xbt/xbt_os_thread.c +++ b/src/xbt/xbt_os_thread.c @@ -2,13 +2,22 @@ /* 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-2015. 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" +#if defined(WIN32) +#elif defined(__MACH__) && defined(__APPLE__) +#include +#include +#include +#else +#include +#endif + +#include "internal_config.h" #include "xbt/sysdep.h" #include "xbt/ex.h" #include "xbt/ex_interface.h" /* We play crude games with exceptions */ @@ -21,17 +30,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)"); /* ********************************* PTHREAD IMPLEMENTATION ************************************ */ -#ifdef HAVE_PTHREAD_H +#ifndef _XBT_WIN32 +#include +#include #include -#ifdef HAVE_MUTEX_TIMEDLOCK -/* redefine the function header since we fail to get this from system headers on amd (at least) */ -int pthread_mutex_timedlock(pthread_mutex_t * mutex, - const struct timespec *abs_timeout); +#ifdef CORE_BINDING +#define _GNU_SOURCE +#include #endif - /* use named sempahore when sem_init() does not work */ #ifndef HAVE_SEM_INIT static int next_sem_ID = 0; @@ -53,6 +62,10 @@ static xbt_os_thread_t main_thread = NULL; 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) { @@ -98,12 +111,13 @@ void xbt_os_thread_mod_preinit(void) if ((errcode = pthread_setspecific(xbt_self_thread_key, main_thread))) THROWF(system_error, errcode, - "pthread_setspecific failed for xbt_self_thread_key"); - + "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 @@ -159,6 +173,7 @@ static void *wrapper_start_routine(void *s) return res; } + xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, @@ -175,14 +190,78 @@ 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, wrapper_start_routine, res_thread))) THROWF(system_error, errcode, "pthread_create failed: %s", strerror(errcode)); + + return res_thread; } + +#ifdef CORE_BINDING +int xbt_os_thread_bind(xbt_os_thread_t thread, int cpu){ + pthread_t pthread = thread->t; + int errcode = 0; + cpu_set_t cpuset; + CPU_ZERO(&cpuset); + CPU_SET(cpu, &cpuset); + errcode = pthread_setaffinity_np(pthread, sizeof(cpu_set_t), &cpuset); + return errcode; +} +#endif + +void xbt_os_thread_setstacksize(int stack_size) +{ + size_t alignment[] = { + xbt_pagesize, +#ifdef PTHREAD_STACK_MIN + PTHREAD_STACK_MIN, +#endif + 0 + }; + size_t sz; + int res; + int i; + + if (stack_size < 0) + xbt_die("stack size %d is negative, maybe it exceeds MAX_INT?", stack_size); + + sz = stack_size; + res = pthread_attr_setstacksize(&thread_attr, sz); + + for (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 %zd, try again with %zd", + sz, sz2); + sz = sz2; + res = pthread_attr_setstacksize(&thread_attr, sz); + } + } + + if (res == EINVAL) + XBT_WARN("invalid stack size (maybe too big): %zd", sz); + else if (res != 0) + XBT_WARN("unknown error %d in pthread stacksize setting: %zd", 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: %zd", res, sz); +#endif +} + const char *xbt_os_thread_name(xbt_os_thread_t t) { return t->name; @@ -305,7 +384,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)); } @@ -501,7 +580,7 @@ xbt_os_sem_t xbt_os_sem_init(unsigned int value) res->name[13] = '\0'; res->ps = sem_open(res->name, O_CREAT, 0644, value); } - if ((res->ps == (sem_t *) SEM_FAILED)) + 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 */ @@ -643,13 +722,23 @@ typedef struct xbt_os_thread_ { /* the default size of the stack of the threads (in bytes)*/ #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; void xbt_os_thread_mod_preinit(void) { xbt_self_thread_key = TlsAlloc(); + + xbt_os_thread_t main_thread = xbt_new0(s_xbt_os_thread_t, 1); + main_thread->name = (char *) "main"; + main_thread->start_routine = NULL; + main_thread->param = NULL; + + if (!TlsSetValue(xbt_self_thread_key, main_thread)) + THROWF(system_error, (int)GetLastError(), + "Impossible to set the SimGrid identity descriptor to the main thread (TlsSetValue() failed)"); + } void xbt_os_thread_mod_postexit(void) @@ -694,7 +783,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)); @@ -706,6 +795,16 @@ xbt_os_thread_t xbt_os_thread_create(const char *name, return t; } +void xbt_os_thread_setstacksize(int size) +{ + stack_size = size; +} + +void xbt_os_thread_setguardsize(int size) +{ + XBT_WARN("xbt_os_thread_setguardsize is not implemented (%d)", size); +} + const char *xbt_os_thread_name(xbt_os_thread_t t) { return t->name; @@ -1170,7 +1269,7 @@ int xbt_os_get_numcores(void) { SYSTEM_INFO sysinfo; GetSystemInfo(&sysinfo); return sysinfo.dwNumberOfProcessors; -#elif MACOS +#elif defined(__APPLE__) && defined(__MACH__) int nm[2]; size_t len = 4; uint32_t count; @@ -1204,7 +1303,8 @@ 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)