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
Remove features marked with DEPRECATED_v323.
[simgrid.git]
/
include
/
simgrid
/
kernel
/
routing
/
VivaldiZone.hpp
diff --git
a/include/simgrid/kernel/routing/VivaldiZone.hpp
b/include/simgrid/kernel/routing/VivaldiZone.hpp
index
d1bc241
..
38c89db
100644
(file)
--- a/
include/simgrid/kernel/routing/VivaldiZone.hpp
+++ b/
include/simgrid/kernel/routing/VivaldiZone.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
9
. 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. */
@@
-29,7
+29,7
@@
namespace routing {
*
* The resulting value is assumed to be in milliseconds.
*
*
* The resulting value is assumed to be in milliseconds.
*
- * So, to go from a
n host A to an
host B, the following links would be used:
+ * So, to go from a
host A to a
host B, the following links would be used:
* <tt>private(A)_UP, private(B)_DOWN</tt>, with the additional latency computed above.
* The bandwidth of the UP and DOWN links is not symmetric (in contrary to usual SimGrid
* links), but naturally correspond to the values provided when the peer was created.
* <tt>private(A)_UP, private(B)_DOWN</tt>, with the additional latency computed above.
* The bandwidth of the UP and DOWN links is not symmetric (in contrary to usual SimGrid
* links), but naturally correspond to the values provided when the peer was created.
@@
-46,25
+46,17
@@
namespace routing {
class XBT_PRIVATE VivaldiZone : public ClusterZone {
public:
class XBT_PRIVATE VivaldiZone : public ClusterZone {
public:
- explicit VivaldiZone(NetZone
* father, std::string name
);
+ explicit VivaldiZone(NetZone
Impl* father, const std::string& name, resource::NetworkModel* netmodel
);
- void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out,
std::string
coord);
+ void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out,
const std::string&
coord);
void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
-
- // deprecated
- XBT_ATTRIB_DEPRECATED_v323("Please use VivaldiZone::set_peer_link()") void setPeerLink(NetPoint* netpoint,
- double bw_in, double bw_out,
- std::string coord)
- {
- set_peer_link(netpoint, bw_in, bw_out, coord);
- }
};
namespace vivaldi {
class XBT_PRIVATE Coords {
public:
static simgrid::xbt::Extension<NetPoint, Coords> EXTENSION_ID;
};
namespace vivaldi {
class XBT_PRIVATE Coords {
public:
static simgrid::xbt::Extension<NetPoint, Coords> EXTENSION_ID;
- explicit Coords(NetPoint* host,
std::string
str);
+ explicit Coords(NetPoint* host,
const std::string&
str);
virtual ~Coords() = default;
std::vector<double> coords;
virtual ~Coords() = default;
std::vector<double> coords;