← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/server.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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server.h
42
42
class Screen;
43
43
class ScreenHardware;
44
44
class UnityScreenService;
 
45
class DBusConnectionThread;
45
46
class Clock;
46
47
 
47
48
class Server : private mir::Server
64
65
    virtual std::shared_ptr<mir::input::EventFilter> the_screen_event_handler();
65
66
    virtual std::shared_ptr<ScreenHardware> the_screen_hardware();
66
67
    virtual std::shared_ptr<UnityScreenService> the_unity_screen_service();
 
68
    virtual std::shared_ptr<DBusConnectionThread> the_dbus_connection_thread();
67
69
    virtual std::shared_ptr<Clock> the_clock();
68
70
 
69
71
    bool show_version()
160
162
    mir::CachedPtr<Screen> screen;
161
163
    mir::CachedPtr<mir::input::EventFilter> screen_event_handler;
162
164
    mir::CachedPtr<ScreenHardware> screen_hardware;
 
165
    mir::CachedPtr<DBusConnectionThread> dbus_thread;
163
166
    mir::CachedPtr<UnityScreenService> unity_screen_service;
164
167
    mir::CachedPtr<Clock> clock;
165
168
};