-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <cstdlib>
-
-#include <algorithm>
-
#include "host_clm03.hpp"
-
-#include "cpu_cas01.hpp"
-#include "simgrid/sg_config.h"
-#include "virtual_machine.hpp"
+#include "simgrid/sg_config.hpp"
+#include "surf/surf.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("network/crosstraffic", "yes");
+ simgrid::config::set_default<bool>("network/crosstraffic", true);
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::next_occuring_event(double now){
- adjustWeightOfDummyCpuActions();
+double HostCLM03Model::next_occuring_event(double now)
+{
+ ignore_empty_vm_in_pm_LMM();
double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
- double min_by_net = surf_network_model->next_occuring_event_isIdempotent() ? surf_network_model->next_occuring_event(now) : -1;
+ double min_by_net =
+ surf_network_model->next_occuring_event_is_idempotent() ? surf_network_model->next_occuring_event(now) : -1;
double min_by_sto = surf_storage_model->next_occuring_event(now);
XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
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;
if (min_by_net >= 0.0 && min_by_net < res)
return res;
}
-void HostCLM03Model::updateActionsState(double /*now*/, double /*delta*/){
- return;
+void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/)
+{
+ /* I won't do what you tell me */
}
}