pull up two more methods in the surf::Host hierarchy

[simgrid.git] / src / surf / host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index e4d4957..1dc8e21 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -4,6 +4,10 @@
 /* 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"
@@ -22,38 +26,32 @@ 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();
 
-  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);
+  simgrid::surf::Model *model = surf_host_model;
+  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 simgrid::surf::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 *host = new HostCLM03(surf_host_model, name, NULL,
+namespace simgrid {
+namespace surf {
+
+Host *HostCLM03Model::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props){
+  Host *host = new simgrid::surf::HostCLM03(surf_host_model, name, props,
                  (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);
   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;
 }
 
@@ -69,7 +67,7 @@ double HostCLM03Model::shareResources(double now){
                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)
@@ -128,6 +126,10 @@ Action *HostCLM03Model::executeParallelTask(int host_nb,
 HostCLM03::HostCLM03(HostModel *model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
   : Host(model, name, properties, storage, netElm, cpu) {}
 
+HostCLM03::~HostCLM03()
+{
+}
+
 bool HostCLM03::isUsed(){
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
   return -1;
@@ -137,18 +139,9 @@ void HostCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/,
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
 }
 
-Action *HostCLM03::execute(double size) {
-  return p_cpu->execute(size);
-}
-
-Action *HostCLM03::sleep(double duration) {
-  return p_cpu->sleep(duration);
-}
-
-e_surf_resource_state_t HostCLM03::getState() {
-  return p_cpu->getState();
-}
-
 /**********
  * Action *
  **********/
+
+}
+}