X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb115a05127cacf97d96dca1107ebfe60653e4bd..7097ed501ac302a5f0a2b3cd37114c81ec2e9145:/src/sthread/sthread_impl.cpp

diff --git a/src/sthread/sthread_impl.cpp b/src/sthread/sthread_impl.cpp
index c1b58b2699..063d26553b 100644
--- a/src/sthread/sthread_impl.cpp
+++ b/src/sthread/sthread_impl.cpp
@@ -5,6 +5,8 @@
 
 /* SimGrid's pthread interposer. Actual implementation of the symbols (see the comment in sthread.h) */
 
+#include "simgrid/s4u/Barrier.hpp"
+#include "simgrid/s4u/ConditionVariable.hpp"
 #include "smpi/smpi.h"
 #include "xbt/asserts.h"
 #include "xbt/ex.h"
@@ -48,7 +50,7 @@ int sthread_main(int argc, char** argv, char** envp, int (*raw_main)(int, char**
     }
 
   /* Do not intercept valgrind step 1 */
-  if (not strcmp(argv[0], "/usr/bin/valgrind.bin") || not strcmp(argv[0], "/bin/sh")) {
+  if (not strcmp(argv[0], "/usr/bin/valgrind.bin") || not strcmp(argv[0], "/bin/sh")|| not strcmp(argv[0], "/bin/bash")|| not strcmp(argv[0], "gdb")) {
     printf("sthread refuses to intercept the execution of %s. Running the application unmodified.\n", argv[0]);
     fflush(stdout);
     return raw_main(argc, argv, envp);
@@ -218,6 +220,58 @@ int sthread_mutex_destroy(sthread_mutex_t* mutex)
   intrusive_ptr_release(static_cast<sg4::Mutex*>(mutex->mutex));
   return 0;
 }
+
+int sthread_barrier_init(sthread_barrier_t* barrier, const sthread_barrierattr_t* attr, unsigned count){
+  auto b = sg4::Barrier::create(count);
+  intrusive_ptr_add_ref(b.get());
+
+  barrier->barrier = b.get();
+  return 0;
+}
+int sthread_barrier_wait(sthread_barrier_t* barrier){
+  XBT_DEBUG("%s(%p)", __func__, barrier);
+  static_cast<sg4::Barrier*>(barrier->barrier)->wait();
+  return 0;
+}
+int sthread_barrier_destroy(sthread_barrier_t* barrier){
+  XBT_DEBUG("%s(%p)", __func__, barrier);
+  intrusive_ptr_release(static_cast<sg4::Barrier*>(barrier->barrier));
+  return 0;
+}
+
+int sthread_cond_init(sthread_cond_t* cond, sthread_condattr_t* attr)
+{
+  auto cv = sg4::ConditionVariable::create();
+  intrusive_ptr_add_ref(cv.get());
+
+  cond->cond = cv.get();
+  return 0;
+}
+int sthread_cond_signal(sthread_cond_t* cond)
+{
+  XBT_DEBUG("%s(%p)", __func__, cond);
+  static_cast<sg4::ConditionVariable*>(cond->cond)->notify_one();
+  return 0;
+}
+int sthread_cond_broadcast(sthread_cond_t* cond)
+{
+  XBT_DEBUG("%s(%p)", __func__, cond);
+  static_cast<sg4::ConditionVariable*>(cond->cond)->notify_all();
+  return 0;
+}
+int sthread_cond_wait(sthread_cond_t* cond, sthread_mutex_t* mutex)
+{
+  XBT_DEBUG("%s(%p)", __func__, cond);
+  static_cast<sg4::ConditionVariable*>(cond->cond)->wait(static_cast<sg4::Mutex*>(mutex->mutex));
+  return 0;
+}
+int sthread_cond_destroy(sthread_cond_t* cond)
+{
+  XBT_DEBUG("%s(%p)", __func__, cond);
+  intrusive_ptr_release(static_cast<sg4::ConditionVariable*>(cond->cond));
+  return 0;
+}
+
 int sthread_sem_init(sthread_sem_t* sem, int /*pshared*/, unsigned int value)
 {
   auto s = sg4::Semaphore::create(value);
@@ -273,10 +327,17 @@ int sthread_gettimeofday(struct timeval* tv)
   return 0;
 }
 
-void sthread_sleep(double seconds)
+unsigned int sthread_sleep(double seconds)
+{
+  XBT_DEBUG("sleep(%lf)", seconds);
+  simgrid::s4u::this_actor::sleep_for(seconds);
+  return 0;
+}
+int sthread_usleep(double seconds)
 {
   XBT_DEBUG("sleep(%lf)", seconds);
   simgrid::s4u::this_actor::sleep_for(seconds);
+  return 0;
 }
 
 #if 0