#include "mc/mc.h"
#include "src/mc/mc_replay.h"
#include "src/mc/Client.hpp"
-#include "src/simix/smx_private.hpp"
#include "src/msg/msg_private.h"
#include "src/simix/SynchroSleep.hpp"
comm->src_proc = NULL;
/* I'm not supposed to destroy a detached comm from the sender side, */
- if (!comm->detached)
- SIMIX_comm_destroy(comm);
+ if (comm->detached)
+ XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender");
else
- XBT_DEBUG("Don't destroy it since it's a detached comm");
+ SIMIX_comm_destroy(comm);
}
else if (comm->dst_proc == process){
while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) {
XBT_DEBUG("Getting rid of %p",process);
- SIMIX_context_free(process->context);
+ delete process->context;
/* Free the exception allocated at creation time */
free(process->running_ctx);
arg->auto_restart);
}
XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host));
- /* stop the context */
- SIMIX_context_stop(arg->context);
+ arg->context->stop();
}
/**
XBT_DEBUG("Yield process '%s'", self->name);
/* Go into sleep and return control to maestro */
- SIMIX_context_suspend(self->context);
+ self->context->suspend();
/* Ok, maestro returned control to us */
XBT_DEBUG("Control returned to me: '%s'", self->name);