From 7852017abaa6039543e34693a5c05fedf578ea62 Mon Sep 17 00:00:00 2001 From: Babicaa Date: Wed, 3 Apr 2019 16:06:26 +0200 Subject: [PATCH] Remove unused WriterManager parameters --- lib/src/WriterManager.cpp | 23 +++++------------------ lib/src/WriterManager.hpp | 3 +-- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/src/WriterManager.cpp b/lib/src/WriterManager.cpp index 2af508d..03858e7 100644 --- a/lib/src/WriterManager.cpp +++ b/lib/src/WriterManager.cpp @@ -50,7 +50,7 @@ void writer_utils::create_destination_folder(const string& output_file) WriterManager::WriterManager(const unordered_map& parameters_type): parameters_type(parameters_type), logs(10), - writing_flag(false), killed_flag(false), + writing_flag(false), running_flag(true), n_frames_to_receive(0), n_frames_to_write(0) { #ifdef DEBUG_OUTPUT @@ -73,27 +73,14 @@ void WriterManager::stop() running_flag = false; } -void WriterManager::kill() -{ - #ifdef DEBUG_OUTPUT - using namespace date; - cout << "[" << std::chrono::system_clock::now() << "]"; - cout << "[WriterManager::kills] Killing writer manager." << endl; - #endif - - killed_flag = true; - - stop(); -} - string WriterManager::get_status() { if (writing_flag) { - return "writing" - } else if (receiving_flag) { - return "receiving" - } else { + return "writing"; + } else if (running_flag) { return "ready"; + } else { + return "Error.. I guess. This shouldn't be possible? Are you sure you are using it correctly?"; } } diff --git a/lib/src/WriterManager.hpp b/lib/src/WriterManager.hpp index 8905009..6151af3 100644 --- a/lib/src/WriterManager.hpp +++ b/lib/src/WriterManager.hpp @@ -33,7 +33,7 @@ class WriterManager const std::deque logs; std::atomic writing_flag; - std::atomic killed_flag; + std::atomic running_flag; std::atomic n_frames_to_receive; std::atomic n_frames_to_write; @@ -44,7 +44,6 @@ class WriterManager void start(const std::unordered_map& new_parameters); void stop(); - void kill(); std::string get_status(); std::unordered_map get_statistics() const;