X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3284497d5661aa440877c954ada120fdff8df469..844de0597296879c91593ae0604d5718498b81e3:/src/xbt/xbt_os_thread.c

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index 2652bc952e..411aa1652f 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-2017. 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,18 +43,11 @@
 
 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;
 
@@ -89,7 +81,6 @@ void xbt_os_thread_mod_preinit(void)
   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,
@@ -98,10 +89,6 @@ void xbt_os_thread_mod_preinit(void)
   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)
@@ -116,9 +103,6 @@ void xbt_os_thread_mod_postexit(void)
   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.
@@ -144,13 +128,12 @@ static void *wrapper_start_routine(void *s)
   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(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;
-  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));
@@ -162,7 +145,8 @@ xbt_os_thread_t xbt_os_thread_create(const char *name,  pvoid_f_pvoid_t start_ro
  *
  * 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;
@@ -245,29 +229,6 @@ xbt_os_thread_t xbt_os_thread_self(void )
   return pthread_getspecific(xbt_self_thread_key);
 }
 
-void xbt_os_thread_key_create(xbt_os_thread_key_t* key)
-{
-  int errcode = pthread_key_create(key, NULL);
-  xbt_assert(errcode==0 , "pthread_key_create failed");
-}
-
-void xbt_os_thread_set_specific(xbt_os_thread_key_t key, void* value)
-{
-  int errcode = pthread_setspecific(key, value);
-  xbt_assert(errcode==0, "pthread_setspecific failed");
-}
-
-void* xbt_os_thread_get_specific(xbt_os_thread_key_t key)
-{
-  return pthread_getspecific(key);
-}
-
-#include <sched.h>
-void xbt_os_thread_yield(void)
-{
-  sched_yield();
-}
-
 /****** mutex related functions ******/
 typedef struct xbt_os_mutex_ {
   pthread_mutex_t m;
@@ -310,157 +271,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);
 }
-
-/***** condition related functions *****/
-typedef struct xbt_os_cond_ {
-  pthread_cond_t c;
-} s_xbt_os_cond_t;
-
-xbt_os_cond_t xbt_os_cond_init(void)
-{
-  xbt_os_cond_t res = xbt_new(s_xbt_os_cond_t, 1);
-  int errcode = pthread_cond_init(&(res->c), NULL);
-  xbt_assert(errcode==0, "pthread_cond_init() failed: %s", strerror(errcode));
-  return res;
-}
-
-void xbt_os_cond_wait(xbt_os_cond_t cond, xbt_os_mutex_t mutex)
-{
-  int errcode = pthread_cond_wait(&(cond->c), &(mutex->m));
-  xbt_assert(errcode==0, "pthread_cond_wait(%p,%p) failed: %s", cond, mutex, strerror(errcode));
-}
-
-void xbt_os_cond_signal(xbt_os_cond_t cond)
-{
-  int errcode = pthread_cond_signal(&(cond->c));
-  xbt_assert(errcode==0, "pthread_cond_signal(%p) failed: %s", cond, strerror(errcode));
-}
-
-void xbt_os_cond_broadcast(xbt_os_cond_t cond)
-{
-  int errcode = pthread_cond_broadcast(&(cond->c));
-  xbt_assert(errcode==0, "pthread_cond_broadcast(%p) failed: %s", cond, strerror(errcode));
-}
-
-void xbt_os_cond_destroy(xbt_os_cond_t cond)
-{
-  if (!cond)
-    return;
-
-  int errcode = pthread_cond_destroy(&(cond->c));
-  xbt_assert(errcode==0, "pthread_cond_destroy(%p) failed: %s", cond, strerror(errcode));
-  free(cond);
-}
-
-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;
-}