From e2cbdb59042f0c92cf9231cb4fad97236ed4d794 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Thu, 4 Jun 2020 09:58:46 +0200 Subject: [PATCH] Tidy up --- sf-stream/include/LiveRecvModule.hpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sf-stream/include/LiveRecvModule.hpp b/sf-stream/include/LiveRecvModule.hpp index be0f8e5..3020573 100644 --- a/sf-stream/include/LiveRecvModule.hpp +++ b/sf-stream/include/LiveRecvModule.hpp @@ -1,10 +1,12 @@ #ifndef SF_DAQ_BUFFER_LIVERECVMODULE_HPP #define SF_DAQ_BUFFER_LIVERECVMODULE_HPP -#include "FastQueue.hpp" -#include -#include "jungfrau.hpp" #include +#include + +#include "FastQueue.hpp" +#include "jungfrau.hpp" +#include "formats.hpp" class LiveRecvModule { @@ -15,6 +17,14 @@ class LiveRecvModule { std::atomic_bool is_receiving_; std::thread receiving_thread_; + void* connect_socket(size_t module_id); + void receive_thread(); + void recv_single_module(void* socket, ModuleFrame* metadata, char* data); + uint64_t align_modules(const std::vector& sockets, + ModuleFrameBuffer *metadata, + char *data); + void stop(); + public: LiveRecvModule( FastQueue& queue, @@ -22,17 +32,7 @@ public: void* ctx, const std::string& ipc_prefix); - virtual ~LiveRecvModule(); - void* connect_socket(size_t module_id); - void recv_single_module(void* socket, ModuleFrame* metadata, char* data); - void receive_thread(); - uint64_t align_modules( - const std::vector& sockets, - ModuleFrameBuffer *metadata, - char *data); - - void stop(); - + ~LiveRecvModule(); };