From 1f7c292d863b9a37cbd600c6e7c26a8cb4dedea8 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Wed, 27 May 2020 11:35:08 +0200
Subject: [PATCH] Rename replay zmq sender to BlockZmqSender

---
 sf-replay/include/BlockZmqSender.hpp          | 23 +++++++++++++++++++
 sf-replay/include/ReplayZmqSender.hpp         | 23 -------------------
 ...ReplayZmqSender.cpp => BlockZmqSender.cpp} | 12 +++++-----
 sf-replay/src/main.cpp                        |  4 ++--
 4 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 sf-replay/include/BlockZmqSender.hpp
 delete mode 100644 sf-replay/include/ReplayZmqSender.hpp
 rename sf-replay/src/{ReplayZmqSender.cpp => BlockZmqSender.cpp} (79%)

diff --git a/sf-replay/include/BlockZmqSender.hpp b/sf-replay/include/BlockZmqSender.hpp
new file mode 100644
index 0000000..e4eb813
--- /dev/null
+++ b/sf-replay/include/BlockZmqSender.hpp
@@ -0,0 +1,23 @@
+#ifndef SF_DAQ_BUFFER_BLOCKZMQSENDER_HPP
+#define SF_DAQ_BUFFER_BLOCKZMQSENDER_HPP
+
+#include <string>
+#include <jungfrau.hpp>
+#include <formats.hpp>
+
+class BlockZmqSender {
+
+    void* ctx_;
+    void* socket_;
+
+public:
+    BlockZmqSender(const std::string& ipc_id, const int source_id);
+    virtual ~BlockZmqSender();
+
+    void close();
+
+    void send(const BufferBinaryBlock* block_data);
+};
+
+
+#endif //SF_DAQ_BUFFER_BLOCKZMQSENDER_HPP
diff --git a/sf-replay/include/ReplayZmqSender.hpp b/sf-replay/include/ReplayZmqSender.hpp
deleted file mode 100644
index 5851ad4..0000000
--- a/sf-replay/include/ReplayZmqSender.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef SF_DAQ_BUFFER_REPLAYZMQSENDER_HPP
-#define SF_DAQ_BUFFER_REPLAYZMQSENDER_HPP
-
-#include <string>
-#include <jungfrau.hpp>
-#include <formats.hpp>
-
-class ReplayZmqSender {
-
-    void* ctx_;
-    void* socket_;
-
-public:
-    ReplayZmqSender(const std::string& ipc_id, const int source_id);
-    virtual ~ReplayZmqSender();
-
-    void close();
-
-    void send(const BufferBinaryBlock* block_data);
-};
-
-
-#endif //SF_DAQ_BUFFER_REPLAYZMQSENDER_HPP
diff --git a/sf-replay/src/ReplayZmqSender.cpp b/sf-replay/src/BlockZmqSender.cpp
similarity index 79%
rename from sf-replay/src/ReplayZmqSender.cpp
rename to sf-replay/src/BlockZmqSender.cpp
index f16e028..fc6667f 100644
--- a/sf-replay/src/ReplayZmqSender.cpp
+++ b/sf-replay/src/BlockZmqSender.cpp
@@ -1,4 +1,4 @@
-#include "ReplayZmqSender.hpp"
+#include "BlockZmqSender.hpp"
 
 #include <sstream>
 #include <zmq.h>
@@ -9,7 +9,7 @@ using namespace std;
 using namespace core_buffer;
 
 
-ReplayZmqSender::ReplayZmqSender(const string& ipc_id, const int source_id)
+BlockZmqSender::BlockZmqSender(const string& ipc_id, const int source_id)
 {
     auto ipc_base = REPLAY_STREAM_IPC_URL + ipc_id + "-";
     stringstream ipc_stream;
@@ -31,17 +31,17 @@ ReplayZmqSender::ReplayZmqSender(const string& ipc_id, const int source_id)
         throw runtime_error(zmq_strerror (errno));
 }
 
-ReplayZmqSender::~ReplayZmqSender()
+BlockZmqSender::~BlockZmqSender()
 {
     close();
 }
 
-void ReplayZmqSender::close() {
+void BlockZmqSender::close() {
     zmq_close(socket_);
     zmq_ctx_destroy(ctx_);
 }
 
-void ReplayZmqSender::send(const BufferBinaryBlock* block_data)
+void BlockZmqSender::send(const BufferBinaryBlock* block_data)
 {
     zmq_send(socket_, block_data, sizeof(BufferBinaryBlock), ZMQ_SNDMORE);
-}
\ No newline at end of file
+}
diff --git a/sf-replay/src/main.cpp b/sf-replay/src/main.cpp
index f6242d7..5b96e46 100644
--- a/sf-replay/src/main.cpp
+++ b/sf-replay/src/main.cpp
@@ -4,7 +4,7 @@
 #include "FastQueue.hpp"
 #include "buffer_config.hpp"
 #include "BufferBinaryReader.hpp"
-#include "ReplayZmqSender.hpp"
+#include "BlockZmqSender.hpp"
 
 using namespace std;
 using namespace core_buffer;
@@ -87,7 +87,7 @@ int main (int argc, char *argv[]) {
     uint64_t max_send_us = 0;
     uint64_t n_stats = 0;
 
-    ReplayZmqSender sender(ipc_id, source_id);
+    BlockZmqSender sender(ipc_id, source_id);
 
     uint64_t start_block = start_pulse_id / BUFFER_BLOCK_SIZE;
     uint64_t stop_block = stop_pulse_id / BUFFER_BLOCK_SIZE;