Demodularize socket stuff.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5535 a436a847-0d15-0410-975c-d299462d15a1

4 files changed, 220 insertions, 0 deletions

diff --git a/ingen/EngineBase.hpp b/ingen/EngineBase.hpp
index ea0dfc11..ec6cee89 100644
--- a/ingen/EngineBase.hpp
+++ b/ingen/EngineBase.hpp
@@ -55,6 +55,11 @@ public:
 	virtual void deactivate() = 0;
 
 	/**
+	   Begin listening on network sockets.
+	*/
+	virtual void listen() = 0;
+
+	/**
 	   Return true iff events are waiting to be processed.
 	*/
 	virtual bool pending_events() = 0;
diff --git a/ingen/SocketReader.hpp b/ingen/SocketReader.hpp
new file mode 100644
index 00000000..12b3e88b
--- /dev/null
+++ b/ingen/SocketReader.hpp
@@ -0,0 +1,71 @@
+/*
+  This file is part of Ingen.
+  Copyright 2007-2015 David Robillard <http://drobilla.net/>
+
+  Ingen is free software: you can redistribute it and/or modify it under the
+  terms of the GNU Affero General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or any later version.
+
+  Ingen 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 Affero General Public License for details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef INGEN_SOCKET_READER_HPP
+#define INGEN_SOCKET_READER_HPP
+
+#include <thread>
+
+#include "raul/Socket.hpp"
+#include "sord/sord.h"
+
+namespace Ingen {
+
+class Interface;
+class World;
+
+/** Calls Interface methods based on Turtle messages received via socket. */
+class SocketReader
+{
+public:
+	SocketReader(World&             world,
+	             Interface&         iface,
+	             SPtr<Raul::Socket> sock);
+
+	~SocketReader();
+
+private:
+	void run();
+
+	static SerdStatus set_base_uri(SocketReader*   iface,
+	                               const SerdNode* uri_node);
+
+	static SerdStatus set_prefix(SocketReader*   iface,
+	                             const SerdNode* name,
+	                             const SerdNode* uri_node);
+
+	static SerdStatus write_statement(SocketReader*      iface,
+	                                  SerdStatementFlags flags,
+	                                  const SerdNode*    graph,
+	                                  const SerdNode*    subject,
+	                                  const SerdNode*    predicate,
+	                                  const SerdNode*    object,
+	                                  const SerdNode*    object_datatype,
+	                                  const SerdNode*    object_lang);
+
+	World&             _world;
+	Interface&         _iface;
+	SerdEnv*           _env;
+	SordInserter*      _inserter;
+	SordNode*          _msg_node;
+	SPtr<Raul::Socket> _socket;
+	bool               _exit_flag;
+	std::thread        _thread;
+};
+
+}  // namespace Ingen
+
+#endif  // INGEN_SOCKET_READER_HPP
diff --git a/ingen/SocketWriter.hpp b/ingen/SocketWriter.hpp
new file mode 100644
index 00000000..d8858dd0
--- /dev/null
+++ b/ingen/SocketWriter.hpp
@@ -0,0 +1,65 @@
+/*
+  This file is part of Ingen.
+  Copyright 2012-2015 David Robillard <http://drobilla.net/>
+
+  Ingen is free software: you can redistribute it and/or modify it under the
+  terms of the GNU Affero General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or any later version.
+
+  Ingen 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 Affero General Public License for details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef INGEN_SOCKET_WRITER_HPP
+#define INGEN_SOCKET_WRITER_HPP
+
+#include <stdint.h>
+
+#include "ingen/AtomSink.hpp"
+#include "ingen/AtomWriter.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/types.hpp"
+#include "ingen/types.hpp"
+#include "raul/Socket.hpp"
+#include "raul/URI.hpp"
+#include "sratom/sratom.h"
+
+namespace Ingen {
+
+/** An Interface that writes Turtle messages to a socket.
+ */
+class SocketWriter : public AtomWriter, public AtomSink
+{
+public:
+	SocketWriter(URIMap&            map,
+	             URIs&              uris,
+	             const Raul::URI&   uri,
+	             SPtr<Raul::Socket> sock);
+
+	~SocketWriter();
+
+	bool write(const LV2_Atom* msg);
+
+	void bundle_end();
+
+	int       fd()        { return _socket->fd(); }
+	Raul::URI uri() const { return _uri; }
+
+protected:
+	URIMap&            _map;
+	Sratom*            _sratom;
+	SerdNode           _base;
+	SerdURI            _base_uri;
+	SerdEnv*           _env;
+	SerdWriter*        _writer;
+	Raul::URI          _uri;
+	SPtr<Raul::Socket> _socket;
+};
+
+}  // namespace Ingen
+
+#endif  // INGEN_SOCKET_WRITER_HPP
diff --git a/ingen/client/SocketClient.hpp b/ingen/client/SocketClient.hpp
new file mode 100644
index 00000000..2b10adf0
--- /dev/null
+++ b/ingen/client/SocketClient.hpp
@@ -0,0 +1,79 @@
+/*
+  This file is part of Ingen.
+  Copyright 2012-2015 David Robillard <http://drobilla.net/>
+
+  Ingen is free software: you can redistribute it and/or modify it under the
+  terms of the GNU Affero General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or any later version.
+
+  Ingen 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 Affero General Public License for details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef INGEN_CLIENT_SOCKET_CLIENT_HPP
+#define INGEN_CLIENT_SOCKET_CLIENT_HPP
+
+#include "ingen/SocketReader.hpp"
+#include "ingen/SocketWriter.hpp"
+
+namespace Ingen {
+namespace Client {
+
+/** The client side of an Ingen socket connection. */
+class SocketClient : public SocketWriter
+{
+public:
+	SocketClient(World&             world,
+	             const Raul::URI&   uri,
+	             SPtr<Raul::Socket> sock,
+	             SPtr<Interface>    respondee)
+		: SocketWriter(world.uri_map(), world.uris(), uri, sock)
+		, _respondee(respondee)
+		, _reader(world, *respondee.get(), sock)
+	{}
+
+	virtual SPtr<Interface> respondee() const {
+		return _respondee;
+	}
+
+	virtual void set_respondee(SPtr<Interface> respondee) {
+		_respondee = respondee;
+	}
+
+	static SPtr<Ingen::Interface>
+	new_socket_interface(Ingen::World*          world,
+	                     const Raul::URI&       uri,
+	                     SPtr<Ingen::Interface> respondee)
+	{
+		const Raul::Socket::Type type = (uri.scheme() == "unix"
+		                                 ? Raul::Socket::Type::UNIX
+		                                 : Raul::Socket::Type::TCP);
+
+		SPtr<Raul::Socket> sock(new Raul::Socket(type));
+		if (!sock->connect(uri)) {
+			world->log().error(fmt("Failed to connect <%1%> (%2%)\n")
+			                   % sock->uri() % strerror(errno));
+			return SPtr<Interface>();
+		}
+		SocketClient* client = new SocketClient(*world, uri, sock, respondee);
+		return SPtr<Interface>(client);
+	}
+
+	static void register_factories(World* world) {
+		world->add_interface_factory("unix", &new_socket_interface);
+		world->add_interface_factory("tcp", &new_socket_interface);
+	}
+	
+private:
+	SPtr<Interface> _respondee;
+	SocketReader    _reader;
+};
+
+}  // namespace Client
+}  // namespace Ingen
+
+#endif  // INGEN_CLIENT_SOCKET_CLIENT_HPP