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
ActorImpl: postpone the on_destroy signal to the destructor
[simgrid.git]
/
src
/
kernel
/
routing
/
FloydZone.cpp
diff --git
a/src/kernel/routing/FloydZone.cpp
b/src/kernel/routing/FloydZone.cpp
index
625a810
..
c7bb065
100644
(file)
--- a/
src/kernel/routing/FloydZone.cpp
+++ b/
src/kernel/routing/FloydZone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
@@
-8,6
+8,7
@@
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "surf/surf.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "surf/surf.hpp"
+#include "xbt/string.hpp"
#include <cfloat>
#include <limits>
#include <cfloat>
#include <limits>
@@
-22,7
+23,7
@@
namespace simgrid {
namespace kernel {
namespace routing {
namespace kernel {
namespace routing {
-FloydZone::FloydZone(NetZoneImpl* father,
std::string
name, resource::NetworkModel* netmodel)
+FloydZone::FloydZone(NetZoneImpl* father,
const std::string&
name, resource::NetworkModel* netmodel)
: RoutedZone(father, name, netmodel)
{
predecessor_table_ = nullptr;
: RoutedZone(father, name, netmodel)
{
predecessor_table_ = nullptr;
@@
-57,7
+58,7
@@
void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
do {
int pred = TO_FLOYD_PRED(src->id(), cur);
if (pred == -1)
do {
int pred = TO_FLOYD_PRED(src->id(), cur);
if (pred == -1)
-
THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname(
));
+
throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname()
));
route_stack.push_back(TO_FLOYD_LINK(pred, cur));
cur = pred;
} while (cur != src->id());
route_stack.push_back(TO_FLOYD_LINK(pred, cur));
cur = pred;
} while (cur != src->id());