diff --git a/include/villas/nodes/file.h b/include/villas/nodes/file.h index 00d7df91f..6b5567c5c 100644 --- a/include/villas/nodes/file.h +++ b/include/villas/nodes/file.h @@ -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; diff --git a/lib/nodes/file.c b/lib/nodes/file.c index 4b05ac0c4..682e6669e 100644 --- a/lib/nodes/file.c +++ b/lib/nodes/file.c @@ -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();