cosmetics around surf::Resouce::apply_event()

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

diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index 2b28eed..716dc4c 100644 (file)
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -1,11 +1,13 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-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. */
 
  * 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 "network_interface.hpp"

-#include "surf/ns3/ns3_interface.h"
+#include "src/surf/ns3/ns3_interface.h"

 
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_
 
 #ifndef NETWORK_NS3_HPP_
 #define NETWORK_NS3_HPP_


@@ -13,65 +15,64 @@
 /***********
  * Classes *
  ***********/
 /***********
  * Classes *
  ***********/

-class NetworkNS3Model;
-typedef NetworkNS3Model *NetworkNS3ModelPtr;

 
 

-class NetworkNS3Link;
-typedef NetworkNS3Link *NetworkNS3LinkPtr;
+namespace simgrid {
+namespace surf {
+
+class XBT_PRIVATE NetworkNS3Model;
+class XBT_PRIVATE NetworkNS3Action;

 
 

-class NetworkNS3Action;
-typedef NetworkNS3Action *NetworkNS3ActionPtr;
+}
+}

 
 /*********
  * Tools *
  *********/
 
 
 /*********
  * Tools *
  *********/
 

-void net_define_callbacks(void);
+XBT_PRIVATE void net_define_callbacks(void);

 
 /*********
  * Model *
  *********/
 
 
 /*********
  * Model *
  *********/
 

+namespace simgrid {
+namespace surf {
+

 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
 
   ~NetworkNS3Model();
 class NetworkNS3Model : public NetworkModel {
 public:
   NetworkNS3Model();
 
   ~NetworkNS3Model();

-  NetworkLinkPtr createResource(const char *name,
-                                        double bw_initial,
-                                        tmgr_trace_t bw_trace,
-                                        double lat_initial,
-                                        tmgr_trace_t lat_trace,
-                                        e_surf_resource_state_t state_initial,
-                                        tmgr_trace_t state_trace,
-                                        e_surf_link_sharing_policy_t policy,
-                                        xbt_dict_t properties);
-  xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst);
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-                                          double size, double rate);
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
+  Link* createLink(const char *name,
+                                     double bw_initial,
+                                     tmgr_trace_t bw_trace,
+                                     double lat_initial,
+                                     tmgr_trace_t lat_trace,
+                                     int initiallyOn,
+                                     tmgr_trace_t state_trace,
+                                     e_surf_link_sharing_policy_t policy,
+                                     xbt_dict_t properties);
+  xbt_dynar_t getRoute(NetCard *src, NetCard *dst);
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate);
+  double next_occuring_event(double now) override;
+  bool next_occuring_event_isIdempotent() {return false;}
+  void updateActionsState(double now, double delta) override;

 };
 
 /************
  * Resource *
  ************/
 };
 
 /************
  * Resource *
  ************/

-class NetworkNS3Link : public NetworkLink {
+class NetworkNS3Link : public Link {

 public:
 public:

-  NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
-                        double bw_initial, double lat_initial);
+  NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
+               double bw_initial, double lat_initial);

   ~NetworkNS3Link();
 
   ~NetworkNS3Link();
 

-  void updateState(tmgr_trace_event_t event_type, double value, double date);
-  double getLatency(){THROW_UNIMPLEMENTED;}
-  double getBandwidth(){THROW_UNIMPLEMENTED;}
-  void updateBandwidth(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;}
-  void updateLatency(double value, double date=surf_get_clock()){THROW_UNIMPLEMENTED;}
+  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;}

 
 //private:
 
 //private:

- char *p_id;
- char *p_lat;
- char *p_bdw;

  int m_created;
 };
 
  int m_created;
 };
 


@@ -80,7 +81,7 @@ public:
  **********/
 class NetworkNS3Action : public NetworkAction {
 public:
  **********/
 class NetworkNS3Action : public NetworkAction {
 public:

-  NetworkNS3Action(ModelPtr model, double cost, bool failed);
+  NetworkNS3Action(Model *model, double cost, bool failed);

 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   int getLatencyLimited();
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   int getLatencyLimited();


@@ -92,12 +93,12 @@ void suspend();
 void resume();
 
 //private:
 void resume();
 
 //private:

-#ifdef HAVE_TRACING

   double m_lastSent;
   double m_lastSent;

-  RoutingEdgePtr p_srcElm;
-  RoutingEdgePtr p_dstElm;
-#endif //HAVE_TRACING
+  NetCard *p_srcElm;
+  NetCard *p_dstElm;

 };
 
 };
 

+}
+}

 
 #endif /* NETWORK_NS3_HPP_ */
 
 #endif /* NETWORK_NS3_HPP_ */