-/* 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);
surf_network_model_init_LegrandVelho();
Model *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, &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();
- Model *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);
+ surf_host_model = new HostCLM03Model();
+ xbt_dynar_push(all_existing_models, &surf_host_model);
}
-Host *HostCLM03Model::createHost(const char *name){
- sg_host_t sg_host = sg_host_by_name(name);
+Host *HostCLM03Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu){
Host *host = new HostCLM03(surf_host_model, name, NULL,
(xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
- sg_host_edge(sg_host),
- sg_host_surfcpu(sg_host));
+ netElm, cpu);
+ surf_callback_emit(hostCreatedCallbacks, host);
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;
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)