-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-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. */
+
#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
-
-#include <xbt/base.h>
+#include "xbt/base.h"
#include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.h"
namespace simgrid {
namespace surf {
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(routing::NetCard *src, routing::NetCard *dst, double size, double rate);
- double next_occuring_event(double now) override;
- bool next_occuring_event_isIdempotent() {return false;}
+ LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
+ e_surf_link_sharing_policy_t policy) override;
+ kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+ double nextOccuringEvent(double now) override;
+ bool nextOccuringEventIsIdempotent() override { return false; }
void updateActionsState(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 apply_event(tmgr_trace_event_t event, double value) override;
+ void setBandwidth(double value) override { THROW_UNIMPLEMENTED; }
+ void setLatency(double value) override { THROW_UNIMPLEMENTED; }
void setBandwidthTrace(tmgr_trace_t trace) override;
void setLatencyTrace(tmgr_trace_t trace) override;
};
**********/
class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
public:
- NetworkNS3Action(Model *model, double cost, routing::NetCard *src, routing::NetCard *dst);
+ NetworkNS3Action(kernel::resource::Model* model, double cost, s4u::Host* src, s4u::Host* dst);
- bool isSuspended();
- int unref();
- void suspend();
- void resume();
+ bool isSuspended() override;
+ int unref() override;
+ void suspend() override;
+ void resume() override;
+ std::list<LinkImpl*> links() override;
-//private:
+ // private:
double lastSent_ = 0;
- routing::NetCard *src_;
- routing::NetCard *dst_;
+ s4u::Host* src_;
+ s4u::Host* dst_;
};
}