#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:
{
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;
- intrusive_ptr_add_ref(cond);
XBT_OUT();
return cond;
}
XBT_OUT();
}
-/**
- * \brief Destroys a condition.
- *
- * Destroys and frees the condition's memory.
- * \param cond A condition
- */
+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);
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;
}
}