Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

super_node: interfaces are now managed per super_node

Browse source
This commit is contained in:
Steffen Vogel 2019-01-21 15:44:39 +01:00
parent 3b0cca73e3
commit 4e55971faa
3 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/villas/super_node.h
View file

@ -28,7 +28,9 @@ struct lws;
struct vlist * super_node_get_nodes(struct super_node *sn);
struct vlist * super_node_get_nodes(struct super_node *sn);
struct vlist * super_node_get_paths(struct super_node *sn);
struct vlist * super_node_get_interfaces(struct super_node *sn);
int super_node_get_cli_argc(struct super_node *sn);

5
include/villas/super_node.hpp
View file

@ -49,6 +49,7 @@ protected:
struct vlist nodes;
struct vlist paths;
struct vlist interfaces;
struct vlist plugins;
#ifdef WITH_API
@ -108,6 +109,10 @@ public:
return &paths;
}
struct vlist * getInterfaces() {
return &paths;
}
#ifdef WITH_API
Api * getApi() {
return &api;

47
lib/super_node.cpp
View file

@ -38,6 +38,7 @@
#include <villas/log.hpp>
#include <villas/exceptions.hpp>
#include <villas/kernel/rt.hpp>
#include <villas/kernel/if.h>
using namespace villas;
using namespace villas::node;
@ -58,6 +59,7 @@ SuperNode::SuperNode() :
vlist_init(&nodes);
vlist_init(&paths);
vlist_init(&interfaces);
vlist_init(&plugins);
char hname[128];
@ -347,6 +349,17 @@ int SuperNode::start()
throw RuntimeError("Failed to start node-type: {}", node_type_name(n->_vt));
}
#ifdef WITH_NETEM
logger->info("Starting interfaces");
for (size_t i = 0; i < vlist_length(&interfaces); i++) {
auto *i = (struct interface *) vlist_at(&interfaces, i);
ret = if_start(i);
if (ret)
throw RuntimeError("Failed to initialize network interface: {}", if_name(i));
}
#endif /* WITH_NETEM */
logger->info("Starting nodes");
for (size_t i = 0; i < vlist_length(&nodes); i++) {
auto *n = (struct node *) vlist_at(&nodes, i);
@ -440,6 +453,19 @@ int SuperNode::stop()
}
}
#ifdef WITH_NETEM
logger->info("Stopping interfaces");
for (size_t j = 0; j < vlist_length(&interfaces); j++) {
struct interface *i = (struct interface *) vlist_at(&interfaces, j);
ret = if_stop(i);
if (ret)
throw RuntimeError("Failed to stop interface: {}", if_name(i));
}
vlist_destroy(&interfaces, (dtor_cb_t) if_destroy, false);
#endif /* WITH_NETEM */
#ifdef WITH_API
api.stop();
#endif
@ -466,9 +492,10 @@ SuperNode::~SuperNode()
{
assert(state != STATE_STARTED);
vlist_destroy(&plugins, (dtor_cb_t) plugin_destroy, false);
vlist_destroy(&paths, (dtor_cb_t) path_destroy, true);
vlist_destroy(&nodes, (dtor_cb_t) node_destroy, true);
vlist_destroy(&plugins, (dtor_cb_t) plugin_destroy, false);
vlist_destroy(&paths, (dtor_cb_t) path_destroy, true);
vlist_destroy(&nodes, (dtor_cb_t) node_destroy, true);
vlist_destroy(&interfaces, (dtor_cb_t) if_destroy, true);
if (json)
json_decref(json);
@ -530,6 +557,20 @@ extern "C" {
return ssn->getNodes();
}
struct vlist * super_node_get_paths(struct super_node *sn)
{
SuperNode *ssn = reinterpret_cast<SuperNode *>(sn);
return ssn->getPaths();
}
struct vlist * super_node_get_interfaces(struct super_node *sn)
{
SuperNode *ssn = reinterpret_cast<SuperNode *>(sn);
return ssn->getInterfaces();
}
struct web * super_node_get_web(struct super_node *sn)
{
SuperNode *ssn = reinterpret_cast<SuperNode *>(sn);