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

tests: fix api-stress

Browse source
This commit is contained in:
Steffen Vogel 2019-02-12 15:07:50 +01:00
parent a756b41cdc
commit ca817a6907
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/loopback.json
View file

@ -1,4 +1,6 @@
{
"idle_stop" : false,
"http" : {
"port" : 8080
},

2
include/villas/super_node.hpp
View file

@ -40,6 +40,8 @@ class SuperNode {
protected:
enum state state;
int idleStop;
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. */

10
lib/super_node.cpp
View file

@ -49,6 +49,7 @@ using namespace villas::node;
SuperNode::SuperNode() :
state(STATE_INITIALIZED),
idleStop(false),
priority(0),
affinity(0),
hugepages(DEFAULT_NR_HUGEPAGES),
@ -178,7 +179,9 @@ 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?: s }",
idleStop = true;
ret = json_unpack_ex(j, &err, 0, "{ s?: o, s?: o, s?: o, s?: o, s?: i, s?: i, s?: i, s?: s, s?: b }",
"http", &json_web,
"logging", &json_logging,
"nodes", &json_nodes,
@ -186,7 +189,8 @@ int SuperNode::parseJson(json_t *j)
"hugepages", &hugepages,
"affinity", &affinity,
"priority", &priority,
"name", &nme
"name", &nme,
"idle_stop", &idleStop
);
if (ret)
throw JsonError(err, "Failed to parse global configuration");
@ -560,7 +564,7 @@ int SuperNode::periodic()
#endif /* WITH_HOOKS */
}
if (state == STATE_STARTED && started == 0) {
if (idleStop && state == STATE_STARTED && started == 0) {
info("No more active paths. Stopping super-node");
return -1;