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

format-villas.human: Add NEW_FRAME flag to format

Browse source 
Signed-off-by: Philipp Jungkamp <Philipp.Jungkamp@opal-rt.com>
This commit is contained in:
Philipp Jungkamp 2023-09-14 11:36:03 +02:00 • committed by Steffen Vogel
parent c49e339ad1
commit 54d3f51afb
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/formats/villas_human.cpp
View file

@ -5,9 +5,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <cassert>
#include <cinttypes>
#include <cstring>
#include <openssl/crypto.h>
#include <villas/formats/villas_human.hpp>
#include <villas/sample.hpp>
#include <villas/signal.hpp>
@ -41,6 +43,11 @@ size_t VILLASHumanFormat::sprintLine(char *buf, size_t len,
off += snprintf(buf + off, len - off, "(%" PRIu64 ")", smp->sequence);
}
if (flags & (int)SampleFlags::NEW_FRAME) {
if (smp->flags & (int)SampleFlags::NEW_FRAME)
off += snprintf(buf + off, len - off, "F");
}
if (flags & (int)SampleFlags::HAS_DATA) {
for (unsigned i = 0; i < smp->length; i++) {
auto sig = smp->signals->getByIndex(i);
@ -69,8 +76,8 @@ size_t VILLASHumanFormat::sscanLine(const char *buf, size_t len,
smp->flags = 0;
smp->signals = signals;
/* Format: Seconds.NanoSeconds+Offset(SequenceNumber) Value1 Value2 ...
* RegEx: (\d+(?:\.\d+)?)([-+]\d+(?:\.\d+)?(?:e[+-]?\d+)?)?(?:\((\d+)\))?
/* Format: Seconds.NanoSeconds+Offset(SequenceNumber)Flags Value1 Value2 ...
* RegEx: (\d+(?:\.\d+)?)([-+]\d+(?:\.\d+)?(?:e[+-]?\d+)?)?(?:\((\d+)\))?(F)?
*
* Please note that only the seconds and at least one value are mandatory
*/
@ -117,6 +124,12 @@ size_t VILLASHumanFormat::sscanLine(const char *buf, size_t len,
end++;
}
// Optional: NEW_FRAME flag
if (*end == 'F') {
smp->flags |= (int)SampleFlags::NEW_FRAME;
end++;
}
unsigned i;
for (ptr = end + 1, i = 0; i < smp->capacity; ptr = end + 1, i++) {
if (*end == delimiter)
@ -189,9 +202,9 @@ void VILLASHumanFormat::header(FILE *f, const SignalList::Ptr sigs) {
// Register format
static char n[] = "villas.human";
static char d[] = "VILLAS human readable format";
static LineFormatPlugin<VILLASHumanFormat, n, d,
(int)SampleFlags::HAS_TS_ORIGIN |
(int)SampleFlags::HAS_SEQUENCE |
(int)SampleFlags::HAS_DATA,
'\n'>
static LineFormatPlugin<
VILLASHumanFormat, n, d,
(int)SampleFlags::HAS_TS_ORIGIN | (int)SampleFlags::HAS_SEQUENCE |
(int)SampleFlags::HAS_DATA | (int)SampleFlags::NEW_FRAME,
'\n'>
p;