Tidy up definition of client_to_grok_message.

3 files changed, 7 insertions, 10 deletions

diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index bfb2c7301..f3dabfb9a 100644
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -151,7 +151,6 @@ public:
 		};
 
 		_messenger = new Messenger(
-			clientToGrokMessageBuf,
 			clientSentSynch,
 			grokReceiveReadySynch,
 			grokToClientMessageBuf,
diff --git a/src/lib/grok/messenger.cc b/src/lib/grok/messenger.cc
index bed5eaac9..e2ba88c1c 100644
--- a/src/lib/grok/messenger.cc
+++ b/src/lib/grok/messenger.cc
@@ -26,8 +26,10 @@
 using namespace grk_plugin;
 
 
+auto constexpr CLIENT_TO_GROK_MESSAGE = "Global\\client_to_grok_message";
+
+
 Messenger::Messenger(
-	std::string const& outBuf,
 	std::string const& outSent,
 	std::string const& outReceiveReady,
 	std::string const& inBuf,
@@ -39,7 +41,6 @@ Messenger::Messenger(
 	: _running(true)
 	, _frames_scheduled(0)
 	, _frames_compressed(0)
-	, _outbound_message_buf(outBuf)
 	, _outbound_sent_synch(outSent)
 	, _outbound_receive_ready_synch(outReceiveReady)
 	, _inbound_message_buf(inBuf)
@@ -52,7 +53,7 @@ Messenger::Messenger(
 	, _num_frames(0)
 {
 	shm_unlink(grokToClientMessageBuf.c_str());
-	shm_unlink(clientToGrokMessageBuf.c_str());
+	shm_unlink(CLIENT_TO_GROK_MESSAGE);
 }
 
 
@@ -131,7 +132,7 @@ Messenger::outbound_thread()
 	int shm_fd = 0;
 	char* send_buffer = nullptr;
 
-	if (!init_shm(_outbound_message_buf.c_str(), messageBufferLen, &shm_fd, &send_buffer)) {
+	if (!init_shm(CLIENT_TO_GROK_MESSAGE, messageBufferLen, &shm_fd, &send_buffer)) {
 		return;
 	}
 
@@ -151,7 +152,7 @@ Messenger::outbound_thread()
 		_outbound_synch->post(SYNCH_SENT);
 	}
 
-	::deinit_shm(_outbound_message_buf.c_str(), messageBufferLen, shm_fd, &send_buffer);
+	::deinit_shm(CLIENT_TO_GROK_MESSAGE, messageBufferLen, shm_fd, &send_buffer);
 }
 
 
@@ -259,7 +260,7 @@ Messenger::launch_grok(
 	}
 
 	shm_unlink(grokToClientMessageBuf.c_str());
-	shm_unlink(clientToGrokMessageBuf.c_str());
+	shm_unlink(CLIENT_TO_GROK_MESSAGE);
 
 	startThreads();
 	char cmd[4096];
diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h
index 178e7bb03..1c7ba91aa 100644
--- a/src/lib/grok/messenger.h
+++ b/src/lib/grok/messenger.h
@@ -36,7 +36,6 @@ namespace grk_plugin {
 static std::string grokToClientMessageBuf = "Global\\grok_to_client_message";
 static std::string grokSentSynch = "Global\\grok_sent";
 static std::string clientReceiveReadySynch = "Global\\client_receive_ready";
-static std::string clientToGrokMessageBuf = "Global\\client_to_grok_message";
 static std::string clientSentSynch = "Global\\client_sent";
 static std::string grokReceiveReadySynch = "Global\\grok_receive_ready";
 static std::string grokUncompressedBuf = "Global\\grok_uncompressed_buf";
@@ -309,7 +308,6 @@ class Messenger
 {
 public:
 	Messenger(
-		std::string const& outBuf,
 		std::string const& outSent,
 		std::string const& outReceiveReady,
 		std::string const& inBuf,
@@ -419,7 +417,6 @@ private:
 	std::atomic<uint32_t> _frames_scheduled;
 	std::atomic<uint32_t> _frames_compressed;
 
-	std::string _outbound_message_buf;
 	std::string _outbound_sent_synch;
 	std::string _outbound_receive_ready_synch;