X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/62cbd47a6b39a36431539d60f0f0efe81d228e4b..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/host_clm03.hpp

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index 075589c5ae..53771aa346 100644
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,10 +6,10 @@
 
 #include <xbt/base.h>
 
-#include "storage_interface.hpp"
+#include "StorageImpl.hpp"
 #include "cpu_interface.hpp"
-#include "host_interface.hpp"
 #include "network_interface.hpp"
+#include "src/surf/HostImpl.hpp"
 
 #ifndef SURF_HOST_CLM03_HPP_
 #define SURF_HOST_CLM03_HPP_
@@ -22,8 +22,6 @@ namespace simgrid {
 namespace surf {
 
 class XBT_PRIVATE HostCLM03Model;
-class XBT_PRIVATE HostCLM03;
-class XBT_PRIVATE HostCLM03Action;
 
 /*********
  * Model *
@@ -31,38 +29,9 @@ class XBT_PRIVATE HostCLM03Action;
 
 class HostCLM03Model : public HostModel {
 public:
-  HostCLM03Model(): HostModel(){}
-  ~HostCLM03Model() {}
-  Host *createHost(const char *name, RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props) override;
-  double shareResources(double now) override;
-
-  void updateActionsState(double now, double delta) override;
-
-  Action *executeParallelTask(int host_nb,
-                              sg_host_t *host_list,
-							  double *flops_amount,
-							  double *bytes_amount,
-							  double rate) override;
-};
-
-/************
- * Resource *
- ************/
-
-class HostCLM03 : public Host {
-public:
-  HostCLM03(HostModel *model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu);
-  ~HostCLM03();
-  void updateState(tmgr_trace_event_t event_type, double value, double date) override;
-
-  xbt_dynar_t getVms();
+  double next_occuring_event(double now) override;
+  void update_actions_state(double now, double delta) override;
 };
-
-
-/**********
- * Action *
- **********/
-
 }
 }