#define _GNU_SOURCE
#include "src/sthread/sthread.h"
+#include "src/internal_config.h"
#include <dlfcn.h>
#include <pthread.h>
#include <semaphore.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#if HAVE_VALGRIND_H
+#include <stdlib.h>
+#include <valgrind/valgrind.h>
+#endif
/* 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 void intercepter_init()
{
- raw_pthread_create =
- (int (*)(pthread_t*, const pthread_attr_t*, void* (*)(void*), void*))dlsym(RTLD_NEXT, "pthread_create");
+ 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");
}
+static int sthread_inside_simgrid = 1;
+void sthread_enable(void)
+{ // Start intercepting all pthread calls
+ sthread_inside_simgrid = 0;
+}
+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)
return raw_pthread_create(thread, attr, start_routine, arg);
sthread_inside_simgrid = 1;
- int res = sthread_create(thread, attr, start_routine, arg);
+ 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;
}
intercepter_init();
if (sthread_inside_simgrid)
- raw_mutex_init(mutex, attr);
+ return raw_mutex_init(mutex, attr);
sthread_inside_simgrid = 1;
int res = sthread_mutex_init((sthread_mutex_t*)mutex, attr);
return res;
}
+/* Glibc < 2.31 uses type "struct timezone *" for the second parameter of gettimeofday.
+ Other implementations use "void *" instead. */
+#ifdef __GLIBC__
+#if !__GLIBC_PREREQ(2, 31)
+#define TIMEZONE_TYPE struct timezone
+#endif
+#endif
+#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;
/* Find the real __libc_start_main()... */
typeof(&__libc_start_main) orig = dlsym(RTLD_NEXT, "__libc_start_main");
-
/* ... and call it with our custom main function */
+#if HAVE_VALGRIND_H
+ /* ... unless valgrind is used, and this instance is not the target program (but the valgrind launcher) */
+ if (getenv("VALGRIND_LIB") && !RUNNING_ON_VALGRIND)
+ return orig(raw_main, argc, argv, init, fini, rtld_fini, stack_end);
+#endif
return orig(main_hook, argc, argv, init, fini, rtld_fini, stack_end);
-}
\ No newline at end of file
+}