Commit 45314432 authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼

Merge branch 'v0.8.0-fixes' into develop

parents f8fe4456 287f2497
...@@ -110,6 +110,8 @@ int msg_from_sample(struct msg *msg_in, struct sample *smp, struct vlist *signal ...@@ -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->type = MSG_TYPE_DATA;
msg_in->version = MSG_VERSION; msg_in->version = MSG_VERSION;
msg_in->rsvd1 = 0;
msg_in->resv2 = 0;
msg_in->length = (uint16_t) smp->length; msg_in->length = (uint16_t) smp->length;
msg_in->sequence = (uint32_t) smp->sequence; msg_in->sequence = (uint32_t) smp->sequence;
msg_in->ts.sec = smp->ts.origin.tv_sec; msg_in->ts.sec = smp->ts.origin.tv_sec;
......
...@@ -232,12 +232,16 @@ public: ...@@ -232,12 +232,16 @@ public:
virtual void prepare() virtual void prepare()
{ {
assert(state == State::CHECKED);
stats = std::make_shared<villas::Stats>(buckets, warmup); stats = std::make_shared<villas::Stats>(buckets, warmup);
/* Register statistic object to path. /* Register statistic object to path.
* *
* This allows the path code to update statistics. */ * This allows the path code to update statistics. */
node->stats = stats; node->stats = stats;
state = State::PREPARED;
} }
}; };
......
...@@ -170,7 +170,7 @@ void Web::worker() ...@@ -170,7 +170,7 @@ void Web::worker()
logger->info("Started worker"); logger->info("Started worker");
while (running) { while (running) {
lws_service(context, 100); lws_service(context, 10);
while (!writables.empty()) { while (!writables.empty()) {
wsi = writables.pop(); wsi = writables.pop();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment