aboutsummaryrefslogtreecommitdiffstats
path: root/src/ManagementServer.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-01-28 16:14:08 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-01-28 16:14:08 +0100
commit000796dc3d909f179fb6586fae7e9ce986440576 (patch)
treea6b08f5866af7d5943052d18b7162ba3ed897d37 /src/ManagementServer.h
parentaf782e67db704d1d58c265fb4e1ff12aa1526596 (diff)
downloaddabmux-000796dc3d909f179fb6586fae7e9ce986440576.tar.gz
dabmux-000796dc3d909f179fb6586fae7e9ce986440576.tar.bz2
dabmux-000796dc3d909f179fb6586fae7e9ce986440576.zip
Avoid uninitialised fields, modernise DabService::nbComponent
Diffstat (limited to 'src/ManagementServer.h')
-rw-r--r--src/ManagementServer.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ManagementServer.h b/src/ManagementServer.h
index 2b9b7b4..aade3d0 100644
--- a/src/ManagementServer.h
+++ b/src/ManagementServer.h
@@ -329,6 +329,9 @@ class ManagementServer
m_thread.join();
}
+ ManagementServer(const ManagementServer& other) = delete;
+ ManagementServer& operator=(const ManagementServer& other) = delete;
+
void open(int listenport)
{
m_listenport = listenport;
@@ -362,15 +365,12 @@ class ManagementServer
zmq::context_t m_zmq_context;
zmq::socket_t m_zmq_sock;
- // no copying (because of the thread)
- ManagementServer(const ManagementServer& other);
-
void serverThread(void);
void handle_message(zmq::message_t& zmq_message);
bool isInputRegistered(std::string& id);
- int m_listenport;
+ int m_listenport = 0;
// serverThread runs in a separate thread
std::atomic<bool> m_running;
@@ -401,10 +401,10 @@ class ManagementServer
std::string getStateJSON();
// mutex for accessing the map
- mutable boost::mutex m_statsmutex;
+ boost::mutex m_statsmutex;
/******** Configuration Data *******/
- mutable boost::mutex m_configmutex;
+ boost::mutex m_configmutex;
boost::property_tree::ptree m_pt;
};