/* 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 *
- ***********/
-
-namespace simgrid {
-namespace surf {
-
-class XBT_PRIVATE NetworkNS3Model;
-class XBT_PRIVATE NetworkNS3Action;
-}
-}
-
-/*********
- * Tools *
- *********/
-
-XBT_PRIVATE void net_define_callbacks(void);
+#include <xbt/base.h>
-/*********
- * Model *
- *********/
+#include "network_interface.hpp"
+#include "src/surf/ns3/ns3_interface.h"
namespace simgrid {
namespace surf {
~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);
- double next_occuring_event(double now) override;
- bool next_occuring_event_isIdempotent() {return false;}
+ Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate);
+ double nextOccuringEvent(double now) override;
+ bool nextOccuringEventIsIdempotent() {return false;}
void updateActionsState(double now, double delta) override;
};
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;
};
/**********
* Action *
**********/
-class NetworkNS3Action : public NetworkAction {
+class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
public:
- NetworkNS3Action(Model *model, double cost, bool failed);
+ NetworkNS3Action(Model *model, double cost, kernel::routing::NetCard *src, kernel::routing::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;
+ kernel::routing::NetCard *src_;
+ kernel::routing::NetCard *dst_;
};
}