#include "src/surf/surf_interface.hpp"
#include "smx_private.h"
-#include "xbt/log.h"
+#include <xbt/ex.hpp>
+#include <xbt/log.h>
#include "src/simix/SynchroRaw.hpp"
namespace simgrid {
namespace simix {
-Mutex::Mutex()
+Mutex::Mutex() : mutex_(this)
{
XBT_IN("(%p)", this);
// Useful to initialize sleeping swag:
}
}
-void SIMIX_mutex_destroy(smx_mutex_t mutex)
+/** Increase the refcount for this mutex */
+smx_mutex_t SIMIX_mutex_ref(smx_mutex_t mutex)
{
if (mutex != nullptr)
- intrusive_ptr_release(mutex);
+ intrusive_ptr_add_ref(mutex);
+ return mutex;
}
-XBT_PUBLIC(smx_mutex_t) SIMIX_mutex_dup(smx_mutex_t mutex)
+/** Decrease the refcount for this mutex */
+void SIMIX_mutex_unref(smx_mutex_t mutex)
{
if (mutex != nullptr)
- intrusive_ptr_add_ref(mutex);
- return mutex;
+ intrusive_ptr_release(mutex);
}
smx_mutex_t simcall_HANDLER_mutex_init(smx_simcall_t simcall)
{
XBT_IN("()");
simgrid::simix::Process p;
- smx_cond_t cond = xbt_new0(s_smx_cond_t, 1);
+ smx_cond_t cond = new s_smx_cond();
cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
- cond->mutex = nullptr;
+ cond->refcount_ = 1;
XBT_OUT();
return cond;
}
XBT_OUT();
}
-/**
- * \brief Destroys a condition.
- *
- * Destroys and frees the condition's memory.
- * \param cond A condition
- */
-void SIMIX_cond_destroy(smx_cond_t cond)
+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_)++;
+ xbt_assert(previous != 0);
+ (void) previous;
+}
+
+void intrusive_ptr_release(s_smx_cond_t *cond)
+{
+ auto count = --(cond->refcount_);
+ if (count == 0) {
xbt_assert(xbt_swag_size(cond->sleeping) == 0,
"Cannot destroy conditional since someone is still using it");
-
xbt_swag_free(cond->sleeping);
- xbt_free(cond);
+ delete cond;
}
- XBT_OUT();
}
/******************************** Semaphores **********************************/