From 82ab6f73fab060860addb30691d0e926b4723ee2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 7 Feb 2015 01:05:13 +0000 Subject: Demodularize socket stuff. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5535 a436a847-0d15-0410-975c-d299462d15a1 --- ingen/EngineBase.hpp | 5 +++ ingen/SocketReader.hpp | 71 ++++++++++++++++++++++++++++++++++++++ ingen/SocketWriter.hpp | 65 +++++++++++++++++++++++++++++++++++ ingen/client/SocketClient.hpp | 79 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 220 insertions(+) create mode 100644 ingen/SocketReader.hpp create mode 100644 ingen/SocketWriter.hpp create mode 100644 ingen/client/SocketClient.hpp (limited to 'ingen') diff --git a/ingen/EngineBase.hpp b/ingen/EngineBase.hpp index ea0dfc11..ec6cee89 100644 --- a/ingen/EngineBase.hpp +++ b/ingen/EngineBase.hpp @@ -54,6 +54,11 @@ public: */ virtual void deactivate() = 0; + /** + Begin listening on network sockets. + */ + virtual void listen() = 0; + /** Return true iff events are waiting to be processed. */ 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 + + 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 . +*/ + +#ifndef INGEN_SOCKET_READER_HPP +#define INGEN_SOCKET_READER_HPP + +#include + +#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 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 _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 + + 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 . +*/ + +#ifndef INGEN_SOCKET_WRITER_HPP +#define INGEN_SOCKET_WRITER_HPP + +#include + +#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 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 _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 + + 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 . +*/ + +#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 sock, + SPtr respondee) + : SocketWriter(world.uri_map(), world.uris(), uri, sock) + , _respondee(respondee) + , _reader(world, *respondee.get(), sock) + {} + + virtual SPtr respondee() const { + return _respondee; + } + + virtual void set_respondee(SPtr respondee) { + _respondee = respondee; + } + + static SPtr + new_socket_interface(Ingen::World* world, + const Raul::URI& uri, + SPtr respondee) + { + const Raul::Socket::Type type = (uri.scheme() == "unix" + ? Raul::Socket::Type::UNIX + : Raul::Socket::Type::TCP); + + SPtr 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(); + } + SocketClient* client = new SocketClient(*world, uri, sock, respondee); + return SPtr(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 _respondee; + SocketReader _reader; +}; + +} // namespace Client +} // namespace Ingen + +#endif // INGEN_CLIENT_SOCKET_CLIENT_HPP -- cgit v1.2.1