From f359bc230b4aa9fd2b6a844a325813e1a47cc674 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 17 Jun 2017 18:54:34 +0200 Subject: [PATCH] file: dont try to read first timestamp if epoch_mode is "original" --- lib/nodes/file.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/nodes/file.c b/lib/nodes/file.c index f04d32751..72ea1703d 100644 --- a/lib/nodes/file.c +++ b/lib/nodes/file.c @@ -262,13 +262,16 @@ int file_start(struct node *n) struct sample s; arewind(f->read.handle); - ret = sample_io_villas_fscan(f->read.handle->file, &s, NULL); - if (ret < 0) - error("Failed to read first timestamp of node %s", node_name(n)); + + if (f->read_epoch_mode != FILE_EPOCH_ORIGINAL) { + ret = sample_io_villas_fscan(f->read.handle->file, &s, NULL); + if (ret < 0) + error("Failed to read first timestamp of node %s", node_name(n)); - f->read_first = s.ts.origin; - f->read_offset = file_calc_read_offset(&f->read_first, &f->read_epoch, f->read_epoch_mode); - arewind(f->read.handle); + f->read_first = s.ts.origin; + f->read_offset = file_calc_read_offset(&f->read_first, &f->read_epoch, f->read_epoch_mode); + arewind(f->read.handle); + } } if (f->write.fmt) { @@ -339,10 +342,7 @@ retry: values = sample_io_villas_fscan(f->read.handle->file, s, &flags); /* Get return 0; } - if (f->read_epoch_mode == EPOCH_ORIGINAL) { - return 1; - } - else { + if (f->read_epoch_mode != FILE_EPOCH_ORIGINAL) { if (!f->read_rate || aftell(f->read.handle) == 0) { s->ts.origin = time_add(&s->ts.origin, &f->read_offset);