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

file: refactor FILE_EOF_EXIT -> FILE_EOF_STOP

Browse source
This commit is contained in:
Steffen Vogel 2019-02-06 15:09:44 +01:00
parent ac22c393b7
commit 4f6aea8bf2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/villas/nodes/file.h
View file

@ -62,7 +62,7 @@ struct file {
} epoch_mode; /**< Specifies how file::offset is calculated. */
enum {
FILE_EOF_EXIT, /**< Terminate when EOF is reached. */
FILE_EOF_STOP, /**< Terminate when EOF is reached. */
FILE_EOF_REWIND, /**< Rewind the file when EOF is reached. */
FILE_EOF_WAIT /**< Blocking wait when EOF is reached. */
} eof;

12
lib/nodes/file.c
View file

@ -89,7 +89,7 @@ int file_parse(struct node *n, json_t *cfg)
/* Default values */
f->rate = 0;
f->eof = FILE_EOF_EXIT;
f->eof = FILE_EOF_STOP;
f->epoch_mode = FILE_EPOCH_DIRECT;
f->flush = 0;
f->buffer_size_in = 0;
@ -119,8 +119,8 @@ int file_parse(struct node *n, json_t *cfg)
error("Invalid format '%s' for node %s", format, node_name(n));
if (eof) {
if (!strcmp(eof, "exit"))
f->eof = FILE_EOF_EXIT;
if (!strcmp(eof, "exit") || !strcmp(eof, "stop"))
f->eof = FILE_EOF_STOP;
else if (!strcmp(eof, "rewind"))
f->eof = FILE_EOF_REWIND;
else if (!strcmp(eof, "wait"))
@ -166,7 +166,7 @@ char * file_print(struct node *n)
}
switch (f->eof) {
case FILE_EOF_EXIT: eof_str = "exit"; break;
case FILE_EOF_STOP: eof_str = "stop"; break;
case FILE_EOF_WAIT: eof_str = "wait"; break;
case FILE_EOF_REWIND: eof_str = "rewind"; break;
}
@ -369,8 +369,8 @@ retry: ret = io_scan(&f->io, smps, cnt);
goto retry;
case FILE_EOF_EXIT:
info("Reached end-of-file of node %s", node_name(n));
case FILE_EOF_STOP:
info("Reached end-of-file. Stopping node %s", node_name(n));
killme(SIGTERM);
pause();