Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add new entry in Release_Notes.
[simgrid.git] / src / sthread / sthread.c
index 117156f..ad27e3f 100644 (file)
@@ -1,3 +1,8 @@
+/* Copyright (c) 2002-2023. 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. */
+
 /* SimGrid's pthread interposer. Redefinition of the pthread symbols (see the comment in sthread.h) */
 
 #define _GNU_SOURCE
 #include <valgrind/valgrind.h>
 #endif
 
-/* We don't want to intercept pthread within simgrid. Instead we should provide the real implem to simgrid */
+/* We don't want to intercept pthread within SimGrid. Instead we should provide the real implem to SimGrid */
 static int (*raw_pthread_create)(pthread_t*, const pthread_attr_t*, void* (*)(void*), void*);
 static int (*raw_pthread_join)(pthread_t, void**);
-static int (*raw_mutex_init)(pthread_mutex_t*, const pthread_mutexattr_t*) = NULL;
-static int (*raw_mutex_lock)(pthread_mutex_t*)                             = NULL;
-static int (*raw_mutex_trylock)(pthread_mutex_t*)                          = NULL;
-static int (*raw_mutex_unlock)(pthread_mutex_t*)                           = NULL;
-static int (*raw_mutex_destroy)(pthread_mutex_t*)                          = NULL;
-
-static unsigned int (*raw_sleep)(unsigned int)         = NULL;
-static int (*raw_usleep)(useconds_t)                   = NULL;
-static int (*raw_gettimeofday)(struct timeval*, void*) = NULL;
-
-static sem_t* (*raw_sem_open)(const char*, int)                            = NULL;
-static int (*raw_sem_init)(sem_t*, int, unsigned int)                      = NULL;
-static int (*raw_sem_wait)(sem_t*)                                         = NULL;
-static int (*raw_sem_post)(sem_t*)                                         = NULL;
+static int (*raw_pthread_mutex_init)(pthread_mutex_t*, const pthread_mutexattr_t*);
+static int (*raw_pthread_mutex_lock)(pthread_mutex_t*);
+static int (*raw_pthread_mutex_trylock)(pthread_mutex_t*);
+static int (*raw_pthread_mutex_unlock)(pthread_mutex_t*);
+static int (*raw_pthread_mutex_destroy)(pthread_mutex_t*);
+
+static int (*raw_pthread_mutexattr_init)(pthread_mutexattr_t*);
+static int (*raw_pthread_mutexattr_settype)(pthread_mutexattr_t*, int);
+static int (*raw_pthread_mutexattr_gettype)(const pthread_mutexattr_t*, int*);
+static int (*raw_pthread_mutexattr_getrobust)(const pthread_mutexattr_t*, int*);
+static int (*raw_pthread_mutexattr_setrobust)(pthread_mutexattr_t*, int);
+
+static int (*raw_pthread_barrier_init)(pthread_barrier_t*, const pthread_barrierattr_t*, unsigned int count);
+static int (*raw_pthread_barrier_wait)(pthread_barrier_t*);
+static int (*raw_pthread_barrier_destroy)(pthread_barrier_t*);
+
+static int (*raw_pthread_cond_init)(pthread_cond_t*, const pthread_condattr_t*);
+static int (*raw_pthread_cond_signal)(pthread_cond_t*);
+static int (*raw_pthread_cond_broadcast)(pthread_cond_t*);
+static int (*raw_pthread_cond_wait)(pthread_cond_t*, pthread_mutex_t*);
+static int (*raw_pthread_cond_timedwait)(pthread_cond_t*, pthread_mutex_t*, const struct timespec* abstime);
+static int (*raw_pthread_cond_destroy)(pthread_cond_t*);
+
+static unsigned int (*raw_sleep)(unsigned int);
+static int (*raw_usleep)(useconds_t);
+static int (*raw_gettimeofday)(struct timeval*, void*);
+
+static sem_t* (*raw_sem_open)(const char*, int);
+static int (*raw_sem_init)(sem_t*, int, unsigned int);
+static int (*raw_sem_wait)(sem_t*);
+static int (*raw_sem_post)(sem_t*);
+static int (*raw_sem_destroy)(sem_t*);
+static int (*raw_sem_trywait)(sem_t*);
+static int (*raw_sem_timedwait)(sem_t*, const struct timespec*);
 
 static void intercepter_init()
 {
-  raw_pthread_create = (typeof(raw_pthread_create))dlsym(RTLD_NEXT, "pthread_create");
-  raw_pthread_join   = (typeof(raw_pthread_join))dlsym(RTLD_NEXT, "pthread_join");
-  raw_mutex_init    = (int (*)(pthread_mutex_t*, const pthread_mutexattr_t*))dlsym(RTLD_NEXT, "pthread_mutex_init");
-  raw_mutex_lock    = (int (*)(pthread_mutex_t*))dlsym(RTLD_NEXT, "pthread_mutex_lock");
-  raw_mutex_trylock = (int (*)(pthread_mutex_t*))dlsym(RTLD_NEXT, "pthread_mutex_trylock");
-  raw_mutex_unlock  = (int (*)(pthread_mutex_t*))dlsym(RTLD_NEXT, "pthread_mutex_unlock");
-  raw_mutex_destroy = (int (*)(pthread_mutex_t*))dlsym(RTLD_NEXT, "pthread_mutex_destroy");
-
-  raw_sleep        = (unsigned int (*)(unsigned int))dlsym(RTLD_NEXT, "sleep");
-  raw_usleep       = (int (*)(useconds_t usec))dlsym(RTLD_NEXT, "usleep");
-  raw_gettimeofday = (int (*)(struct timeval*, void*))dlsym(RTLD_NEXT, "gettimeofday");
-
-  raw_sem_open = (sem_t * (*)(const char*, int)) dlsym(RTLD_NEXT, "sem_open");
-  raw_sem_init = (int (*)(sem_t*, int, unsigned int))dlsym(RTLD_NEXT, "sem_init");
-  raw_sem_wait = (int (*)(sem_t*))dlsym(RTLD_NEXT, "sem_wait");
-  raw_sem_post = (int (*)(sem_t*))dlsym(RTLD_NEXT, "sem_post");
+  raw_pthread_create = dlsym(RTLD_NEXT, "pthread_create");
+  raw_pthread_join   = dlsym(RTLD_NEXT, "pthread_join");
+  raw_pthread_mutex_init    = dlsym(RTLD_NEXT, "pthread_mutex_init");
+  raw_pthread_mutex_lock    = dlsym(RTLD_NEXT, "pthread_mutex_lock");
+  raw_pthread_mutex_trylock = dlsym(RTLD_NEXT, "pthread_mutex_trylock");
+  raw_pthread_mutex_unlock  = dlsym(RTLD_NEXT, "pthread_mutex_unlock");
+  raw_pthread_mutex_destroy = dlsym(RTLD_NEXT, "pthread_mutex_destroy");
+
+  raw_pthread_mutexattr_init      = dlsym(RTLD_NEXT, "pthread_mutexattr_init");
+  raw_pthread_mutexattr_settype   = dlsym(RTLD_NEXT, "pthread_mutexattr_settype");
+  raw_pthread_mutexattr_gettype   = dlsym(RTLD_NEXT, "pthread_mutexattr_gettype");
+  raw_pthread_mutexattr_getrobust = dlsym(RTLD_NEXT, "pthread_mutexattr_getrobust");
+  raw_pthread_mutexattr_setrobust = dlsym(RTLD_NEXT, "pthread_mutexattr_setrobust");
+
+  raw_pthread_barrier_init = dlsym(RTLD_NEXT, "raw_pthread_barrier_init");
+  raw_pthread_barrier_wait = dlsym(RTLD_NEXT, "raw_pthread_barrier_wait");
+  raw_pthread_barrier_destroy = dlsym(RTLD_NEXT, "raw_pthread_barrier_destroy");
+
+  raw_pthread_cond_init      = dlsym(RTLD_NEXT, "raw_pthread_cond_init");
+  raw_pthread_cond_signal    = dlsym(RTLD_NEXT, "raw_pthread_cond_signal");
+  raw_pthread_cond_broadcast = dlsym(RTLD_NEXT, "raw_pthread_cond_broadcast");
+  raw_pthread_cond_wait      = dlsym(RTLD_NEXT, "raw_pthread_cond_wait");
+  raw_pthread_cond_timedwait = dlsym(RTLD_NEXT, "raw_pthread_cond_timedwait");
+  raw_pthread_cond_destroy   = dlsym(RTLD_NEXT, "raw_pthread_cond_destroy");
+
+  raw_sleep        = dlsym(RTLD_NEXT, "sleep");
+  raw_usleep       = dlsym(RTLD_NEXT, "usleep");
+  raw_gettimeofday = dlsym(RTLD_NEXT, "gettimeofday");
+
+  raw_sem_open = dlsym(RTLD_NEXT, "sem_open");
+  raw_sem_init = dlsym(RTLD_NEXT, "sem_init");
+  raw_sem_wait = dlsym(RTLD_NEXT, "sem_wait");
+  raw_sem_post = dlsym(RTLD_NEXT, "sem_post");
+  raw_sem_destroy   = dlsym(RTLD_NEXT, "sem_destroy");
+  raw_sem_trywait   = dlsym(RTLD_NEXT, "sem_trywait");
+  raw_sem_timedwait = dlsym(RTLD_NEXT, "sem_timedwait");
 }
 
 static int sthread_inside_simgrid = 1;
@@ -61,100 +106,80 @@ void sthread_disable(void)
 { // Stop intercepting all pthread calls
   sthread_inside_simgrid = 1;
 }
-int pthread_create(pthread_t* thread, const pthread_attr_t* attr, void* (*start_routine)(void*), void* arg)
-{
-  if (raw_pthread_create == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_pthread_create(thread, attr, start_routine, arg);
-
-  sthread_inside_simgrid = 1;
-  int res                = sthread_create((sthread_t*)thread, attr, start_routine, arg);
-  sthread_inside_simgrid = 0;
-  return res;
-}
-int pthread_join(pthread_t thread, void** retval)
-{
-  if (raw_pthread_join == NULL)
-    intercepter_init();
-  if (sthread_inside_simgrid)
-    return raw_pthread_join(thread, retval);
-
-  sthread_inside_simgrid = 1;
-  int res                = sthread_join((sthread_t)thread, retval);
-  sthread_inside_simgrid = 0;
-  return res;
-}
-
-int pthread_mutex_init(pthread_mutex_t* mutex, const pthread_mutexattr_t* attr)
-{
-  if (raw_mutex_init == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_mutex_init(mutex, attr);
-
-  sthread_inside_simgrid = 1;
-  int res                = sthread_mutex_init((sthread_mutex_t*)mutex, attr);
-  sthread_inside_simgrid = 0;
-  return res;
-}
-
-int pthread_mutex_lock(pthread_mutex_t* mutex)
-{
-  if (raw_mutex_lock == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_mutex_lock(mutex);
-
-  sthread_inside_simgrid = 1;
-  int res                = sthread_mutex_lock((sthread_mutex_t*)mutex);
-  sthread_inside_simgrid = 0;
-  return res;
-}
-
-int pthread_mutex_trylock(pthread_mutex_t* mutex)
-{
-  if (raw_mutex_trylock == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_mutex_trylock(mutex);
-
-  sthread_inside_simgrid = 1;
-  int res                = sthread_mutex_trylock((sthread_mutex_t*)mutex);
-  sthread_inside_simgrid = 0;
-  return res;
-}
-
-int pthread_mutex_unlock(pthread_mutex_t* mutex)
-{
-  if (raw_mutex_unlock == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_mutex_unlock(mutex);
-
-  sthread_inside_simgrid = 1;
-  int res                = sthread_mutex_unlock((sthread_mutex_t*)mutex);
-  sthread_inside_simgrid = 0;
-  return res;
-}
-int pthread_mutex_destroy(pthread_mutex_t* mutex)
-{
-  if (raw_mutex_destroy == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_mutex_destroy(mutex);
 
-  sthread_inside_simgrid = 1;
-  int res                = sthread_mutex_destroy((sthread_mutex_t*)mutex);
-  sthread_inside_simgrid = 0;
-  return res;
-}
+#define _STHREAD_CONCAT(a, b) a##b
+#define intercepted_pthcall(name, raw_params, call_params, sim_params)                                                 \
+  int _STHREAD_CONCAT(pthread_, name) raw_params                                                                       \
+  {                                                                                                                    \
+    if (_STHREAD_CONCAT(raw_pthread_, name) == NULL)                                                                   \
+      intercepter_init();                                                                                              \
+    if (sthread_inside_simgrid)                                                                                        \
+      return _STHREAD_CONCAT(raw_pthread_, name) call_params;                                                          \
+                                                                                                                       \
+    sthread_disable();                                                                                                 \
+    int res = _STHREAD_CONCAT(sthread_, name) sim_params;                                                              \
+    sthread_enable();                                                                                                  \
+    return res;                                                                                                        \
+  }
+
+intercepted_pthcall(mutexattr_init, (pthread_mutexattr_t * attr), (attr), ((sthread_mutexattr_t*)attr));
+intercepted_pthcall(mutexattr_settype, (pthread_mutexattr_t * attr, int type), (attr, type),
+                    ((sthread_mutexattr_t*)attr, type));
+intercepted_pthcall(mutexattr_gettype, (const pthread_mutexattr_t* attr, int* type), (attr, type),
+                    ((sthread_mutexattr_t*)attr, type));
+intercepted_pthcall(mutexattr_setrobust, (pthread_mutexattr_t * attr, int robustness), (attr, robustness),
+                    ((sthread_mutexattr_t*)attr, robustness));
+intercepted_pthcall(mutexattr_getrobust, (const pthread_mutexattr_t* attr, int* robustness), (attr, robustness),
+                    ((sthread_mutexattr_t*)attr, robustness));
+
+intercepted_pthcall(create, (pthread_t * thread, const pthread_attr_t* attr, void* (*start_routine)(void*), void* arg),
+                    (thread, attr, start_routine, arg), ((sthread_t*)thread, attr, start_routine, arg));
+intercepted_pthcall(join, (pthread_t thread, void** retval), (thread, retval), ((sthread_t)thread, retval));
+
+intercepted_pthcall(mutex_init, (pthread_mutex_t * mutex, const pthread_mutexattr_t* attr), (mutex, attr),
+                    ((sthread_mutex_t*)mutex, (sthread_mutexattr_t*)attr));
+intercepted_pthcall(mutex_lock, (pthread_mutex_t * mutex), (mutex), ((sthread_mutex_t*)mutex));
+intercepted_pthcall(mutex_trylock, (pthread_mutex_t * mutex), (mutex), ((sthread_mutex_t*)mutex));
+intercepted_pthcall(mutex_unlock, (pthread_mutex_t * mutex), (mutex), ((sthread_mutex_t*)mutex));
+intercepted_pthcall(mutex_destroy, (pthread_mutex_t * mutex), (mutex), ((sthread_mutex_t*)mutex));
+
+intercepted_pthcall(barrier_init, (pthread_barrier_t * barrier, const pthread_barrierattr_t* attr, unsigned count),
+                    (barrier, attr, count), ((sthread_barrier_t*)barrier, (const sthread_barrierattr_t*)attr, count));
+intercepted_pthcall(barrier_wait, (pthread_barrier_t* barrier),( barrier),((sthread_barrier_t*) barrier));
+intercepted_pthcall(barrier_destroy, (pthread_barrier_t* barrier),( barrier),((sthread_barrier_t*) barrier));
+
+intercepted_pthcall(cond_init, (pthread_cond_t * cond, const pthread_condattr_t* attr), (cond, attr),
+                    ((sthread_cond_t*)cond, (sthread_condattr_t*)attr));
+intercepted_pthcall(cond_signal, (pthread_cond_t * cond), (cond), ((sthread_cond_t*)cond));
+intercepted_pthcall(cond_broadcast, (pthread_cond_t * cond), (cond), ((sthread_cond_t*)cond));
+intercepted_pthcall(cond_wait, (pthread_cond_t * cond, pthread_mutex_t* mutex), (cond, mutex),
+                    ((sthread_cond_t*)cond, (sthread_mutex_t*)mutex));
+intercepted_pthcall(cond_timedwait, (pthread_cond_t * cond, pthread_mutex_t* mutex, const struct timespec* abstime),
+                    (cond, mutex, abstime), ((sthread_cond_t*)cond, (sthread_mutex_t*)mutex, abstime));
+intercepted_pthcall(cond_destroy, (pthread_cond_t * cond), (cond), ((sthread_cond_t*)cond));
+
+#define intercepted_call(rettype, name, raw_params, call_params, sim_params)                                           \
+  rettype name raw_params                                                                                              \
+  {                                                                                                                    \
+    if (_STHREAD_CONCAT(raw_, name) == NULL)                                                                           \
+      intercepter_init();                                                                                              \
+    if (sthread_inside_simgrid)                                                                                        \
+      return _STHREAD_CONCAT(raw_, name) call_params;                                                                  \
+                                                                                                                       \
+    sthread_disable();                                                                                                 \
+    rettype res = _STHREAD_CONCAT(sthread_, name) sim_params;                                                          \
+    sthread_enable();                                                                                                  \
+    return res;                                                                                                        \
+  }
+
+intercepted_call(int, sem_init, (sem_t * sem, int pshared, unsigned int value), (sem, pshared, value),
+                 ((sthread_sem_t*)sem, pshared, value));
+intercepted_call(int, sem_destroy, (sem_t * sem), (sem), ((sthread_sem_t*)sem));
+intercepted_call(int, sem_post, (sem_t * sem), (sem), ((sthread_sem_t*)sem));
+intercepted_call(int, sem_wait, (sem_t * sem), (sem), ((sthread_sem_t*)sem));
+intercepted_call(int, sem_trywait, (sem_t * sem), (sem), ((sthread_sem_t*)sem));
+intercepted_call(int, sem_timedwait, (sem_t * sem, const struct timespec* abs_timeout), (sem, abs_timeout),
+                 ((sthread_sem_t*)sem, abs_timeout));
 
 /* Glibc < 2.31 uses type "struct timezone *" for the second parameter of gettimeofday.
    Other implementations use "void *" instead. */
@@ -166,93 +191,9 @@ int pthread_mutex_destroy(pthread_mutex_t* mutex)
 #ifndef TIMEZONE_TYPE
 #define TIMEZONE_TYPE void
 #endif
-
-int gettimeofday(struct timeval* tv, XBT_ATTRIB_UNUSED TIMEZONE_TYPE* tz)
-{
-  if (raw_gettimeofday == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_gettimeofday(tv, tz);
-
-  sthread_inside_simgrid = 1;
-  int res                = sthread_gettimeofday(tv);
-  sthread_inside_simgrid = 0;
-  return res;
-}
-
-unsigned int sleep(unsigned int seconds)
-{
-  if (raw_sleep == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_sleep(seconds);
-
-  sthread_inside_simgrid = 1;
-  sthread_sleep(seconds);
-  sthread_inside_simgrid = 0;
-  return 0;
-}
-
-int usleep(useconds_t usec)
-{
-  if (raw_usleep == NULL)
-    intercepter_init();
-
-  if (sthread_inside_simgrid)
-    return raw_usleep(usec);
-
-  sthread_inside_simgrid = 1;
-  sthread_sleep(((double)usec) / 1000000.);
-  sthread_inside_simgrid = 0;
-  return 0;
-}
-
-#if 0
-int sem_init(sem_t *sem, int pshared, unsigned int value) {
-       int res;
-
-       res=raw_sem_init(sem,pshared,value);
-       return res;
-}
-
-int sem_wait(sem_t *sem) {
-       int res;
-
-       res = raw_sem_wait(sem);
-       return res;
-}
-
-int sem_post(sem_t *sem) {
-       return raw_sem_post(sem);
-}
-
-int pthread_cond_init(pthread_cond_t *cond, pthread_condattr_t *cond_attr) {
-    *cond = sg_cond_init();
-    return 0;
-}
-
-int pthread_cond_signal(pthread_cond_t *cond) {
-       sg_cond_notify_one(*cond);
-    return 0;
-}
-
-int pthread_cond_broadcast(pthread_cond_t *cond) {
-       sg_cond_notify_all(*cond);
-    return 0;
-}
-
-int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) {
-       sg_cond_wait(*cond, *mutex);
-    return 0;
-}
-
-int pthread_cond_destroy(pthread_cond_t *cond) {
-       sg_cond_destroy(*cond);
-    return 0;
-}
-#endif
+intercepted_call(int, gettimeofday, (struct timeval * tv, XBT_ATTRIB_UNUSED TIMEZONE_TYPE* tz), (tv, tz), (tv));
+intercepted_call(unsigned int, sleep, (unsigned int seconds), (seconds), (seconds));
+intercepted_call(int, usleep, (useconds_t usec), (usec), (((double)usec) / 1000000.));
 
 /* Trampoline for the real main() */
 static int (*raw_main)(int, char**, char**);