diff options
author | Christian Linke <christian.linke@bmw.de> | 2013-05-07 15:11:21 +0200 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2013-06-03 09:36:22 +0200 |
commit | 09ae1f20a35cd76f73222d8a2674d8884a5e8747 (patch) | |
tree | d81809d6df17544a463282fb7d25e576fd132aaa /AudioManagerDaemon | |
parent | 6e46a5c19b81d44ab4ddefa1f777662f8e231047 (diff) | |
download | audiomanager-09ae1f20a35cd76f73222d8a2674d8884a5e8747.tar.gz |
* fix for bug [52]: Dbus wrapper sometimes does not deliver all messages
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon')
-rw-r--r-- | AudioManagerDaemon/src/CAmDbusWrapper.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/AudioManagerDaemon/src/CAmDbusWrapper.cpp b/AudioManagerDaemon/src/CAmDbusWrapper.cpp index 89c6122..e3955c9 100644 --- a/AudioManagerDaemon/src/CAmDbusWrapper.cpp +++ b/AudioManagerDaemon/src/CAmDbusWrapper.cpp @@ -52,6 +52,7 @@ CAmDbusWrapper::CAmDbusWrapper(CAmSocketHandler* socketHandler, DBusBusType type pDbusFireCallback(this, &CAmDbusWrapper::dbusFireCallback), // pDbusCheckCallback(this, &CAmDbusWrapper::dbusCheckCallback), // pDbusTimerCallback(this, &CAmDbusWrapper::dbusTimerCallback), // + pDbusPrepareCallback(this,&CAmDbusWrapper::dbusPrepareCallback), // mpDbusConnection(0), // mDBusError(), // mListNodes(), // @@ -241,7 +242,7 @@ dbus_bool_t CAmDbusWrapper::addWatchDelegate(DBusWatch * watch, void* userData) } logInfo("DBusWrapper::addWatchDelegate entered new watch, fd=", dbus_watch_get_unix_fd(watch), "event flag=", event); - am_Error_e error = mpSocketHandler->addFDPoll(dbus_watch_get_unix_fd(watch), event, NULL, &pDbusFireCallback, &pDbusCheckCallback, &pDbusDispatchCallback, watch, handle); + am_Error_e error = mpSocketHandler->addFDPoll(dbus_watch_get_unix_fd(watch), event, &pDbusPrepareCallback, &pDbusFireCallback, &pDbusCheckCallback, &pDbusDispatchCallback, watch, handle); //if everything is alright, add the watch and the handle to our map so we know this relationship if (error == E_OK && handle != 0) @@ -423,6 +424,19 @@ void am::CAmDbusWrapper::dbusFireCallback(const pollfd pollfd, const sh_pollHand //logInfo("DBusWrapper::dbusFireCallback was called"); } +void CAmDbusWrapper::dbusPrepareCallback(const sh_pollHandle_t handle, void* userData) +{ + (void) handle; + (void) userData; + dbus_connection_ref(mpDbusConnection); + while (dbus_connection_get_dispatch_status(mpDbusConnection) == DBUS_DISPATCH_DATA_REMAINS) + { + dbus_connection_dispatch(mpDbusConnection); + logInfo("prepare was neccessary!"); + } + dbus_connection_unref(mpDbusConnection); +} + void CAmDbusWrapper::toggleTimeoutDelegate(DBusTimeout *timeout, void* userData) { (void) userData; |