#include "xbt/dict.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
+#include "src/surf/virtual_machine.hpp"
+#include "src/surf/host_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
xbt_assert((host != NULL), "Invalid parameters");
- if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_OFF) {
- surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_ON);
+ if (h->is_off()) {
+ simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ surf_host->turnOn();
unsigned int cpt;
smx_process_arg_t arg;
}
}
-void simcall_HANDLER_host_off(smx_simcall_t simcall, sg_host_t h)
-{
- SIMIX_host_off(h, simcall->issuer);
-}
-
/**
* \brief Stop the host if it is on
*
xbt_assert((host != NULL), "Invalid parameters");
- if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_ON) {
- surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_OFF);
+ if (h->is_on()) {
+ simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ surf_host->turnOff();
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_get_name(process->host), issuer->name);
}
}
+ } else {
+ XBT_INFO("Host %s is already off",h->name().c_str());
}
}
if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
return "";
- return SIMIX_host_get_name(host);
-}
-
-xbt_dict_t SIMIX_host_get_properties(sg_host_t host){
- return surf_host_get_properties(surf_host_resource_priv(host));
-}
-
-
-xbt_swag_t SIMIX_host_get_process_list(sg_host_t host){
- smx_host_priv_t host_priv = sg_host_simix(host);
-
- return host_priv->process_list;
-}
-
-
-double SIMIX_host_get_current_power_peak(sg_host_t host) {
- return surf_host_get_current_power_peak(host);
-}
-
-double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) {
- return surf_host_get_power_peak_at(host, pstate_index);
-}
-
-void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) {
- surf_host_set_pstate(host, pstate_index);
-}
-double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) {
- return surf_host_get_wattmin_at(host,pstate);
-}
-double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate) {
- return surf_host_get_wattmax_at(host,pstate);
+ return sg_host_get_name(host);
}
void _SIMIX_host_free_process_arg(void *data)
arg->properties = properties;
arg->auto_restart = auto_restart;
- if( sg_host_get_state(host) == SURF_RESOURCE_OFF
+ if( ! sg_host_is_on(host)
&& !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,NULL);
XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
/**
* \brief Restart the list of processes that have been registered to the host
*/
-void SIMIX_host_restart_processes(sg_host_t host)
+void SIMIX_host_autorestart(sg_host_t host)
{
unsigned int cpt;
smx_process_arg_t arg;
xbt_dynar_reset(process_list);
}
-void SIMIX_host_autorestart(sg_host_t host)
-{
- if(simix_global->autorestart)
- simix_global->autorestart(host);
- else
- xbt_die("No function for simix_global->autorestart");
+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);
}
-smx_synchro_t simcall_HANDLER_process_execute(smx_simcall_t simcall,
- const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) {
- return SIMIX_process_execute(simcall->issuer, name,flops_amount,priority,bound,affinity_mask);
-}
-smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
+smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name,
double flops_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
/* set surf's action */
if (!MC_is_active() && !MC_record_replay_is_active()) {
- synchro->execution.surf_exec = surf_host_execute(issuer->host, flops_amount);
- surf_action_set_data(synchro->execution.surf_exec, synchro);
- surf_action_set_priority(synchro->execution.surf_exec, priority);
+ synchro->execution.surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount);
+ synchro->execution.surf_exec->setData(synchro);
+ synchro->execution.surf_exec->setPriority(priority);
- /* Note (hypervisor): for multicore, the bound value being passed to the
- * surf layer should not be zero (i.e., unlimited). It should be the
- * capacity of a CPU core. */
- if (bound == 0)
- surf_cpu_action_set_bound(synchro->execution.surf_exec, sg_host_get_speed(issuer->host));
- else
- surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+ if (bound != 0)
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+ ->setBound(bound);
if (affinity_mask != 0) {
/* just a double check to confirm that this host is the host where this task is running. */
xbt_assert(synchro->execution.host == issuer->host);
- surf_cpu_action_set_affinity(synchro->execution.surf_exec, issuer->host, affinity_mask);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+ ->setAffinity(issuer->host->pimpl_cpu, affinity_mask);
}
}
return synchro;
}
-smx_synchro_t SIMIX_process_parallel_execute(const char *name,
+smx_synchro_t SIMIX_execution_parallel_start(const char *name,
int host_nb, sg_host_t *host_list,
double *flops_amount, double *bytes_amount,
double amount, double rate){
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_model_t ws_model = surf_resource_model(host_list[0], SURF_HOST_LEVEL);
+ /* Check that we are not mixing VMs and PMs in the parallel task */
+ simgrid::surf::Host *host = host_list[0]->extension<simgrid::surf::Host>();
+ bool is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host));
for (i = 1; i < host_nb; i++) {
- surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_HOST_LEVEL);
- 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::Host>()));
+ 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_execute_parallel_task(surf_host_model,
- host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
+ surf_host_model->executeParallelTask(
+ host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
- surf_action_set_data(synchro->execution.surf_exec, synchro);
+ synchro->execution.surf_exec->setData(synchro);
}
XBT_DEBUG("Create parallel execute synchro %p", synchro);
return synchro;
}
-void SIMIX_process_execution_destroy(smx_synchro_t synchro){
+void SIMIX_execution_destroy(smx_synchro_t synchro)
+{
XBT_DEBUG("Destroy synchro %p", synchro);
if (synchro->execution.surf_exec) {
- surf_action_unref(synchro->execution.surf_exec);
+ synchro->execution.surf_exec->unref();
synchro->execution.surf_exec = NULL;
}
xbt_free(synchro->name);
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
-void SIMIX_process_execution_cancel(smx_synchro_t synchro){
+void SIMIX_execution_cancel(smx_synchro_t synchro)
+{
XBT_DEBUG("Cancel synchro %p", synchro);
if (synchro->execution.surf_exec)
- surf_action_cancel(synchro->execution.surf_exec);
+ synchro->execution.surf_exec->cancel();
}
-double SIMIX_process_execution_get_remains(smx_synchro_t synchro){
+double SIMIX_execution_get_remains(smx_synchro_t synchro)
+{
double result = 0.0;
if (synchro->state == SIMIX_RUNNING)
return result;
}
-e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro){
+e_smx_state_t SIMIX_execution_get_state(smx_synchro_t synchro)
+{
return synchro->state;
}
-void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority){
-
+void SIMIX_execution_set_priority(smx_synchro_t synchro, double priority)
+{
if(synchro->execution.surf_exec)
- surf_action_set_priority(synchro->execution.surf_exec, priority);
+ synchro->execution.surf_exec->setPriority(priority);
}
-void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound){
-
+void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound)
+{
if(synchro->execution.surf_exec)
- surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)->setBound(bound);
}
-void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
+void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask)
+{
xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
if (synchro->execution.surf_exec) {
/* just a double check to confirm that this host is the host where this task is running. */
xbt_assert(synchro->execution.host == host);
- surf_cpu_action_set_affinity(synchro->execution.surf_exec, host, mask);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+ ->setAffinity(host->pimpl_cpu, mask);
}
}
-void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro){
+void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro)
+{
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
SIMIX_execution_finish(synchro);
}
-void SIMIX_host_execution_suspend(smx_synchro_t synchro)
+void SIMIX_execution_suspend(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
- surf_action_suspend(synchro->execution.surf_exec);
+ synchro->execution.surf_exec->suspend();
}
-void SIMIX_host_execution_resume(smx_synchro_t synchro)
+void SIMIX_execution_resume(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
- surf_action_resume(synchro->execution.surf_exec);
+ synchro->execution.surf_exec->resume();
}
void SIMIX_execution_finish(smx_synchro_t synchro)
(int)synchro->state);
}
/* check if the host is down */
- if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
+ if (simcall->issuer->host->is_off()) {
simcall->issuer->context->iwannadie = 1;
}
simcall->issuer->waiting_synchro = NULL;
- simcall_process_execution_wait__set__result(simcall, synchro->state);
+ simcall_execution_wait__set__result(simcall, synchro->state);
SIMIX_simcall_answer(simcall);
}
/* We no longer need it */
- SIMIX_process_execution_destroy(synchro);
+ SIMIX_execution_destroy(synchro);
}
{
if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure
* for parallel tasks too */
- surf_host_get_state(surf_host_resource_priv(synchro->execution.host)) == SURF_RESOURCE_OFF) {
+ synchro->execution.host->is_off()) {
/* 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;
- } else if (surf_action_get_state(synchro->execution.surf_exec) == SURF_ACTION_FAILED) {
+ } else if (synchro->execution.surf_exec->getState() == SURF_ACTION_FAILED) {
/* If the host running the synchro didn't fail, then the synchro was
* canceled */
synchro->state = SIMIX_CANCELED;
}
if (synchro->execution.surf_exec) {
- surf_action_unref(synchro->execution.surf_exec);
+ synchro->execution.surf_exec->unref();
synchro->execution.surf_exec = NULL;
}
{
if (synchro->state != SIMIX_RUNNING) return;
if (synchro->type == SIMIX_SYNC_EXECUTE){
- surf_action_set_category(synchro->execution.surf_exec, category);
+ synchro->execution.surf_exec->setCategory(category);
}else if (synchro->type == SIMIX_SYNC_COMMUNICATE){
- surf_action_set_category(synchro->comm.surf_comm, category);
+ synchro->comm.surf_comm->setCategory(category);
}
}
-
-/**
- * \brief Function to get the parameters of the given the SIMIX host.
- *
- * \param host the host to get_phys_host (a sg_host_t)
- * \param param the parameter object space to be overwritten (a ws_params_t)
- */
-void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params)
-{
- /* jump to ws_get_params(). */
- surf_host_get_params(ind_vm, params);
-}
-
-void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params)
-{
- /* jump to ws_set_params(). */
- surf_host_set_params(ind_vm, params);
-}
-
-xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host){
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_host_get_mounted_storage_list(host);
-}
-
-xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host){
- xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_host_get_attached_storage_list(host);
-}
