~unity-system-compositor-team/unity-system-compositor/ubuntu

« back to all changes in this revision

Viewing changes to src/dbus_connection_thread.cpp

Committer: CI Train Bot
Author(s): CI Train Bot, Kevin DuBois, Alexandros Frantzis
Date: 2016-01-21 17:58:56 UTC
mfrom: (200.45.12 0.3)
Revision ID: ci-train-bot@canonical.com-20160121175856-m9rosowob03a105o

Release 0.3.1

files added:
tests/include/usc/test/mock_input_configuration.h

tests/include/usc/test/mock_screen.h

tests/integration-tests/test_unity_services.cpp

tests/integration-tests/unity_input_dbus_client.cpp

tests/integration-tests/unity_input_dbus_client.h

tests/integration-tests/unity_screen_dbus_client.cpp

tests/integration-tests/unity_screen_dbus_client.h

tests/unit-tests/test_mir_input_configuration.cpp

files modified:
CMakeLists.txt

debian/changelog

spinner/eglspinner.cpp

src/CMakeLists.txt

src/dbus_connection_handle.cpp

src/dbus_connection_handle.h

src/dbus_connection_thread.cpp

src/dbus_connection_thread.h

src/dbus_event_loop.cpp

src/dbus_event_loop.h

src/mir_input_configuration.cpp

src/mir_input_configuration.h

src/powerd_mediator.cpp

src/powerd_mediator.h

src/screen_event_handler.cpp

src/screen_event_handler.h

src/server.cpp

src/server.h

src/system_compositor.cpp

src/system_compositor.h

src/unity_input_service.cpp

src/unity_input_service.h

src/unity_screen_service.cpp

src/unity_screen_service.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/test_dbus_event_loop.cpp

tests/integration-tests/test_powerd_mediator.cpp

tests/integration-tests/test_unity_input_service.cpp

tests/integration-tests/test_unity_screen_service.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/test_screen_event_handler.cpp

Show diffs side-by-side

added added

removed removed

src/dbus_connection_thread.cpp

#include "dbus_connection_thread.h"

#include "dbus_event_loop.h"

#include "thread_name.h"

usc::DBusConnectionThread::DBusConnectionThread(std::string const& address)

: dbus_connection{address.c_str()},

dbus_event_loop{dbus_connection}

usc::DBusConnectionThread::DBusConnectionThread(std::shared_ptr<DBusEventLoop> const& loop) : dbus_event_loop(loop)

{

std::promise<void> event_loop_started;

auto event_loop_started_future = event_loop_started.get_future();

[this,&event_loop_started]

{

usc::set_thread_name("USC/DBus");

dbus_event_loop.run(event_loop_started);

dbus_event_loop->run(event_loop_started);

});

event_loop_started_future.wait();

usc::DBusConnectionThread::~DBusConnectionThread()

{

dbus_event_loop.stop();

dbus_event_loop->stop();

dbus_loop_thread.join();

}

usc::DBusConnectionHandle const& usc::DBusConnectionThread::connection() const

{

return dbus_connection;

}

usc::DBusEventLoop & usc::DBusConnectionThread::loop()

{

return dbus_event_loop;

return *dbus_event_loop;

}

Older »