diff options
author | Philip Rauwolf <rauwolf@itestra.de> | 2013-03-20 11:31:26 +0100 |
---|---|---|
committer | Philip Rauwolf <rauwolf@itestra.de> | 2013-03-20 11:31:26 +0100 |
commit | 2dbf1860f4f9a7239019b69101bb6c00f222f88f (patch) | |
tree | 91a9e66d89d5dcd935adefaaaa490a7ae7c40086 | |
parent | 6ed84b245296002c525ee67ed185083064461ad9 (diff) | |
download | genivi-common-api-dbus-runtime-2dbf1860f4f9a7239019b69101bb6c00f222f88f.tar.gz |
Moved two declarations to more sensible place and changed order of
execution in DBusConnection->disconnect.
-rw-r--r-- | src/CommonAPI/DBus/DBusConnection.cpp | 4 | ||||
-rw-r--r-- | src/CommonAPI/DBus/DBusConnection.h | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/CommonAPI/DBus/DBusConnection.cpp b/src/CommonAPI/DBus/DBusConnection.cpp index 3f98c0b..b679507 100644 --- a/src/CommonAPI/DBus/DBusConnection.cpp +++ b/src/CommonAPI/DBus/DBusConnection.cpp @@ -115,6 +115,8 @@ bool DBusConnection::connect(DBusError& dbusError) { void DBusConnection::disconnect() { std::lock_guard<std::mutex> dbusConnectionLock(libdbusConnectionGuard_); if (isConnected()) { + dbusConnectionStatusEvent_.notifyListeners(AvailabilityStatus::NOT_AVAILABLE); + if (!dbusSignalMatchRulesMap_.empty()) { dbus_connection_remove_filter(libdbusConnection_, &onLibdbusSignalFilterThunk, this); } @@ -133,8 +135,6 @@ void DBusConnection::disconnect() { dbus_connection_unref(libdbusConnection_); libdbusConnection_ = NULL; - - dbusConnectionStatusEvent_.notifyListeners(AvailabilityStatus::NOT_AVAILABLE); } } diff --git a/src/CommonAPI/DBus/DBusConnection.h b/src/CommonAPI/DBus/DBusConnection.h index 2f7923f..d8cefdb 100644 --- a/src/CommonAPI/DBus/DBusConnection.h +++ b/src/CommonAPI/DBus/DBusConnection.h @@ -100,6 +100,8 @@ class DBusConnection: public DBusProxyConnection, public std::enable_shared_from private: void dispatch(std::shared_ptr<DBusConnection> selfReference); + void suspendDispatching() const; + void resumeDispatching() const; std::thread dispatchThread_; bool stopDispatching_; @@ -107,9 +109,6 @@ class DBusConnection: public DBusProxyConnection, public std::enable_shared_from mutable bool pauseDispatching_; mutable std::mutex dispatchSuspendLock_; - void suspendDispatching() const; - void resumeDispatching() const; - void addLibdbusSignalMatchRule(const std::string& objectPath, const std::string& interfaceName, const std::string& interfaceMemberName); |