X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/409fd38ea33967d5d473264211982b144933cb86..5ec2b80b686983f84ebab7c7398a29e73286deee:/src/sthread/sthread_impl.cpp?ds=sidebyside

diff --git a/src/sthread/sthread_impl.cpp b/src/sthread/sthread_impl.cpp
index df1854109b..c4aa27d0c8 100644
--- a/src/sthread/sthread_impl.cpp
+++ b/src/sthread/sthread_impl.cpp
@@ -1,6 +1,7 @@
 /* SimGrid's pthread interposer. Actual implementation of the symbols (see the comment in sthread.h) */
 
 #include "smpi/smpi.h"
+#include "xbt/string.hpp"
 #include <simgrid/actor.h>
 #include <simgrid/s4u/Actor.hpp>
 #include <simgrid/s4u/Engine.hpp>
@@ -12,12 +13,14 @@
 #include "src/internal_config.h"
 #include "src/sthread/sthread.h"
 
+#include <cmath>
 #include <dlfcn.h>
 #include <pthread.h>
 #include <semaphore.h>
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string_view>
 #include <thread>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(sthread, "pthread intercepter");
@@ -27,6 +30,12 @@ static sg4::Host* lilibeth = nullptr;
 
 int sthread_main(int argc, char** argv, char** envp, int (*raw_main)(int, char**, 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 (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();
 
@@ -39,7 +48,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();
@@ -53,17 +62,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)
 {
@@ -76,8 +74,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<unsigned long>(actor.get());
@@ -103,26 +111,59 @@ 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<sg4::Mutex*>(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<sg4::Mutex*>(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<sg4::Mutex*>(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<sg4::Mutex*>(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<time_t>(secs);
+    tv->tv_usec  = static_cast<decltype(tv->tv_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;
@@ -142,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;