X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f8dd17853735d2fdf1c39b81cf9cb3e4bdd54342..3203afd846219ef8b41cadda945ea0a98103c46f:/src/sthread/sthread_impl.cpp diff --git a/src/sthread/sthread_impl.cpp b/src/sthread/sthread_impl.cpp index 7721982343..807623177e 100644 --- a/src/sthread/sthread_impl.cpp +++ b/src/sthread/sthread_impl.cpp @@ -1,11 +1,18 @@ +/* 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. Actual implementation of the symbols (see the comment in sthread.h) */ #include "smpi/smpi.h" +#include "xbt/string.hpp" #include #include #include #include #include +#include #include #include @@ -19,6 +26,7 @@ #include #include #include +#include #include XBT_LOG_NEW_DEFAULT_CATEGORY(sthread, "pthread intercepter"); @@ -30,7 +38,7 @@ int sthread_main(int argc, char** argv, char** envp, int (*raw_main)(int, char** { /* Do not intercept the main when run from SMPI: it will initialize the simulation properly */ for (int i = 0; envp[i] != nullptr; i++) - if (strncmp(envp[i], "SMPI_GLOBAL_SIZE", strlen("SMPI_GLOBAL_SIZE")) == 0) + if (std::string_view(envp[i]).rfind("SMPI_GLOBAL_SIZE", 0) == 0) return raw_main(argc, argv, envp); /* If not in SMPI, the old main becomes an actor in a newly created simulation */ @@ -46,7 +54,7 @@ int sthread_main(int argc, char** argv, char** envp, int (*raw_main)(int, char** /* Launch the user's main() on an actor */ sthread_enable(); - sg4::ActorPtr main_actor = sg4::Actor::create("tid 0", lilibeth, raw_main, argc, argv, envp); + sg4::ActorPtr main_actor = sg4::Actor::create("main thread", lilibeth, raw_main, argc, argv, envp); XBT_INFO("Starting the simulation."); sg4::Engine::get_instance()->run(); @@ -60,17 +68,6 @@ struct sthread_mutex { s4u_Mutex* mutex; }; -static void thread_create_wrapper(void* (*user_function)(void*), void* param) -{ -#if HAVE_SMPI - if (SMPI_is_inited()) - SMPI_thread_create(); -#endif - sthread_enable(); - user_function(param); - sthread_disable(); -} - int sthread_create(unsigned long int* thread, const void* /*pthread_attr_t* attr*/, void* (*start_routine)(void*), void* arg) { @@ -83,8 +80,18 @@ int sthread_create(unsigned long int* thread, const void* /*pthread_attr_t* attr MPI_Comm_rank(MPI_COMM_WORLD, &rank); #endif std::string name = simgrid::xbt::string_printf("%d:%d", rank, TID); - sg4::ActorPtr actor = sg4::Actor::init(name.c_str(), lilibeth); - actor->start(thread_create_wrapper, start_routine, arg); + sg4::ActorPtr actor = sg4::Actor::create( + name, lilibeth, + [](auto* user_function, auto* param) { +#if HAVE_SMPI + if (SMPI_is_inited()) + SMPI_thread_create(); +#endif + sthread_enable(); + user_function(param); + sthread_disable(); + }, + start_routine, arg); intrusive_ptr_add_ref(actor.get()); *thread = reinterpret_cast(actor.get()); @@ -110,25 +117,83 @@ int sthread_mutex_init(sthread_mutex_t* mutex, const void* /*pthread_mutexattr_t int sthread_mutex_lock(sthread_mutex_t* mutex) { + /* At least in glibc, PTHREAD_STATIC_INITIALIZER sets every fields to 0 */ + if (mutex->mutex == nullptr) + sthread_mutex_init(mutex, nullptr); + static_cast(mutex->mutex)->lock(); return 0; } int sthread_mutex_trylock(sthread_mutex_t* mutex) { + /* At least in glibc, PTHREAD_STATIC_INITIALIZER sets every fields to 0 */ + if (mutex->mutex == nullptr) + sthread_mutex_init(mutex, nullptr); + return static_cast(mutex->mutex)->try_lock(); } int sthread_mutex_unlock(sthread_mutex_t* mutex) { + /* At least in glibc, PTHREAD_STATIC_INITIALIZER sets every fields to 0 */ + if (mutex->mutex == nullptr) + sthread_mutex_init(mutex, nullptr); + static_cast(mutex->mutex)->unlock(); return 0; } int sthread_mutex_destroy(sthread_mutex_t* mutex) { + /* At least in glibc, PTHREAD_STATIC_INITIALIZER sets every fields to 0 */ + if (mutex->mutex == nullptr) + sthread_mutex_init(mutex, nullptr); + intrusive_ptr_release(static_cast(mutex->mutex)); return 0; } +int sthread_sem_init(sthread_sem_t* sem, int /*pshared*/, unsigned int value) +{ + auto s = sg4::Semaphore::create(value); + intrusive_ptr_add_ref(s.get()); + + sem->sem = s.get(); + return 0; +} +int sthread_sem_destroy(sthread_sem_t* sem) +{ + intrusive_ptr_release(static_cast(sem->sem)); + return 0; +} +int sthread_sem_post(sthread_sem_t* sem) +{ + static_cast(sem->sem)->release(); + return 0; +} +int sthread_sem_wait(sthread_sem_t* sem) +{ + static_cast(sem->sem)->acquire(); + return 0; +} +int sthread_sem_trywait(sthread_sem_t* sem) +{ + auto* s = static_cast(sem->sem); + if (s->would_block()) { + errno = EAGAIN; + return -1; + } + s->acquire(); + return 0; +} +int sthread_sem_timedwait(sthread_sem_t* sem, const struct timespec* abs_timeout) +{ + if (static_cast(sem->sem)->acquire_timeout(static_cast(abs_timeout->tv_sec) + + static_cast(abs_timeout->tv_nsec) / 1E9)) { + errno = ETIMEDOUT; + return -1; + } + return 0; +} int sthread_gettimeofday(struct timeval* tv) { @@ -137,7 +202,7 @@ int sthread_gettimeofday(struct timeval* tv) double secs = trunc(now); double usecs = (now - secs) * 1e6; tv->tv_sec = static_cast(secs); - tv->tv_usec = static_casttv_usec)>(usecs); // suseconds_t (or useconds_t on WIN32) + tv->tv_usec = static_casttv_usec)>(usecs); // suseconds_t } return 0; } @@ -148,24 +213,6 @@ void sthread_sleep(double seconds) } #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;