First step toward modernity in this area.
That's a detour while snake_casing s4u::ConditionVariable :(
friend XBT_PUBLIC void intrusive_ptr_release(ConditionVariable * cond);
using Ptr = boost::intrusive_ptr<ConditionVariable>;
- static Ptr createConditionVariable();
+ static Ptr create();
+
+ XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") Ptr createConditionVariable() { return create(); }
// Wait functions without time:
/* 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. */
-#ifndef SIMIX_SYNCHRO_COMM_HPP
-#define SIMIX_SYNCHRO_COMM_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_COMM_HPP
+#define SIMGRID_KERNEL_ACTIVITY_COMM_HPP
#include "src/kernel/activity/ActivityImpl.hpp"
#include "surf/surf.hpp"
--- /dev/null
+/* Copyright (c) 2007-2018. 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. */
+
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
+#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/simix/smx_synchro_private.hpp"
+#include "xbt/ex.hpp"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ConditionVariable, simix_synchro, "Condition variables");
+
+static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer,
+ smx_simcall_t simcall);
+
+/********************************* Condition **********************************/
+
+/**
+ * \brief Initialize a condition.
+ *
+ * Allocates and creates the data for the condition.
+ * It have to be called before the use of the condition.
+ * \return A condition
+ */
+smx_cond_t SIMIX_cond_init()
+{
+ XBT_IN("()");
+ smx_cond_t cond = new s_smx_cond_t();
+ XBT_OUT();
+ return cond;
+}
+
+/**
+ * \brief Handle a condition waiting simcall without timeouts
+ * \param simcall the simcall
+ */
+void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
+{
+ XBT_IN("(%p)", simcall);
+ smx_actor_t issuer = simcall->issuer;
+
+ _SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
+ XBT_OUT();
+}
+
+/**
+ * \brief Handle a condition waiting simcall with timeouts
+ * \param simcall the simcall
+ */
+void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex, double timeout)
+{
+ XBT_IN("(%p)", simcall);
+ smx_actor_t issuer = simcall->issuer;
+
+ _SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
+ XBT_OUT();
+}
+
+static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout, smx_actor_t issuer,
+ smx_simcall_t simcall)
+{
+ XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall);
+ smx_activity_t synchro = nullptr;
+
+ XBT_DEBUG("Wait condition %p", cond);
+
+ /* If there is a mutex unlock it */
+ /* FIXME: what happens if the issuer is not the owner of the mutex? */
+ if (mutex != nullptr) {
+ cond->mutex = mutex;
+ mutex->unlock(issuer);
+ }
+
+ synchro = SIMIX_synchro_wait(issuer->host, timeout);
+ synchro->simcalls.push_front(simcall);
+ issuer->waiting_synchro = synchro;
+ cond->sleeping.push_back(*simcall->issuer);
+ XBT_OUT();
+}
+
+/**
+ * \brief Signalizes a condition.
+ *
+ * Signalizes a condition and wakes up a sleeping process.
+ * If there are no process sleeping, no action is done.
+ * \param cond A condition
+ */
+void SIMIX_cond_signal(smx_cond_t cond)
+{
+ XBT_IN("(%p)", cond);
+ XBT_DEBUG("Signal condition %p", cond);
+
+ /* If there are processes waiting for the condition choose one and try
+ to make it acquire the mutex */
+ if (not cond->sleeping.empty()) {
+ auto& proc = cond->sleeping.front();
+ cond->sleeping.pop_front();
+
+ /* Destroy waiter's synchronization */
+ proc.waiting_synchro = nullptr;
+
+ /* Now transform the cond wait simcall into a mutex lock one */
+ smx_simcall_t simcall = &proc.simcall;
+ smx_mutex_t mutex;
+ if (simcall->call == SIMCALL_COND_WAIT)
+ mutex = simcall_cond_wait__get__mutex(simcall);
+ else
+ mutex = simcall_cond_wait_timeout__get__mutex(simcall);
+ simcall->call = SIMCALL_MUTEX_LOCK;
+
+ simcall_HANDLER_mutex_lock(simcall, mutex);
+ }
+ XBT_OUT();
+}
+
+/**
+ * \brief Broadcasts a condition.
+ *
+ * Signal ALL processes waiting on a condition.
+ * If there are no process waiting, no action is done.
+ * \param cond A condition
+ */
+void SIMIX_cond_broadcast(smx_cond_t cond)
+{
+ XBT_IN("(%p)", cond);
+ XBT_DEBUG("Broadcast condition %p", cond);
+
+ /* Signal the condition until nobody is waiting on it */
+ while (not cond->sleeping.empty()) {
+ SIMIX_cond_signal(cond);
+ }
+ XBT_OUT();
+}
+
+smx_cond_t SIMIX_cond_ref(smx_cond_t cond)
+{
+ if (cond != nullptr)
+ intrusive_ptr_add_ref(cond);
+ return cond;
+}
+
+void SIMIX_cond_unref(smx_cond_t cond)
+{
+ XBT_IN("(%p)", cond);
+ XBT_DEBUG("Destroy condition %p", cond);
+ if (cond != nullptr) {
+ intrusive_ptr_release(cond);
+ }
+ XBT_OUT();
+}
+
+void intrusive_ptr_add_ref(s_smx_cond_t* cond)
+{
+ auto previous = cond->refcount_.fetch_add(1);
+ xbt_assert(previous != 0);
+}
+
+void intrusive_ptr_release(s_smx_cond_t* cond)
+{
+ if (cond->refcount_.fetch_sub(1) == 1) {
+ xbt_assert(cond->sleeping.empty(), "Cannot destroy conditional since someone is still using it");
+ delete cond;
+ }
+}
--- /dev/null
+/* Copyright (c) 2012-2018. 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. */
+
+#ifndef SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP
+#define SIMGRID_KERNEL_ACTIVITY_CONDITIONVARIABLEIMPL_HPP
+
+#include "simgrid/s4u/ConditionVariable.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include <boost/intrusive/list.hpp>
+
+struct s_smx_cond_t {
+ s_smx_cond_t() : cond_(this) {}
+
+ std::atomic_int_fast32_t refcount_{1};
+ smx_mutex_t mutex = nullptr;
+ simgrid::kernel::actor::SynchroList sleeping; /* list of sleeping processes */
+ simgrid::s4u::ConditionVariable cond_;
+};
+
+XBT_PRIVATE smx_cond_t SIMIX_cond_init();
+XBT_PRIVATE void SIMIX_cond_broadcast(smx_cond_t cond);
+XBT_PRIVATE void SIMIX_cond_signal(smx_cond_t cond);
+XBT_PRIVATE void intrusive_ptr_add_ref(s_smx_cond_t* cond);
+XBT_PRIVATE void intrusive_ptr_release(s_smx_cond_t* cond);
+
+#endif
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/activity/MailboxImpl.hpp"
-
#include "src/kernel/activity/CommImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mailbox, simix, "Mailbox implementation");
#include "simgrid/s4u/ConditionVariable.hpp"
#include "simgrid/simix.h"
-#include "src/simix/smx_synchro_private.hpp"
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
namespace simgrid {
namespace s4u {
-ConditionVariablePtr ConditionVariable::createConditionVariable()
+ConditionVariablePtr ConditionVariable::create()
{
smx_cond_t cond = simcall_cond_init();
return ConditionVariablePtr(&cond->cond_, false);
#include "simgrid/simix/blocking_simcall.hpp"
#include "smx_private.hpp"
#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_replay.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/mc_forward.hpp"
#endif
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
#include "src/simix/smx_host_private.hpp"
#include "src/simix/smx_synchro_private.hpp"
fd.write('#if SIMGRID_HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#endif\n')
+ fd.write('#include "src/kernel/activity/ConditionVariableImpl.hpp"\n')
fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
fd.write('#include "src/simix/smx_host_private.hpp"\n')
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.hpp"
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/simix/smx_synchro_private.hpp"
XBT_OUT();
}
-/********************************* Condition **********************************/
-
-/**
- * \brief Initialize a condition.
- *
- * Allocates and creates the data for the condition.
- * It have to be called before the use of the condition.
- * \return A condition
- */
-smx_cond_t SIMIX_cond_init()
-{
- XBT_IN("()");
- smx_cond_t cond = new s_smx_cond_t();
- cond->refcount_ = 1;
- XBT_OUT();
- return cond;
-}
-
-/**
- * \brief Handle a condition waiting simcall without timeouts
- * \param simcall the simcall
- */
-void simcall_HANDLER_cond_wait(smx_simcall_t simcall, smx_cond_t cond, smx_mutex_t mutex)
-{
- XBT_IN("(%p)",simcall);
- smx_actor_t issuer = simcall->issuer;
-
- _SIMIX_cond_wait(cond, mutex, -1, issuer, simcall);
- XBT_OUT();
-}
-
-/**
- * \brief Handle a condition waiting simcall with timeouts
- * \param simcall the simcall
- */
-void simcall_HANDLER_cond_wait_timeout(smx_simcall_t simcall, smx_cond_t cond,
- smx_mutex_t mutex, double timeout)
-{
- XBT_IN("(%p)",simcall);
- smx_actor_t issuer = simcall->issuer;
-
- _SIMIX_cond_wait(cond, mutex, timeout, issuer, simcall);
- XBT_OUT();
-}
-
-
-static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
- smx_actor_t issuer, smx_simcall_t simcall)
-{
- XBT_IN("(%p, %p, %f, %p,%p)",cond,mutex,timeout,issuer,simcall);
- smx_activity_t synchro = nullptr;
-
- XBT_DEBUG("Wait condition %p", cond);
-
- /* If there is a mutex unlock it */
- /* FIXME: what happens if the issuer is not the owner of the mutex? */
- if (mutex != nullptr) {
- cond->mutex = mutex;
- mutex->unlock(issuer);
- }
-
- synchro = SIMIX_synchro_wait(issuer->host, timeout);
- synchro->simcalls.push_front(simcall);
- issuer->waiting_synchro = synchro;
- cond->sleeping.push_back(*simcall->issuer);
- XBT_OUT();
-}
-
-/**
- * \brief Signalizes a condition.
- *
- * Signalizes a condition and wakes up a sleeping process.
- * If there are no process sleeping, no action is done.
- * \param cond A condition
- */
-void SIMIX_cond_signal(smx_cond_t cond)
-{
- XBT_IN("(%p)",cond);
- XBT_DEBUG("Signal condition %p", cond);
-
- /* If there are processes waiting for the condition choose one and try
- to make it acquire the mutex */
- if (not cond->sleeping.empty()) {
- auto& proc = cond->sleeping.front();
- cond->sleeping.pop_front();
-
- /* Destroy waiter's synchronization */
- proc.waiting_synchro = nullptr;
-
- /* Now transform the cond wait simcall into a mutex lock one */
- smx_simcall_t simcall = &proc.simcall;
- smx_mutex_t mutex;
- if(simcall->call == SIMCALL_COND_WAIT)
- mutex = simcall_cond_wait__get__mutex(simcall);
- else
- mutex = simcall_cond_wait_timeout__get__mutex(simcall);
- simcall->call = SIMCALL_MUTEX_LOCK;
-
- simcall_HANDLER_mutex_lock(simcall, mutex);
- }
- XBT_OUT();
-}
-
-/**
- * \brief Broadcasts a condition.
- *
- * Signal ALL processes waiting on a condition.
- * If there are no process waiting, no action is done.
- * \param cond A condition
- */
-void SIMIX_cond_broadcast(smx_cond_t cond)
-{
- XBT_IN("(%p)",cond);
- XBT_DEBUG("Broadcast condition %p", cond);
-
- /* Signal the condition until nobody is waiting on it */
- while (not cond->sleeping.empty()) {
- SIMIX_cond_signal(cond);
- }
- XBT_OUT();
-}
-
-smx_cond_t SIMIX_cond_ref(smx_cond_t cond)
-{
- if (cond != nullptr)
- intrusive_ptr_add_ref(cond);
- return cond;
-}
-
-void SIMIX_cond_unref(smx_cond_t cond)
-{
- XBT_IN("(%p)",cond);
- XBT_DEBUG("Destroy condition %p", cond);
- if (cond != nullptr) {
- intrusive_ptr_release(cond);
- }
- XBT_OUT();
-}
-
-
-void intrusive_ptr_add_ref(s_smx_cond_t *cond)
-{
- auto previous = cond->refcount_.fetch_add(1);
- xbt_assert(previous != 0);
-}
-
-void intrusive_ptr_release(s_smx_cond_t *cond)
-{
- if (cond->refcount_.fetch_sub(1) == 1) {
- xbt_assert(cond->sleeping.empty(), "Cannot destroy conditional since someone is still using it");
- delete cond;
- }
-}
-
/******************************** Semaphores **********************************/
/** @brief Initialize a semaphore */
smx_sem_t SIMIX_sem_init(unsigned int value)
smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout);
-struct s_smx_cond_t {
- s_smx_cond_t() : cond_(this) {}
-
- std::atomic_int_fast32_t refcount_{1};
- smx_mutex_t mutex = nullptr;
- simgrid::kernel::actor::SynchroList sleeping; /* list of sleeping processes */
- simgrid::s4u::ConditionVariable cond_;
-};
-
struct s_smx_sem_t {
unsigned int value;
simgrid::kernel::actor::SynchroList sleeping; /* list of sleeping processes */
XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall);
XBT_PRIVATE void SIMIX_synchro_finish(smx_activity_t synchro);
-XBT_PRIVATE smx_cond_t SIMIX_cond_init();
-XBT_PRIVATE void SIMIX_cond_broadcast(smx_cond_t cond);
-XBT_PRIVATE void SIMIX_cond_signal(smx_cond_t cond);
-XBT_PRIVATE void intrusive_ptr_add_ref(s_smx_cond_t* cond);
-XBT_PRIVATE void intrusive_ptr_release(s_smx_cond_t* cond);
-
XBT_PRIVATE XBT_PRIVATE smx_sem_t SIMIX_sem_init(unsigned int value);
XBT_PRIVATE void SIMIX_sem_release(smx_sem_t sem);
XBT_PRIVATE int SIMIX_sem_would_block(smx_sem_t sem);
src/simix/popping.cpp
src/kernel/activity/ActivityImpl.cpp
src/kernel/activity/ActivityImpl.hpp
+ src/kernel/activity/ConditionVariableImpl.cpp
+ src/kernel/activity/ConditionVariableImpl.hpp
src/kernel/activity/CommImpl.cpp
src/kernel/activity/CommImpl.hpp
src/kernel/activity/ExecImpl.cpp
