X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcdbc53f2291d5ef450d6ff07ab25c25670c3527..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/network_ns3.hpp

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 9dd44ba99a..632fe81ccc 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,91 +1,65 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2019. 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 "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.h"
-
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
 
-/***********
- * Classes *
- ***********/
+#include "xbt/base.h"
 
-namespace simgrid {
-namespace surf {
-
-class XBT_PRIVATE NetworkNS3Model;
-class XBT_PRIVATE NetworkNS3Action;
-
-}
-}
-
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
-
-/*********
- * Model *
- *********/
+#include "network_interface.hpp"
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
   ~NetworkNS3Model();
-  Link* createLink(const char *name, double bandwidth, double latency,
-      e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
-  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
+  LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+                        s4u::Link::SharingPolicy policy) override;
+  kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
   double next_occuring_event(double now) override;
-  bool next_occuring_event_isIdempotent() {return false;}
-  void updateActionsState(double now, double delta) override;
+  bool next_occuring_event_is_idempotent() override { return false; }
+  void update_actions_state(double now, double delta) override;
 };
 
 /************
  * Resource *
  ************/
-class LinkNS3 : public Link {
+class LinkNS3 : public LinkImpl {
 public:
-  LinkNS3(NetworkNS3Model *model, const char *name, xbt_dict_t props, double bandwidth, double latency);
+  explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency);
   ~LinkNS3();
 
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
-  void updateBandwidth(double value) override {THROW_UNIMPLEMENTED;}
-  void updateLatency(double value) override {THROW_UNIMPLEMENTED;}
-  void setBandwidthTrace(tmgr_trace_t trace) override;
-  void setLatencyTrace(tmgr_trace_t trace) override;
-
-//private:
- int m_created;
+  void apply_event(simgrid::kernel::profile::Event* event, double value) override;
+  void set_bandwidth(double value) override { THROW_UNIMPLEMENTED; }
+  void set_latency(double value) override { THROW_UNIMPLEMENTED; }
+  void set_bandwidth_profile(profile::Profile* profile) override;
+  void set_latency_profile(profile::Profile* profile) override;
 };
 
 /**********
  * Action *
  **********/
-class NetworkNS3Action : public NetworkAction {
+class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
 public:
-  NetworkNS3Action(Model *model, double cost, bool failed);
+  NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst);
 
-bool isSuspended();
-int unref();
-void suspend();
-void resume();
+  void suspend() override;
+  void resume() override;
+  std::list<LinkImpl*> links() override;
+  void update_remains_lazy(double now) override;
 
-//private:
-  double m_lastSent;
-  NetCard *p_srcElm;
-  NetCard *p_dstElm;
+  // private:
+  double last_sent_ = 0;
+  s4u::Host* src_;
+  s4u::Host* dst_;
 };
 
+} // namespace resource
 }
 }