move all network models to the kernel::resource namespace

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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 61e36a5..c2219d9 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. 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. */
@@ -12,25 +11,27 @@
 #include "network_interface.hpp"
 
 namespace simgrid {
-  namespace surf {
-
-    /***********
-     * Classes *
-     ***********/
-
-    class XBT_PRIVATE NetworkConstantModel;
-    class XBT_PRIVATE NetworkConstantAction;
-
-    /*********
-     * Model *
-     *********/
-    class NetworkConstantModel : public NetworkModel {
-    public:
-      Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) override;
-      double nextOccuringEvent(double now) override;
-      void updateActionsState(double now, double delta) override;
-
-      LinkImpl* createLink(const char* name, double bw, double lat, e_surf_link_sharing_policy_t policy) override;
+namespace kernel {
+namespace resource {
+
+/***********
+ * Classes *
+ ***********/
+
+class XBT_PRIVATE NetworkConstantModel;
+class XBT_PRIVATE NetworkConstantAction;
+
+/*********
+ * Model *
+ *********/
+class NetworkConstantModel : public NetworkModel {
+public:
+  NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::Full) {}
+  Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) override;
+  double next_occuring_event(double now) override;
+  void update_actions_state(double now, double delta) override;
+
+  LinkImpl* createLink(const std::string& name, double bw, double lat, e_surf_link_sharing_policy_t policy) override;
     };
 
     /**********
@@ -41,9 +42,11 @@ namespace simgrid {
       NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
       ~NetworkConstantAction();
       double initialLatency_;
+      void update_remains_lazy(double now) override;
     };
 
   }
 }
+} // namespace simgrid
 
 #endif /* NETWORK_CONSTANT_HPP_ */