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

Merge branch 'v0.8.0-fixes' into develop

Browse source
This commit is contained in:
Steffen Vogel 2019-10-03 11:01:07 +02:00
commit 4531443269
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/formats/msg.cpp
View file

@ -110,6 +110,8 @@ int msg_from_sample(struct msg *msg_in, struct sample *smp, struct vlist *signal
{
msg_in->type = MSG_TYPE_DATA;
msg_in->version = MSG_VERSION;
msg_in->rsvd1 = 0;
msg_in->resv2 = 0;
msg_in->length = (uint16_t) smp->length;
msg_in->sequence = (uint32_t) smp->sequence;
msg_in->ts.sec = smp->ts.origin.tv_sec;

4
lib/hooks/stats.cpp
View file

@ -232,12 +232,16 @@ public:
virtual void prepare()
{
assert(state == State::CHECKED);
stats = std::make_shared<villas::Stats>(buckets, warmup);
/* Register statistic object to path.
*
* This allows the path code to update statistics. */
node->stats = stats;
state = State::PREPARED;
}
};

2
lib/web.cpp
View file

@ -170,7 +170,7 @@ void Web::worker()
logger->info("Started worker");
while (running) {
lws_service(context, 100);
lws_service(context, 10);
while (!writables.empty()) {
wsi = writables.pop();