projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
nanomsg.cc
diff --git
a/src/lib/nanomsg.cc
b/src/lib/nanomsg.cc
index 4cc071370d0f9674e8de56a6b86df0912e06eab1..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.
This file is part of DCP-o-matic.
@@
-18,6
+18,7
@@
*/
*/
+
#include "nanomsg.h"
#include "dcpomatic_log.h"
#include "exceptions.h"
#include "nanomsg.h"
#include "dcpomatic_log.h"
#include "exceptions.h"
@@
-26,12
+27,15
@@
#include <stdexcept>
#include <cerrno>
#include <stdexcept>
#include <cerrno>
+
using std::string;
using std::runtime_error;
using boost::optional;
using std::string;
using std::runtime_error;
using boost::optional;
+
#define NANOMSG_URL "ipc:///tmp/dcpomatic.ipc"
#define NANOMSG_URL "ipc:///tmp/dcpomatic.ipc"
+
Nanomsg::Nanomsg (bool server)
{
_socket = nn_socket (AF_SP, NN_PAIR);
Nanomsg::Nanomsg (bool server)
{
_socket = nn_socket (AF_SP, NN_PAIR);
@@
-49,6
+53,7
@@
Nanomsg::Nanomsg (bool server)
}
}
}
}
+
bool
Nanomsg::send (string s, int timeout)
{
bool
Nanomsg::send (string s, int timeout)
{
@@
-69,18
+74,20
@@
Nanomsg::send (string s, int timeout)
return true;
}
return true;
}
+
optional<string>
Nanomsg::get_from_pending ()
{
if (_pending.empty()) {
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;
}
_pending.pop_back();
return l;
}
+
void
Nanomsg::recv_and_parse (int flags)
{
void
Nanomsg::recv_and_parse (int flags)
{
@@
-108,6
+115,7
@@
Nanomsg::recv_and_parse (int flags)
nn_freemsg (buf);
}
nn_freemsg (buf);
}
+
optional<string>
Nanomsg::receive (int timeout)
{
optional<string>
Nanomsg::receive (int timeout)
{
@@
-115,7
+123,7
@@
Nanomsg::receive (int timeout)
nn_setsockopt (_socket, NN_SOL_SOCKET, NN_RCVTIMEO, &timeout, sizeof(int));
}
nn_setsockopt (_socket, NN_SOL_SOCKET, NN_RCVTIMEO, &timeout, sizeof(int));
}
-
optional<string>
l = get_from_pending ();
+
auto
l = get_from_pending ();
if (l) {
return *l;
}
if (l) {
return *l;
}