Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
VILLASnode
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
17
Issues
17
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
2
Merge Requests
2
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ACS
P
Public
VILLASframework
VILLASnode
Commits
45314432
Commit
45314432
authored
Oct 03, 2019
by
Steffen Vogel
🎅🏼
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v0.8.0-fixes' into develop
parents
f8fe4456
287f2497
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
lib/formats/msg.cpp
lib/formats/msg.cpp
+2
-0
lib/hooks/stats.cpp
lib/hooks/stats.cpp
+4
-0
lib/web.cpp
lib/web.cpp
+1
-1
No files found.
lib/formats/msg.cpp
View file @
45314432
...
...
@@ -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
;
...
...
lib/hooks/stats.cpp
View file @
45314432
...
...
@@ -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
;
}
};
...
...
lib/web.cpp
View file @
45314432
...
...
@@ -170,7 +170,7 @@ void Web::worker()
logger
->
info
(
"Started worker"
);
while
(
running
)
{
lws_service
(
context
,
10
0
);
lws_service
(
context
,
10
);
while
(
!
writables
.
empty
())
{
wsi
=
writables
.
pop
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment