summaryrefslogtreecommitdiffstats
path: root/src/ManagementServer.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-01 13:24:56 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-04-01 13:24:56 +0200
commitee0db2ebbc3e0e9d6a50e8ab3fd108d903afed2a (patch)
treec8b983b5a60ccdd77bb3ba6c2337cd74dba85391 /src/ManagementServer.h
parent8a855958f7be056220f1ce2c32b8090871528f23 (diff)
downloaddabmux-ee0db2ebbc3e0e9d6a50e8ab3fd108d903afed2a.tar.gz
dabmux-ee0db2ebbc3e0e9d6a50e8ab3fd108d903afed2a.tar.bz2
dabmux-ee0db2ebbc3e0e9d6a50e8ab3fd108d903afed2a.zip
Remove incomplete setptree ManagementServer command
Diffstat (limited to 'src/ManagementServer.h')
-rw-r--r--src/ManagementServer.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/ManagementServer.h b/src/ManagementServer.h
index 836dee4..2b9b7b4 100644
--- a/src/ManagementServer.h
+++ b/src/ManagementServer.h
@@ -2,7 +2,7 @@
Copyright (C) 2009 Her Majesty the Queen in Right of Canada (Communications
Research Center Canada)
- Copyright (C) 2014, 2015
+ Copyright (C) 2016
Matthias P. Braendli, matthias.braendli@mpb.li
http://www.opendigitalradio.org
@@ -318,14 +318,12 @@ class ManagementServer
m_zmq_context(),
m_zmq_sock(m_zmq_context, ZMQ_REP),
m_running(false),
- m_fault(false),
- m_pending(false) { }
+ m_fault(false) { }
~ManagementServer()
{
m_running = false;
m_fault = false;
- m_pending = false;
// TODO notify
m_thread.join();
@@ -343,9 +341,6 @@ class ManagementServer
void registerInput(InputStat* is);
void unregisterInput(std::string id);
- /* Ask if there is a configuration request pending */
- bool request_pending() { return m_pending; }
-
/* Load a ptree given by the management server.
*
* Returns true if the ptree was updated
@@ -372,7 +367,6 @@ class ManagementServer
void serverThread(void);
void handle_message(zmq::message_t& zmq_message);
- bool handle_setptree(zmq::message_t& zmq_message, std::stringstream& answer);
bool isInputRegistered(std::string& id);
@@ -410,11 +404,7 @@ class ManagementServer
mutable boost::mutex m_statsmutex;
/******** Configuration Data *******/
- bool m_pending;
- bool m_retrieve_pending;
- boost::condition_variable m_condition;
mutable boost::mutex m_configmutex;
-
boost::property_tree::ptree m_pt;
};