From 51259b97016ac1a12939a11a06212ba1724d3e87 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 18 Jun 2019 18:50:24 +0100 Subject: [PATCH] villas-signal: fix initialization order --- src/villas-signal.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/villas-signal.cpp b/src/villas-signal.cpp index 8abce4e7f..ad7a5a83b 100644 --- a/src/villas-signal.cpp +++ b/src/villas-signal.cpp @@ -258,18 +258,10 @@ check: if (optarg == endptr) if (ret) throw RuntimeError("Failed to verify node configuration"); - ret = pool_init(&q, 16, SAMPLE_LENGTH(vlist_length(&n.in.signals)), &memory_heap); - if (ret) - throw RuntimeError("Failed to initialize pool"); - ret = node_prepare(&n); if (ret) throw RuntimeError("Failed to start node {}: reason={}", node_name(&n), ret); - ret = node_start(&n); - if (ret) - throw RuntimeError("Failed to start node {}: reason={}", node_name(&n), ret); - ret = io_init(&io, ft, &n.in.signals, IO_FLUSH | (SAMPLE_HAS_ALL & ~SAMPLE_HAS_OFFSET)); if (ret) throw RuntimeError("Failed to initialize output"); @@ -278,10 +270,18 @@ check: if (optarg == endptr) if (ret) throw RuntimeError("Failed to validate IO configuration"); + ret = pool_init(&q, 16, SAMPLE_LENGTH(vlist_length(&n.in.signals)), &memory_heap); + if (ret) + throw RuntimeError("Failed to initialize pool"); + ret = io_open(&io, nullptr); if (ret) throw RuntimeError("Failed to open output"); + ret = node_start(&n); + if (ret) + throw RuntimeError("Failed to start node {}: reason={}", node_name(&n), ret); + while (!stop && n.state == STATE_STARTED) { t = sample_alloc(&q);