Cleanup: move some methods into synch.cc.

3 files changed, 115 insertions, 64 deletions

diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h
index bd19438f6..1ef3e3ee7 100644
--- a/src/lib/grok/messenger.h
+++ b/src/lib/grok/messenger.h
@@ -17,6 +17,7 @@
     along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
+
 #pragma once
 
 #include "../dcp_video.h"
@@ -194,72 +195,16 @@ enum SynchDirection
 class Synch
 {
 public:
-	Synch(std::string const& sent_sem_name, std::string const& receive_ready_sem_name)
-		: _sent_sem_name(sent_sem_name)
-		, _receive_ready_sem_name(receive_ready_sem_name)
-	{
-		// unlink semaphores in case of previous crash
-		unlink();
-		open();
-	}
+	Synch(std::string const& sent_sem_name, std::string const& receive_ready_sem_name);
+	~Synch();
 
-	~Synch()
-	{
-		close();
-		unlink();
-	}
+	void post(SynchDirection dir);
+	void wait(SynchDirection dir);
 
-	void post(SynchDirection dir)
-	{
-		auto sem = dir == SYNCH_SENT ? _sent_sem : _receive_ready_sem;
-		if (sem_post(sem)) {
-			getMessengerLogger()->error("Error posting to semaphore: %s", strerror(errno));
-		}
-	}
-
-	void wait(SynchDirection dir)
-	{
-		auto sem = dir == SYNCH_SENT ? _sent_sem : _receive_ready_sem;
-		if (sem_wait(sem)) {
-			getMessengerLogger()->error("Error waiting for semaphore: %s", strerror(errno));
-		}
-	}
+	void open();
+	void close();
 
-	void open()
-	{
-		_sent_sem = sem_open(_sent_sem_name.c_str(), O_CREAT, 0666, 0);
-		if (!_sent_sem) {
-			getMessengerLogger()->error("Error opening shared memory: %s", strerror(errno));
-		}
-
-		_receive_ready_sem = sem_open(_receive_ready_sem_name.c_str(), O_CREAT, 0666, 1);
-		if (!_receive_ready_sem) {
-			getMessengerLogger()->error("Error opening shared memory: %s", strerror(errno));
-		}
-	}
-
-	void close()
-	{
-		if (sem_close(_sent_sem)) {
-			getMessengerLogger()->error("Error closing semaphore %s: %s", _sent_sem_name.c_str(), strerror(errno));
-		}
-
-		if (sem_close(_receive_ready_sem)) {
-			getMessengerLogger()->error("Error closing semaphore %s: %s", _receive_ready_sem_name.c_str(), strerror(errno));
-		}
-	}
-
-	void unlink()
-	{
-		int rc = sem_unlink(_sent_sem_name.c_str());
-		if (rc == -1 && errno != ENOENT) {
-			getMessengerLogger()->error("Error unlinking semaphore %s: %s", _sent_sem_name.c_str(), strerror(errno));
-		}
-		rc = sem_unlink(_receive_ready_sem_name.c_str());
-		if (rc == -1 && errno != ENOENT) {
-			getMessengerLogger()->error("Error unlinking semaphore %s: %s", _receive_ready_sem_name.c_str(), strerror(errno));
-		}
-	}
+	void unlink();
 
 private:
 	sem_t* _sent_sem;
diff --git a/src/lib/grok/synch.cc b/src/lib/grok/synch.cc
new file mode 100644
index 000000000..1f86d1078
--- /dev/null
+++ b/src/lib/grok/synch.cc
@@ -0,0 +1,106 @@
+/*
+    Copyright (C) 2023 Grok Image Compression Inc.
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "messenger.h"
+
+
+using namespace grk_plugin;
+
+
+
+Synch::Synch(std::string const& sent_sem_name, std::string const& receive_ready_sem_name)
+	: _sent_sem_name(sent_sem_name)
+	, _receive_ready_sem_name(receive_ready_sem_name)
+{
+	// unlink semaphores in case of previous crash
+	unlink();
+	open();
+}
+
+
+Synch::~Synch()
+{
+	close();
+	unlink();
+}
+
+
+void
+Synch::post(SynchDirection dir)
+{
+	auto sem = dir == SYNCH_SENT ? _sent_sem : _receive_ready_sem;
+	if (sem_post(sem)) {
+		getMessengerLogger()->error("Error posting to semaphore: %s", strerror(errno));
+	}
+}
+
+void
+Synch::wait(SynchDirection dir)
+{
+	auto sem = dir == SYNCH_SENT ? _sent_sem : _receive_ready_sem;
+	if (sem_wait(sem)) {
+		getMessengerLogger()->error("Error waiting for semaphore: %s", strerror(errno));
+	}
+}
+
+
+void
+Synch::open()
+{
+	_sent_sem = sem_open(_sent_sem_name.c_str(), O_CREAT, 0666, 0);
+	if (!_sent_sem) {
+		getMessengerLogger()->error("Error opening shared memory: %s", strerror(errno));
+	}
+
+	_receive_ready_sem = sem_open(_receive_ready_sem_name.c_str(), O_CREAT, 0666, 1);
+	if (!_receive_ready_sem) {
+		getMessengerLogger()->error("Error opening shared memory: %s", strerror(errno));
+	}
+}
+
+
+void
+Synch::close()
+{
+	if (sem_close(_sent_sem)) {
+		getMessengerLogger()->error("Error closing semaphore %s: %s", _sent_sem_name.c_str(), strerror(errno));
+	}
+
+	if (sem_close(_receive_ready_sem)) {
+		getMessengerLogger()->error("Error closing semaphore %s: %s", _receive_ready_sem_name.c_str(), strerror(errno));
+	}
+}
+
+
+void
+Synch::unlink()
+{
+	int rc = sem_unlink(_sent_sem_name.c_str());
+	if (rc == -1 && errno != ENOENT) {
+		getMessengerLogger()->error("Error unlinking semaphore %s: %s", _sent_sem_name.c_str(), strerror(errno));
+	}
+	rc = sem_unlink(_receive_ready_sem_name.c_str());
+	if (rc == -1 && errno != ENOENT) {
+		getMessengerLogger()->error("Error unlinking semaphore %s: %s", _receive_ready_sem_name.c_str(), strerror(errno));
+	}
+}
+
+
diff --git a/src/lib/wscript b/src/lib/wscript
index 6c642cc72..058e79645 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -268,7 +268,7 @@ def build(bld):
             obj.uselib += ' POLKIT'
 
     if bld.env.ENABLE_GROK:
-        obj.source += ' grok_j2k_encoder_thread.cc grok/messenger.cc grok/util.cc'
+        obj.source += ' grok_j2k_encoder_thread.cc grok/messenger.cc grok/synch.cc grok/util.cc'
 
     if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32:
         obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI OLE32 UUID'