Assorted C++11 tidying.

[dcpomatic.git] / src / lib / nanomsg.cc

diff --git a/src/lib/nanomsg.cc b/src/lib/nanomsg.cc
index 57220cd546347d2fa05e718efd54c32a23771641..b66d966afb7cc4bd02ed5b42142b6f7cc736f9fe 100644 (file)
--- a/src/lib/nanomsg.cc
+++ b/src/lib/nanomsg.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,24 @@
 
 */
 
+
 #include "nanomsg.h"
 #include "dcpomatic_log.h"
+#include "exceptions.h"
 #include <nanomsg/nn.h>
 #include <nanomsg/pair.h>
 #include <stdexcept>
 #include <cerrno>
 
+
 using std::string;
 using std::runtime_error;
 using boost::optional;
 
+
 #define NANOMSG_URL "ipc:///tmp/dcpomatic.ipc"
 
+
 Nanomsg::Nanomsg (bool server)
 {
        _socket = nn_socket (AF_SP, NN_PAIR);
@@ -48,23 +53,17 @@ Nanomsg::Nanomsg (bool server)
        }
 }
 
-void
-Nanomsg::blocking_send (string s)
-{
-       int const r = nn_send (_socket, s.c_str(), s.length(), 0);
-       if (r < 0) {
-               throw runtime_error(String::compose("Could not send to nanomsg socket (%1)", errno));
-       } else if (r != int(s.length())) {
-               throw runtime_error("Could not send to nanomsg socket (message too big)");
-       }
-}
 
 bool
-Nanomsg::nonblocking_send (string s)
+Nanomsg::send (string s, int timeout)
 {
-       int const r = nn_send (_socket, s.c_str(), s.length(), NN_DONTWAIT);
+       if (timeout != 0) {
+               nn_setsockopt (_socket, NN_SOL_SOCKET, NN_SNDTIMEO, &timeout, sizeof(int));
+       }
+
+       int const r = nn_send (_socket, s.c_str(), s.length(), timeout ? 0 : NN_DONTWAIT);
        if (r < 0) {
-               if (errno == EAGAIN) {
+               if (errno == ETIMEDOUT || errno == EAGAIN) {
                        return false;
                }
                throw runtime_error(String::compose("Could not send to nanomsg socket (%1)", errno));
@@ -75,30 +74,32 @@ Nanomsg::nonblocking_send (string s)
        return true;
 }
 
+
 optional<string>
 Nanomsg::get_from_pending ()
 {
        if (_pending.empty()) {
-               return optional<string>();
+               return {};
        }
 
-       string const l = _pending.back();
+       auto const l = _pending.back();
        _pending.pop_back();
        return l;
 }
 
+
 void
-Nanomsg::recv_and_parse (bool blocking)
+Nanomsg::recv_and_parse (int flags)
 {
        char* buf = 0;
-       int const received = nn_recv (_socket, &buf, NN_MSG, blocking ? 0 : NN_DONTWAIT);
+       int const received = nn_recv (_socket, &buf, NN_MSG, flags);
        if (received < 0)
        {
-               if (!blocking && errno == EAGAIN) {
+               if (errno == ETIMEDOUT || errno == EAGAIN) {
                        return;
                }
 
-               throw runtime_error ("Could not communicate with subprocess");
+               throw CommunicationFailedError ();
        }
 
        char* p = buf;
@@ -114,32 +115,20 @@ Nanomsg::recv_and_parse (bool blocking)
        nn_freemsg (buf);
 }
 
-string
-Nanomsg::blocking_get ()
-{
-       optional<string> l = get_from_pending ();
-       if (l) {
-               return *l;
-       }
-
-       recv_and_parse (true);
-
-       l = get_from_pending ();
-       if (!l) {
-               throw runtime_error ("Could not communicate with subprocess");
-       }
-
-       return *l;
-}
 
 optional<string>
-Nanomsg::nonblocking_get ()
+Nanomsg::receive (int timeout)
 {
-       optional<string> l = get_from_pending ();
+       if (timeout != 0) {
+               nn_setsockopt (_socket, NN_SOL_SOCKET, NN_RCVTIMEO, &timeout, sizeof(int));
+       }
+
+       auto l = get_from_pending ();
        if (l) {
                return *l;
        }
 
-       recv_and_parse (false);
+       recv_and_parse (timeout ? 0 : NN_DONTWAIT);
+
        return get_from_pending ();
 }