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
No need to switch data segment when process is finished.
[simgrid.git]
/
src
/
surf
/
network_ns3.hpp
diff --git
a/src/surf/network_ns3.hpp
b/src/surf/network_ns3.hpp
index
d7ff3ce
..
7ed353a
100644
(file)
--- a/
src/surf/network_ns3.hpp
+++ b/
src/surf/network_ns3.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
8
. 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. */
@@
-9,7
+9,6
@@
#include "xbt/base.h"
#include "network_interface.hpp"
#include "xbt/base.h"
#include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.h"
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-18,11
+17,11
@@
class NetworkNS3Model : public NetworkModel {
public:
NetworkNS3Model();
~NetworkNS3Model();
public:
NetworkNS3Model();
~NetworkNS3Model();
- LinkImpl* createLink(const
char*
name, double bandwidth, double latency,
+ LinkImpl* createLink(const
std::string&
name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy) override;
e_surf_link_sharing_policy_t policy) override;
- Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
+
kernel::resource::
Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
double nextOccuringEvent(double now) override;
double nextOccuringEvent(double now) override;
- bool nextOccuringEventIsIdempotent()
{return false;
}
+ bool nextOccuringEventIsIdempotent()
override { return false;
}
void updateActionsState(double now, double delta) override;
};
void updateActionsState(double now, double delta) override;
};
@@
-31,7
+30,7
@@
public:
************/
class LinkNS3 : public LinkImpl {
public:
************/
class LinkNS3 : public LinkImpl {
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();
void apply_event(tmgr_trace_event_t event, double value) override;
~LinkNS3();
void apply_event(tmgr_trace_event_t event, double value) override;
@@
-46,9
+45,9
@@
public:
**********/
class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
public:
**********/
class XBT_PRIVATE NetworkNS3Action : public NetworkAction {
public:
- NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
+ NetworkNS3Action(
kernel::resource::
Model* model, double cost, s4u::Host* src, s4u::Host* dst);
- bool isSuspended();
+ bool isSuspended()
override
;
int unref() override;
void suspend() override;
void resume() override;
int unref() override;
void suspend() override;
void resume() override;