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
further s/trace/profile/ cleanups
[simgrid.git]
/
src
/
surf
/
network_cm02.cpp
diff --git
a/src/surf/network_cm02.cpp
b/src/surf/network_cm02.cpp
index
a85a3d5
..
f7679d2
100644
(file)
--- a/
src/surf/network_cm02.cpp
+++ b/
src/surf/network_cm02.cpp
@@
-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. */
@@
-218,7
+218,7
@@
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
src->route_to(dst, route, &latency);
XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
src->route_to(dst, route, &latency);
- xbt_assert(not route.empty() || latency,
+ xbt_assert(not route.empty() || latency
> 0
,
"You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
src->get_cname(), dst->get_cname());
"You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
src->get_cname(), dst->get_cname());
@@
-254,7
+254,7
@@
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
action->latency_ *= get_latency_factor(size);
action->rate_ = get_bandwidth_constraint(action->rate_, bandwidth_bound, size);
action->latency_ *= get_latency_factor(size);
action->rate_ = get_bandwidth_constraint(action->rate_, bandwidth_bound, size);
-
in
t constraints_per_variable = route.size();
+
size_
t constraints_per_variable = route.size();
constraints_per_variable += back_route.size();
if (action->latency_ > 0) {
constraints_per_variable += back_route.size();
if (action->latency_ > 0) {
@@
-318,7
+318,7
@@
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam
simgrid::s4u::Link::on_creation(this->piface_);
}
simgrid::s4u::Link::on_creation(this->piface_);
}
-void NetworkCm02Link::apply_event(
tmgr_trace_event_t
triggered, double value)
+void NetworkCm02Link::apply_event(
kernel::profile::Event*
triggered, double value)
{
/* Find out which of my iterators was triggered, and react accordingly */
if (triggered == bandwidth_.event) {
{
/* Find out which of my iterators was triggered, and react accordingly */
if (triggered == bandwidth_.event) {