#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"
+#include "src/kernel/activity/SynchroRaw.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix,
"SIMIX Synchronization (mutex, semaphores and conditions)");
{
XBT_IN("(%p, %f)",smx_host,timeout);
- simgrid::simix::Raw *sync = new simgrid::simix::Raw();
+ simgrid::kernel::activity::Raw *sync = new simgrid::kernel::activity::Raw();
sync->sleep = surf_host_sleep(smx_host, timeout);
sync->sleep->setData(sync);
XBT_OUT();
namespace simgrid {
namespace simix {
-Mutex::Mutex()
+Mutex::Mutex() : mutex_(this)
{
XBT_IN("(%p)", this);
// Useful to initialize sleeping swag:
/* If the mutex is not owned by the issuer, that's not good */
if (issuer != this->owner)
THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%d), not by you.",
- SIMIX_process_get_name(this->owner),SIMIX_process_get_PID(this->owner));
+ this->owner->name.c_str(),SIMIX_process_get_PID(this->owner));
if (xbt_swag_size(this->sleeping) > 0) {
/*process to wake up */
{
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;
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;
}
}