/* 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
#include "xbt/sysdep.h"
#include "xbt/ex.h"
-#include "src/xbt/ex_interface.h" /* We play crude games with exceptions */
#include "src/internal_config.h"
#include "xbt/xbt_os_time.h" /* Portable time facilities */
#include "xbt/xbt_os_thread.h" /* This module */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt, "Synchronization mechanism (OS-level)");
-/* use named sempahore when sem_init() does not work */
+/* 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;
typedef struct xbt_os_thread_ {
pthread_t t;
- int detached;
char *name;
void *param;
pvoid_f_pvoid_t start_routine;
free(thread);
}
-/* 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)
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->extra_data = NULL;
// 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;
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->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));
*
* If pthread_setaffinity_np is not usable on that (non-gnu) platform, this function does nothing.
*/
-int xbt_os_thread_bind(xbt_os_thread_t thread, int cpu){
+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;
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)
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_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)
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;
xbt_assert(errcode==0 , "pthread_key_create failed");
}
+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);
return pthread_getspecific(key);
}
-void xbt_os_thread_detach(xbt_os_thread_t thread)
-{
- thread->detached = 1;
- pthread_detach(thread->t);
-}
-
#include <sched.h>
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;
#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)
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
