-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. 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 "vm_interface.hpp"
+#include "virtual_machine.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
void surf_host_model_init_current_default(void)
{
- surf_host_model = new HostCLM03Model();
+ surf_host_model = new simgrid::surf::HostCLM03Model();
xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
surf_cpu_model_init_Cas01();
surf_network_model_init_LegrandVelho();
- surf_host_model->p_cpuModel = surf_cpu_model_pm;
- ModelPtr model = surf_host_model;
- xbt_dynar_push(model_list, &model);
- xbt_dynar_push(model_list_invoke, &model);
- sg_platf_host_add_cb(host_parse_init);
+ xbt_dynar_push(all_existing_models, &surf_host_model);
}
void surf_host_model_init_compound()
{
-
xbt_assert(surf_cpu_model_pm, "No CPU model defined yet!");
xbt_assert(surf_network_model, "No network model defined yet!");
- surf_host_model = new HostCLM03Model();
-
- ModelPtr model = surf_host_model;
- xbt_dynar_push(model_list, &model);
- xbt_dynar_push(model_list_invoke, &model);
- sg_platf_host_add_cb(host_parse_init);
-}
-HostCLM03Model::HostCLM03Model()
- : HostModel("Host CLM03")
-{
+ surf_host_model = new simgrid::surf::HostCLM03Model();
+ xbt_dynar_push(all_existing_models, &surf_host_model);
}
-HostCLM03Model::~HostCLM03Model()
-{}
-
-HostPtr HostCLM03Model::createHost(const char *name){
- HostPtr host = new HostCLM03(surf_host_model, name, NULL,
- (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
- (RoutingEdgePtr)xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL),
- static_cast<CpuPtr>(xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL)));
- XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
- xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, host);
- return host;
-}
+namespace simgrid {
+namespace surf {
double HostCLM03Model::shareResources(double now){
adjustWeightOfDummyCpuActions();
- double min_by_cpu = p_cpuModel->shareResources(now);
- double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;
- double min_by_sto = -1;
- if (p_cpuModel == surf_cpu_model_pm)
- min_by_sto = surf_storage_model->shareResources(now);
+ 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);
XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
- this, surf_cpu_model_pm->getName(), min_by_cpu,
- surf_network_model->getName(), min_by_net,
- surf_storage_model->getName(), min_by_sto);
+ 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);
- double res = max(max(min_by_cpu, min_by_net), min_by_sto);
+ double res = std::max(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;
}
-ActionPtr HostCLM03Model::executeParallelTask(int host_nb,
- void **host_list,
+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)
- ActionPtr action =NULL;
+ Action *action =NULL;
if ((host_nb == 1)
&& (cost_or_zero(bytes_amount, 0) == 0.0)){
- action = ((HostCLM03Ptr)host_list[0])->execute(flops_amount[0]);
+ action = surf_host_execute(host_list[0],flops_amount[0]);
} else if ((host_nb == 1)
&& (cost_or_zero(flops_amount, 0) == 0.0)) {
- action = communicate((HostCLM03Ptr)host_list[0],
- (HostCLM03Ptr)host_list[0],bytes_amount[0], rate);
+ action = surf_network_model->communicate(host_list[0]->p_netcard,
+ host_list[0]->p_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)) {
}
}
if (nb == 1){
- action = communicate((HostCLM03Ptr)host_list[0],
- (HostCLM03Ptr)host_list[1],value, rate);
+ action = surf_network_model->communicate(host_list[0]->p_netcard,
+ host_list[1]->p_netcard,
+ value, rate);
}
} else
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts */
#undef cost_or_zero
- xbt_free((HostCLM03Ptr)host_list);
+ xbt_free(host_list);
return action;
}
-ActionPtr HostCLM03Model::communicate(HostPtr src, HostPtr dst, double size, double rate){
- return surf_network_model->communicate(src->p_netElm, dst->p_netElm, size, rate);
-}
-
-
-
-/************
- * Resource *
- ************/
-HostCLM03::HostCLM03(HostModelPtr model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu)
- : Host(model, name, properties, storage, netElm, cpu) {}
-
-bool HostCLM03::isUsed(){
- THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
- return -1;
-}
-
-void HostCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
- THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
-}
-
-ActionPtr HostCLM03::execute(double size) {
- return p_cpu->execute(size);
}
-
-ActionPtr HostCLM03::sleep(double duration) {
- return p_cpu->sleep(duration);
}
-
-e_surf_resource_state_t HostCLM03::getState() {
- return p_cpu->getState();
-}
-
-/**********
- * Action *
- **********/
