X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54e35ebda7e4ffacd769653b8ebb8ba93c7298bf..153259d001d7e03ebc06ea7dc27803788a9cdb9d:/src/surf/host_clm03.hpp

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index 3a935eb0a9..460cacba6a 100644
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -1,9 +1,11 @@
-/* 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 <xbt/base.h>
+
 #include "storage_interface.hpp"
 #include "cpu_interface.hpp"
 #include "host_interface.hpp"
@@ -16,9 +18,12 @@
  * Classes *
  ***********/
 
-class HostCLM03Model;
-class HostCLM03;
-class HostCLM03Action;
+namespace simgrid {
+namespace surf {
+
+class XBT_PRIVATE HostCLM03Model;
+class XBT_PRIVATE HostCLM03;
+class XBT_PRIVATE HostCLM03Action;
 
 /*********
  * Model *
@@ -26,19 +31,18 @@ class HostCLM03Action;
 
 class HostCLM03Model : public HostModel {
 public:
-  HostCLM03Model();
-  ~HostCLM03Model();
-  Host *createHost(const char *name);
-  double shareResources(double now);
+  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);
+  void updateActionsState(double now, double delta) override;
 
   Action *executeParallelTask(int host_nb,
-                                        void **host_list,
-                                        double *flops_amount,
-                                        double *bytes_amount,
-                                        double rate);
- Action *communicate(Host *src, Host *dst, double size, double rate);
+                              sg_host_t *host_list,
+							  double *flops_amount,
+							  double *bytes_amount,
+							  double rate) override;
 };
 
 /************
@@ -48,20 +52,16 @@ public:
 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;
 
-  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();
+  virtual Action *execute(double size) override;
+  virtual Action *sleep(double duration) override;
+  e_surf_resource_state_t getState() override;
 
-  bool isUsed();
+  bool isUsed() override;
 
   xbt_dynar_t getVms();
-
-  /* common with vm */
-  void getParams(ws_params_t params);
-  void setParams(ws_params_t params);
 };
 
 
@@ -69,6 +69,7 @@ public:
  * Action *
  **********/
 
-
+}
+}
 
 #endif /* SURF_HOST_CLM03_HPP_ */