A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use std::vector for s_lmm_element_t::cnsts.
[simgrid.git]
/
src
/
surf
/
network_ns3.hpp
diff --git
a/src/surf/network_ns3.hpp
b/src/surf/network_ns3.hpp
index
b1162b3
..
fdb5683
100644
(file)
--- a/
src/surf/network_ns3.hpp
+++ b/
src/surf/network_ns3.hpp
@@
-1,16
+1,15
@@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2017. 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. */
/* 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_
#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
-
-#include <xbt/base.h>
+#include "xbt/base.h"
#include "network_interface.hpp"
#include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.h"
+#include "src/surf/ns3/ns3_interface.h
pp
"
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-19,22
+18,23
@@
class NetworkNS3Model : public NetworkModel {
public:
NetworkNS3Model();
~NetworkNS3Model();
public:
NetworkNS3Model();
~NetworkNS3Model();
- Link* createLink(const char* name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy) override;
+ LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
+ e_surf_link_sharing_policy_t policy) override;
Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
double nextOccuringEvent(double now) override;
Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
double nextOccuringEvent(double now) override;
- bool nextOccuringEventIsIdempotent()
{return false;
}
+ bool nextOccuringEventIsIdempotent()
override { return false;
}
void updateActionsState(double now, double delta) override;
};
/************
* Resource *
************/
void updateActionsState(double now, double delta) override;
};
/************
* Resource *
************/
-class LinkNS3 : public Link {
+class LinkNS3 : public Link
Impl
{
public:
public:
- explicit LinkNS3(NetworkNS3Model* model, const
char*
name, double bandwidth, double latency);
+ explicit LinkNS3(NetworkNS3Model* model, const
std::string&
name, double bandwidth, double latency);
~LinkNS3();
~LinkNS3();
- void apply_event(tmgr_trace_
iterator
_t event, double value) override;
+ 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 setBandwidth(double value) override { THROW_UNIMPLEMENTED; }
void setLatency(double value) override { THROW_UNIMPLEMENTED; }
void setBandwidthTrace(tmgr_trace_t trace) override;
@@
-48,12
+48,13
@@
class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
public:
NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
public:
NetworkNS3Action(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;
s4u::Host* src_;
s4u::Host* dst_;
double lastSent_ = 0;
s4u::Host* src_;
s4u::Host* dst_;