X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81f4360c0a86e8f2a136e7baf9e392baac7e7d16..5ec2b80b686983f84ebab7c7398a29e73286deee:/src/sthread/sthread_impl.cpp diff --git a/src/sthread/sthread_impl.cpp b/src/sthread/sthread_impl.cpp index d2bb5d674c..c4aa27d0c8 100644 --- a/src/sthread/sthread_impl.cpp +++ b/src/sthread/sthread_impl.cpp @@ -1,12 +1,7 @@ /* SimGrid's pthread interposer. Actual implementation of the symbols (see the comment in sthread.h) */ -#include -#include -#include -#include -#include - #include "smpi/smpi.h" +#include "xbt/string.hpp" #include #include #include @@ -18,69 +13,94 @@ #include "src/internal_config.h" #include "src/sthread/sthread.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + XBT_LOG_NEW_DEFAULT_CATEGORY(sthread, "pthread intercepter"); namespace sg4 = simgrid::s4u; -static sg4::Host* lilibeth = NULL; +static sg4::Host* lilibeth = nullptr; int sthread_main(int argc, char** argv, char** envp, int (*raw_main)(int, char**, char**)) { - XBT_INFO("sthread main() is starting"); - sthread_inside_simgrid = 1; + /* Do not intercept the main when run from SMPI: it will initialize the simulation properly */ + for (int i = 0; envp[i] != nullptr; i++) + 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 */ + std::ostringstream id; + id << std::this_thread::get_id(); + + XBT_DEBUG("sthread main() is starting in thread %s", id.str().c_str()); sg4::Engine e(&argc, argv); auto* zone = sg4::create_full_zone("world"); lilibeth = zone->create_host("Lilibeth", 1e15); zone->seal(); - sthread_inside_simgrid = 0; /* Launch the user's main() on an actor */ - sg4::ActorPtr main_actor = sg4::Actor::create("tid 0", lilibeth, raw_main, argc, argv, envp); + sthread_enable(); + sg4::ActorPtr main_actor = sg4::Actor::create("main thread", lilibeth, raw_main, argc, argv, envp); - XBT_INFO("sthread main() is launching the simulation"); + XBT_INFO("Starting the simulation."); sg4::Engine::get_instance()->run(); + sthread_disable(); + XBT_INFO("All threads exited. Terminating the simulation."); return 0; } + 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_inside_simgrid = 0; - user_function(param); - sthread_inside_simgrid = 1; -} - -int sthread_create(unsigned long int* thread, const /*pthread_attr_t*/ void* attr, void* (*start_routine)(void*), +int sthread_create(unsigned long int* thread, const void* /*pthread_attr_t* attr*/, void* (*start_routine)(void*), void* arg) { - static int TID = 1; - - if (TID == 0) { - } + static int TID = 0; TID++; + XBT_VERB("Create thread %d", TID); int rank = 0; #if HAVE_SMPI if (SMPI_is_inited()) MPI_Comm_rank(MPI_COMM_WORLD, &rank); #endif - char name[100]; - sprintf(name, "%d:%d", rank, TID); - sg4::ActorPtr actor = sg4::Actor::init(name, lilibeth); - actor->start(thread_create_wrapper, start_routine, arg); + std::string name = simgrid::xbt::string_printf("%d:%d", rank, TID); + 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()); return 0; } +int sthread_join(sthread_t thread, void** /*retval*/) +{ + sg4::ActorPtr actor(reinterpret_cast(thread)); + actor->join(); + intrusive_ptr_release(actor.get()); -int sthread_mutex_init(sthread_mutex_t* mutex, const /*pthread_mutexattr_t*/ void* attr) + return 0; +} + +int sthread_mutex_init(sthread_mutex_t* mutex, const void* /*pthread_mutexattr_t* attr*/) { auto m = sg4::Mutex::create(); intrusive_ptr_add_ref(m.get()); @@ -91,26 +111,59 @@ int sthread_mutex_init(sthread_mutex_t* mutex, const /*pthread_mutexattr_t*/ voi 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_gettimeofday(struct timeval* tv) +{ + if (tv) { + double now = simgrid::s4u::Engine::get_clock(); + double secs = trunc(now); + double usecs = (now - secs) * 1e6; + tv->tv_sec = static_cast(secs); + tv->tv_usec = static_casttv_usec)>(usecs); // suseconds_t + } + return 0; +} + +void sthread_sleep(double seconds) +{ + simgrid::s4u::this_actor::sleep_for(seconds); +} + #if 0 int sem_init(sem_t *sem, int pshared, unsigned int value) { int res; @@ -130,11 +183,6 @@ int sem_post(sem_t *sem) { return raw_sem_post(sem); } -int pthread_join(pthread_t thread, void **retval) { - sg_actor_join(thread, -1); - return 0; -} - int pthread_cond_init(pthread_cond_t *cond, pthread_condattr_t *cond_attr) { *cond = sg_cond_init(); return 0;