~afrantzis/unity-system-compositor/fix-1491566-deadlock

Viewing changes to src/dbus_connection_thread.h

Committer: Tarmac
Author(s): Andreas Pokorny
Date: 2015-09-06 17:45:40 UTC
mfrom: (247.3.4 move-dbus-loop)
Revision ID: tarmac-20150906174540-ute4opt1d85mn6x9

Move DBusConnection DBusEventLoop and the thread creation to a dedicated structure

This should allow handling more than one interface from the same thread.

Approved by PS Jenkins bot, Alan Griffiths.

files added:
src/dbus_connection_thread.cpp

src/dbus_connection_thread.h

files modified:
src/CMakeLists.txt

src/server.cpp

src/server.h

src/unity_screen_service.cpp

src/unity_screen_service.h

tests/integration-tests/test_unity_screen_service.cpp

Show diffs side-by-side

added added

removed removed

src/dbus_connection_thread.h

* This program is free software: you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 3 as

* published by the Free Software Foundation.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU General Public License for more details.

* You should have received a copy of the GNU General Public License

* along with this program. If not, see <http://www.gnu.org/licenses/>.

* Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>

#ifndef USC_DBUS_CONNECTION_THREAD_H_

#define USC_DBUS_CONNECTION_THREAD_H_

#include "dbus_connection_handle.h"

#include "dbus_event_loop.h"

#include <thread>

namespace usc

{

class DBusConnectionThread

{

public:

DBusConnectionThread(std::string const& address);

~DBusConnectionThread();

DBusConnectionHandle const& connection() const;

DBusEventLoop & loop();

private:

DBusConnectionHandle dbus_connection;

DBusEventLoop dbus_event_loop;

std::thread dbus_loop_thread;

};

}

#endif

Older »