#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
-/***********
- * Classes *
- ***********/
-
-namespace simgrid {
-namespace surf {
-
-class XBT_PRIVATE NetworkNS3Model;
-class XBT_PRIVATE NetworkNS3Action;
-
-}
-}
-
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
-
-/*********
- * Model *
- *********/
-
namespace simgrid {
namespace surf {
-class NetworkNS3Model : public NetworkModel {
+class XBT_PRIVATE NetworkNS3Model : public NetworkModel {
public:
NetworkNS3Model();
-
~NetworkNS3Model();
- Link* createLink(const char *name,
- double bw_initial, tmgr_trace_t bw_trace,
- double lat_initial, tmgr_trace_t lat_trace,
- e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties) override;
+ 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);
double next_occuring_event(double now) override;
bool next_occuring_event_isIdempotent() {return false;}
/************
* Resource *
************/
-class NetworkNS3Link : public Link {
+class LinkNS3 : public Link {
public:
- NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
- double bw_initial, double lat_initial);
- ~NetworkNS3Link();
+ LinkNS3(NetworkNS3Model *model, const char *name, xbt_dict_t props, 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;}
-
-//private:
- int m_created;
+ void setBandwidthTrace(tmgr_trace_t trace) override;
+ void setLatencyTrace(tmgr_trace_t trace) override;
};
/**********
* Action *
**********/
-class NetworkNS3Action : public NetworkAction {
+class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
public:
- NetworkNS3Action(Model *model, double cost, bool failed);
+ NetworkNS3Action(Model *model, double cost, NetCard *src, NetCard *dst);
-bool isSuspended();
-int unref();
-void suspend();
-void resume();
+ bool isSuspended();
+ int unref();
+ void suspend();
+ void resume();
//private:
- double m_lastSent;
- NetCard *p_srcElm;
- NetCard *p_dstElm;
+ double lastSent_ = 0;
+ NetCard *src_;
+ NetCard *dst_;
};
}