_SIMIX_cond_wait becomes ConditionVariable::wait

[simgrid.git] / src / kernel / activity / ConditionVariableImpl.hpp

diff --git a/src/kernel/activity/ConditionVariableImpl.hpp b/src/kernel/activity/ConditionVariableImpl.hpp
index eeb95d1..772fdcc 100644 (file)
--- a/src/kernel/activity/ConditionVariableImpl.hpp
+++ b/src/kernel/activity/ConditionVariableImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-2019. 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. */
@@ -19,12 +19,13 @@ public:
   ConditionVariableImpl();
   ~ConditionVariableImpl();
 
-  simgrid::kernel::actor::SynchroList sleeping; /* list of sleeping processes */
-  smx_mutex_t mutex = nullptr;
+  simgrid::kernel::actor::SynchroList sleeping_; /* list of sleeping processes */
+  smx_mutex_t mutex_ = nullptr;
   simgrid::s4u::ConditionVariable cond_;
 
   void broadcast();
   void signal();
+  void wait(smx_mutex_t mutex, double timeout, smx_actor_t issuer, smx_simcall_t simcall);
 
 private:
   std::atomic_int_fast32_t refcount_{1};
@@ -34,10 +35,5 @@ private:
 } // namespace activity
 } // namespace kernel
 } // namespace simgrid
-XBT_PRIVATE smx_cond_t SIMIX_cond_init();
-
-// simcall handlers
-XBT_PRIVATE void simcall_HANDLER_cond_signal(smx_simcall_t simcall, smx_cond_t cond);
-XBT_PRIVATE void simcall_HANDLER_cond_broadcast(smx_simcall_t simcall, smx_cond_t cond);
 
 #endif