Try to be consistent bewteen xbt_os_thread.h and xbt_os_thread.c

[simgrid.git] / src / xbt / xbt_os_thread.c

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index f295495..2059f2c 100644 (file)
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -21,18 +21,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt,
                                 "Synchronization mechanism (OS-level)");
 
 /* ********************************* PTHREAD IMPLEMENTATION ************************************ */
                                 "Synchronization mechanism (OS-level)");
 
 /* ********************************* PTHREAD IMPLEMENTATION ************************************ */

-#ifdef HAVE_PTHREAD_H
+#ifndef _XBT_WIN32

 
 

+#include <pthread.h>

 #include <limits.h>
 #include <semaphore.h>
 
 #include <limits.h>
 #include <semaphore.h>
 

-#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 <sched.h>

 #endif
 
 #endif
 

-

 /* use named sempahore when sem_init() does not work */
 #ifndef HAVE_SEM_INIT
 static int next_sem_ID = 0;
 /* use named sempahore when sem_init() does not work */
 #ifndef HAVE_SEM_INIT
 static int next_sem_ID = 0;


@@ -193,6 +192,18 @@ xbt_os_thread_t xbt_os_thread_create(const char *name,
 }
 
 
 }
 
 

+#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[] = {
 void xbt_os_thread_setstacksize(int stack_size)
 {
   size_t alignment[] = {


@@ -232,10 +243,14 @@ void xbt_os_thread_setstacksize(int stack_size)
 
 void xbt_os_thread_setguardsize(int guard_size)
 {
 
 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);
   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)
 }
 
 const char *xbt_os_thread_name(xbt_os_thread_t t)