#include "smx_private.h"
#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
-#include "src/surf/host_interface.hpp"
+#include "src/surf/virtual_machine.hpp"
+#include "src/surf/HostImplem.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
s_smx_process_t proc;
/* Host structure */
- smx_host->process_list =
- xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
+ smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
sg_host_simix_set(host, smx_host);
xbt_assert((host != NULL), "Invalid parameters");
- if (h->is_off()) {
- simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ if (h->isOff()) {
+ simgrid::surf::HostImplem* surf_host = h->extension<simgrid::surf::HostImplem>();
surf_host->turnOn();
unsigned int cpt;
xbt_assert((host != NULL), "Invalid parameters");
- if (h->is_on()) {
- simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ if (h->isOn()) {
+ simgrid::surf::HostImplem* surf_host = h->extension<simgrid::surf::HostImplem>();
surf_host->turnOff();
/* Clean Simulator data */
}
smx_synchro_t simcall_HANDLER_execution_start(smx_simcall_t simcall,
- const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) {
- return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound,affinity_mask);
+ const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) {
+ return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound,affinity_mask);
}
smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name,
double flops_amount, double priority, double bound, unsigned long affinity_mask){
for (i = 0; i < host_nb; i++)
host_list_cpy[i] = host_list[i];
-
- /* FIXME: what happens if host_list contains VMs and PMs. If
- * execute_parallel_task() does not change the state of the model, we can mix
- * them. */
- surf_host_model_t ws_model =
- host_list[0]->extension<simgrid::surf::Host>()->getModel();
+ /* Check that we are not mixing VMs and PMs in the parallel task */
+ simgrid::surf::HostImplem *host = host_list[0]->extension<simgrid::surf::HostImplem>();
+ bool is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host));
for (i = 1; i < host_nb; i++) {
- surf_host_model_t ws_model_tmp =
- host_list[i]->extension<simgrid::surf::Host>()->getModel();
- if (ws_model_tmp != ws_model) {
- XBT_CRITICAL("mixing VMs and PMs is not supported");
- DIE_IMPOSSIBLE;
- }
+ bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->extension<simgrid::surf::HostImplem>()));
+ xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
}
/* set surf's synchro */
if (!MC_is_active() && !MC_record_replay_is_active()) {
synchro->execution.surf_exec =
surf_host_model->executeParallelTask(
- host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
+ host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
synchro->execution.surf_exec->setData(synchro);
}
double result = 0.0;
if (synchro->state == SIMIX_RUNNING)
- result = surf_action_get_remains(synchro->execution.surf_exec);
+ result = synchro->execution.surf_exec->getRemains();
return result;
}
(int)synchro->state);
}
/* check if the host is down */
- if (simcall->issuer->host->is_off()) {
+ if (simcall->issuer->host->isOff()) {
simcall->issuer->context->iwannadie = 1;
}
{
if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure
* for parallel tasks too */
- synchro->execution.host->is_off()) {
+ synchro->execution.host->isOff()) {
/* If the host running the synchro failed, notice it so that the asking
* process can be killed if it runs on that host itself */
synchro->state = SIMIX_FAILED;