#include "cpu_cas01.hpp"
#include "simgrid/sg_config.h"
-#include "virtual_machine.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
* Model *
*********/
-void surf_host_model_init_current_default(void)
+void surf_host_model_init_current_default()
{
surf_host_model = new simgrid::surf::HostCLM03Model();
- xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
+ xbt_cfg_setdefault_boolean("network/crosstraffic", "yes");
surf_cpu_model_init_Cas01();
surf_network_model_init_LegrandVelho();
- xbt_dynar_push(all_existing_models, &surf_host_model);
+ all_existing_models->push_back(surf_host_model);
}
void surf_host_model_init_compound()
xbt_assert(surf_network_model, "No network model defined yet!");
surf_host_model = new simgrid::surf::HostCLM03Model();
- xbt_dynar_push(all_existing_models, &surf_host_model);
+ all_existing_models->push_back(surf_host_model);
}
namespace simgrid {
namespace surf {
-double HostCLM03Model::shareResources(double now){
+double HostCLM03Model::nextOccuringEvent(double now){
adjustWeightOfDummyCpuActions();
- double min_by_cpu = surf_cpu_model_pm->shareResources(now);
- double min_by_net = surf_network_model->shareResourcesIsIdempotent() ? surf_network_model->shareResources(now) : -1;
- double min_by_sto = surf_storage_model->shareResources(now);
+ double min_by_cpu = surf_cpu_model_pm->nextOccuringEvent(now);
+ double min_by_net = surf_network_model->nextOccuringEventIsIdempotent() ? surf_network_model->nextOccuringEvent(now) : -1;
+ double min_by_sto = surf_storage_model->nextOccuringEvent(now);
XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
this, typeid(surf_cpu_model_pm).name(), min_by_cpu,
- typeid(surf_network_model).name(), min_by_net,
- typeid(surf_storage_model).name(), min_by_sto);
+ typeid(surf_network_model).name(), min_by_net,
+ typeid(surf_storage_model).name(), min_by_sto);
- double res = std::max(std::max(min_by_cpu, min_by_net), min_by_sto);
+ double res = std::max({min_by_cpu, min_by_net, min_by_sto});
if (min_by_cpu >= 0.0 && min_by_cpu < res)
- res = min_by_cpu;
+ res = min_by_cpu;
if (min_by_net >= 0.0 && min_by_net < res)
- res = min_by_net;
+ res = min_by_net;
if (min_by_sto >= 0.0 && min_by_sto < res)
- res = min_by_sto;
+ res = min_by_sto;
return res;
}
void HostCLM03Model::updateActionsState(double /*now*/, double /*delta*/){
- return;
-}
-
-Action *HostCLM03Model::executeParallelTask(int host_nb,
- sg_host_t *host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate){
-#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
- Action *action =NULL;
- if ((host_nb == 1)
- && (cost_or_zero(bytes_amount, 0) == 0.0)){
- action = host_list[0]->pimpl_cpu->execute(flops_amount[0]);
- } else if ((host_nb == 1)
- && (cost_or_zero(flops_amount, 0) == 0.0)) {
- action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
- host_list[0]->pimpl_netcard,
- bytes_amount[0], rate);
- } else if ((host_nb == 2)
- && (cost_or_zero(flops_amount, 0) == 0.0)
- && (cost_or_zero(flops_amount, 1) == 0.0)) {
- int i,nb = 0;
- double value = 0.0;
-
- for (i = 0; i < host_nb * host_nb; i++) {
- if (cost_or_zero(bytes_amount, i) > 0.0) {
- nb++;
- value = cost_or_zero(bytes_amount, i);
- }
- }
- if (nb == 1){
- action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
- host_list[1]->pimpl_netcard,
- value, rate);
- }
- } else
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts */
-#undef cost_or_zero
- xbt_free(host_list);
- return action;
+ /* I won't do what you tell me */
}
}