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
Improving the performance of the NS-3 bindings by:
[simgrid.git]
/
src
/
s4u
/
s4u_Engine.cpp
diff --git
a/src/s4u/s4u_Engine.cpp
b/src/s4u/s4u_Engine.cpp
index
141c981
..
64cb7f6
100644
(file)
--- a/
src/s4u/s4u_Engine.cpp
+++ b/
src/s4u/s4u_Engine.cpp
@@
-89,7
+89,7
@@
void Engine::load_platform(const std::string& platf)
double start = xbt_os_time();
try {
parse_platform_file(platf);
double start = xbt_os_time();
try {
parse_platform_file(platf);
- } catch (
xbt_ex
& e) {
+ } catch (
const Exception
& e) {
xbt_die("Error while loading %s: %s", platf.c_str(), e.what());
}
xbt_die("Error while loading %s: %s", platf.c_str(), e.what());
}
@@
-340,12
+340,6
@@
kernel::routing::NetPoint* Engine::netpoint_by_name_or_null(const std::string& n
return netp == pimpl->netpoints_.end() ? nullptr : netp->second;
}
return netp == pimpl->netpoints_.end() ? nullptr : netp->second;
}
-/** @brief Fill the provided vector with all existing netpoints */
-void Engine::getNetpointList(std::vector<kernel::routing::NetPoint*>* list)
-{
- for (auto const& kv : pimpl->netpoints_)
- list->push_back(kv.second);
-}
std::vector<kernel::routing::NetPoint*> Engine::get_all_netpoints()
{
std::vector<kernel::routing::NetPoint*> res;
std::vector<kernel::routing::NetPoint*> Engine::get_all_netpoints()
{
std::vector<kernel::routing::NetPoint*> res;
@@
-357,7
+351,7
@@
std::vector<kernel::routing::NetPoint*> Engine::get_all_netpoints()
/** @brief Register a new netpoint to the system */
void Engine::netpoint_register(kernel::routing::NetPoint* point)
{
/** @brief Register a new netpoint to the system */
void Engine::netpoint_register(kernel::routing::NetPoint* point)
{
- // simgrid::
simix
::simcall([&]{ FIXME: this segfaults in set_thread
+ // simgrid::
kernel::actor
::simcall([&]{ FIXME: this segfaults in set_thread
pimpl->netpoints_[point->get_name()] = point;
// });
}
pimpl->netpoints_[point->get_name()] = point;
// });
}
@@
-365,7
+359,7
@@
void Engine::netpoint_register(kernel::routing::NetPoint* point)
/** @brief Unregister a given netpoint */
void Engine::netpoint_unregister(kernel::routing::NetPoint* point)
{
/** @brief Unregister a given netpoint */
void Engine::netpoint_unregister(kernel::routing::NetPoint* point)
{
-
simix
::simcall([this, point] {
+
kernel::actor
::simcall([this, point] {
pimpl->netpoints_.erase(point->get_name());
delete point;
});
pimpl->netpoints_.erase(point->get_name());
delete point;
});