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
Merge branch 'master' of github.com:simgrid/simgrid into dev_10
[simgrid.git]
/
src
/
kernel
/
routing
/
NetPoint.cpp
diff --git
a/src/kernel/routing/NetPoint.cpp
b/src/kernel/routing/NetPoint.cpp
index
6326cf2
..
77433ff
100644
(file)
--- a/
src/kernel/routing/NetPoint.cpp
+++ b/
src/kernel/routing/NetPoint.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
20
. 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. */
@@
-6,16
+6,20
@@
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
namespace simgrid {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
namespace simgrid {
+
+template class xbt::Extendable<kernel::routing::NetPoint>;
+
namespace kernel {
namespace routing {
namespace kernel {
namespace routing {
-simgrid::xbt::signal<void(NetPoint
*)> NetPoint::onC
reation;
+simgrid::xbt::signal<void(NetPoint
&)> NetPoint::on_c
reation;
-NetPoint::NetPoint(
std::string
name, NetPoint::Type componentType, NetZoneImpl* netzone_p)
+NetPoint::NetPoint(
const std::string&
name, NetPoint::Type componentType, NetZoneImpl* netzone_p)
: name_(name), component_type_(componentType), englobing_zone_(netzone_p)
{
if (netzone_p != nullptr)
: name_(name), component_type_(componentType), englobing_zone_(netzone_p)
{
if (netzone_p != nullptr)
@@
-23,7
+27,7
@@
NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl*
else
id_ = static_cast<decltype(id_)>(-1);
simgrid::s4u::Engine::get_instance()->netpoint_register(this);
else
id_ = static_cast<decltype(id_)>(-1);
simgrid::s4u::Engine::get_instance()->netpoint_register(this);
- simgrid::kernel::routing::NetPoint::on
Creation(
this);
+ simgrid::kernel::routing::NetPoint::on
_creation(*
this);
}
}
}
}
}
}