summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-05-29 21:44:21 +0200
committerCarl Hetherington <cth@carlh.net>2025-05-29 21:44:21 +0200
commit57593c83a24684a955308bf1453544aedc15780c (patch)
treebe8e8d16c6c8662bce9d5ef37ae84dd781f9920f /src/lib
parent2572a3f7f9aa213b6a4119f0930787334fbbfcd5 (diff)
Tidy up definition of client_sent.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/grok/context.h1
-rw-r--r--src/lib/grok/messenger.cc5
-rw-r--r--src/lib/grok/messenger.h3
3 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index f3dabfb9a..290c3829b 100644
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -151,7 +151,6 @@ public:
};
_messenger = new Messenger(
- clientSentSynch,
grokReceiveReadySynch,
grokToClientMessageBuf,
grokSentSynch,
diff --git a/src/lib/grok/messenger.cc b/src/lib/grok/messenger.cc
index cb05f9c7c..6a973a059 100644
--- a/src/lib/grok/messenger.cc
+++ b/src/lib/grok/messenger.cc
@@ -27,10 +27,10 @@ using namespace grk_plugin;
auto constexpr CLIENT_TO_GROK_MESSAGE = "Global\\client_to_grok_message";
+auto constexpr CLIENT_SENT = "Global\\client_sent";
Messenger::Messenger(
- std::string const& outSent,
std::string const& outReceiveReady,
std::string const& inBuf,
std::string const& inSent,
@@ -41,7 +41,6 @@ Messenger::Messenger(
: _running(true)
, _frames_scheduled(0)
, _frames_compressed(0)
- , _outbound_sent_synch(outSent)
, _outbound_receive_ready_synch(outReceiveReady)
, _inbound_message_buf(inBuf)
, _inbound_sent_synch(inSent)
@@ -183,7 +182,7 @@ Messenger::inbound_thread()
void
Messenger::startThreads()
{
- _outbound_synch = new Synch(_outbound_sent_synch.c_str(), _outbound_receive_ready_synch.c_str());
+ _outbound_synch = new Synch(CLIENT_SENT, _outbound_receive_ready_synch.c_str());
_outbound = std::thread(&Messenger::outbound_thread, this);
_inbound_synch = new Synch(_inbound_sent_synch.c_str(), _inbound_receive_ready_synch.c_str());
diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h
index 600fd14c7..451b8cf3e 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 clientSentSynch = "Global\\client_sent";
static std::string grokReceiveReadySynch = "Global\\grok_receive_ready";
static std::string grokUncompressedBuf = "Global\\grok_uncompressed_buf";
static std::string grokCompressedBuf = "Global\\grok_compressed_buf";
@@ -308,7 +307,6 @@ class Messenger
{
public:
Messenger(
- std::string const& outSent,
std::string const& outReceiveReady,
std::string const& inBuf,
std::string const& inSent,
@@ -417,7 +415,6 @@ private:
std::atomic<uint32_t> _frames_scheduled;
std::atomic<uint32_t> _frames_compressed;
- std::string _outbound_sent_synch;
std::string _outbound_receive_ready_synch;
std::string _inbound_message_buf;