move the vanilla def of executeParallelTask in HostModel

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

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index 3bbd4fa..74bff01 100644 (file)
--- 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,10 @@
  * Classes *
  ***********/
 
-class HostCLM03Model;
-class HostCLM03;
-class HostCLM03Action;
+namespace simgrid {
+namespace surf {
+
+class XBT_PRIVATE HostCLM03Model;
 
 /*********
  * Model *
@@ -28,42 +31,11 @@ class HostCLM03Model : public HostModel {
 public:
   HostCLM03Model(): HostModel(){}
   ~HostCLM03Model() {}
-  Host *createHost(const char *name);
-  double shareResources(double now);
+  double shareResources(double now) override;
 
-  void updateActionsState(double now, double delta);
-
-  Action *executeParallelTask(int host_nb,
-                              sg_host_t *host_list,
-                                                         double *flops_amount,
-                                                         double *bytes_amount,
-                                                         double rate);
+  void updateActionsState(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_ */