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: remove stats setting

Browse source
This commit is contained in:
Steffen Vogel 2019-02-11 16:32:39 +01:00
parent 13316b7c2e
commit d3f3c127d1
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/villas/super_node.hpp
View file

@ -43,7 +43,6 @@ protected:
int priority; /**< Process priority (lower is better) */
int affinity; /**< Process affinity of the server and all created threads */
int hugepages; /**< Number of hugepages to reserve. */
double stats; /**< Interval for path statistics. Set to 0 to disable them. */
Logger logger;

32
lib/super_node.cpp
View file

@ -52,7 +52,6 @@ SuperNode::SuperNode() :
priority(0),
affinity(0),
hugepages(DEFAULT_NR_HUGEPAGES),
stats(0),
#ifdef WITH_API
api(this),
#ifdef WITH_WEB
@ -179,7 +178,7 @@ int SuperNode::parseJson(json_t *j)
json_error_t err;
ret = json_unpack_ex(j, &err, 0, "{ s?: o, s?: o, s?: o, s?: o, s?: i, s?: i, s?: i, s?: F, s?: s }",
ret = json_unpack_ex(j, &err, 0, "{ s?: o, s?: o, s?: o, s?: o, s?: i, s?: i, s?: i, s?: s }",
"http", &json_web,
"logging", &json_logging,
"nodes", &json_nodes,
@ -187,7 +186,6 @@ int SuperNode::parseJson(json_t *j)
"hugepages", &hugepages,
"affinity", &affinity,
"priority", &priority,
"stats", &stats,
"name", &nme
);
if (ret)
@ -380,6 +378,8 @@ void SuperNode::startPaths()
void SuperNode::start()
{
int ret;
assert(state == STATE_CHECKED);
memory_init(hugepages);
@ -398,17 +398,11 @@ void SuperNode::start()
startNodes();
startPaths();
#ifdef WITH_HOOKS
int ret;
ret = task_init(&task, 1.0, CLOCK_REALTIME);
if (ret)
throw RuntimeError("Failed to create timer");
if (stats > 0) {
stats_print_header(STATS_FORMAT_HUMAN);
ret = task_init(&task, 1.0 / stats, CLOCK_REALTIME);
if (ret)
throw RuntimeError("Failed to create stats timer");
}
#endif /* WITH_HOOKS */
stats_print_header(STATS_FORMAT_HUMAN);
state = STATE_STARTED;
}
@ -471,15 +465,11 @@ void SuperNode::stopInterfaces()
void SuperNode::stop()
{
#ifdef WITH_HOOKS
int ret;
if (stats > 0) {
ret = task_destroy(&task);
if (ret)
throw RuntimeError("Failed to stop stats timer");
}
#endif /* WITH_HOOKS */
ret = task_destroy(&task);
if (ret)
throw RuntimeError("Failed to stop timer");
stopPaths();
stopNodes();