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
Move collective algorithms to separate folders
[simgrid.git]
/
src
/
s4u
/
s4u_engine.cpp
diff --git
a/src/s4u/s4u_engine.cpp
b/src/s4u/s4u_engine.cpp
index
c98ab30
..
bcb1820
100644
(file)
--- a/
src/s4u/s4u_engine.cpp
+++ b/
src/s4u/s4u_engine.cpp
@@
-14,10
+14,8
@@
#include "simgrid/s4u/storage.hpp"
#include "simgrid/simix.h"
#include "src/kernel/EngineImpl.hpp"
#include "simgrid/s4u/storage.hpp"
#include "simgrid/simix.h"
#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
-#include "src/kernel/routing/NetCard.hpp"
-
-
#include "src/surf/network_interface.hpp"
#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON
#include "src/surf/network_interface.hpp"
#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON
@@
-25,6
+23,9
@@
XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
+xbt::signal<void()> onPlatformCreated;
+xbt::signal<void()> onSimulationEnd;
+xbt::signal<void(double)> onTimeAdvance;
Engine *Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
Engine *Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
@@
-96,13
+97,11
@@
static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* n
if(!strcmp(current->name(), name))
return current;
if(!strcmp(current->name(), name))
return current;
- xbt_dict_cursor_t cursor = nullptr;
- char *key;
- NetZone_t elem;
- xbt_dict_foreach(current->children(), cursor, key, elem) {
+ for (auto elem : *(current->children())) {
simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
- if (tmp != nullptr )
- return tmp;
+ if (tmp != nullptr) {
+ return tmp;
+ }
}
return nullptr;
}
}
return nullptr;
}
@@
-113,31
+112,32
@@
NetZone* Engine::netzoneByNameOrNull(const char* name)
return netzoneByNameRecursive(netRoot(), name);
}
return netzoneByNameRecursive(netRoot(), name);
}
-/** @brief Retrieve the net
card
of the given name (or nullptr if not found) */
-simgrid::kernel::routing::Net
Card* Engine::netcard
ByNameOrNull(const char* name)
+/** @brief Retrieve the net
point
of the given name (or nullptr if not found) */
+simgrid::kernel::routing::Net
Point* Engine::netpoint
ByNameOrNull(const char* name)
{
{
- if (pimpl->net
cards_.find(name) == pimpl->netcard
s_.end())
+ if (pimpl->net
points_.find(name) == pimpl->netpoint
s_.end())
return nullptr;
return nullptr;
- return pimpl->net
card
s_.at(name);
+ return pimpl->net
point
s_.at(name);
}
}
-/** @brief Fill the provided vector with all existing net
card
s */
-void Engine::net
cardList(std::vector<simgrid::kernel::routing::NetCard
*>* list)
+/** @brief Fill the provided vector with all existing net
point
s */
+void Engine::net
pointList(std::vector<simgrid::kernel::routing::NetPoint
*>* list)
{
{
- for (auto kv
: pimpl->netcard
s_)
+ for (auto kv
: pimpl->netpoint
s_)
list->push_back(kv.second);
}
list->push_back(kv.second);
}
-/** @brief Register a new net
card
to the system */
-void Engine::net
cardRegister(simgrid::kernel::routing::NetCard* card
)
+/** @brief Register a new net
point
to the system */
+void Engine::net
pointRegister(simgrid::kernel::routing::NetPoint* point
)
{
// simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread
{
// simgrid::simix::kernelImmediate([&]{ FIXME: this segfaults in set_thread
-
pimpl->netcards_[card->name()] = card
;
+
pimpl->netpoints_[point->name()] = point
;
// });
}
// });
}
-/** @brief Unregister a given net
card
*/
-void Engine::net
cardUnregister(simgrid::kernel::routing::NetCard* card
)
+/** @brief Unregister a given net
point
*/
+void Engine::net
pointUnregister(simgrid::kernel::routing::NetPoint* point
)
{
{
- simgrid::simix::kernelImmediate([&]{
- pimpl->netcards_.erase(card->name());
+ simgrid::simix::kernelImmediate([this, point] {
+ pimpl->netpoints_.erase(point->name());
+ delete point;
});
}
}
});
}
}