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

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index e2d27bb70b..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_
@@ -18,9 +18,10 @@
  * Classes *
  ***********/
 
+namespace simgrid {
+namespace surf {
+
 class XBT_PRIVATE HostCLM03Model;
-class XBT_PRIVATE HostCLM03;
-class XBT_PRIVATE HostCLM03Action;
 
 /*********
  * Model *
@@ -28,44 +29,10 @@ class XBT_PRIVATE HostCLM03Action;
 
 class HostCLM03Model : public HostModel {
 public:
-  HostCLM03Model(): HostModel(){}
-  ~HostCLM03Model() {}
-  Host *createHost(const char *name);
-  double shareResources(double now);
-
-  void updateActionsState(double now, double delta);
-
-  Action *executeParallelTask(int host_nb,
-                              sg_host_t *host_list,
-							  double *flops_amount,
-							  double *bytes_amount,
-							  double rate);
+  double next_occuring_event(double now) override;
+  void update_actions_state(double now, double delta) 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);
-
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
-
-  virtual Action *execute(double size);
-  virtual Action *sleep(double duration);
-  e_surf_resource_state_t getState();
-
-  bool isUsed();
-
-  xbt_dynar_t getVms();
-};
-
-
-/**********
- * Action *
- **********/
-
-
+}
+}
 
 #endif /* SURF_HOST_CLM03_HPP_ */