nikon/tuned
1
0
Fork 0
Code Activity Actions

Fix race between DBus exporter startup and applying a profile

Browse source 
Previously if the profile was applied before all methods and
signals were exported on DBus, the daemon thread (_thread_code()
in daemon.py) could crash after attempting to emit a signal on DBus
announcing that a profile was applied.

A regular user is unlikely to run into the race in practice, but it
frequently happens when applying an empty profile for testing purposes.

Signed-off-by: Ondřej Lysoněk <olysonek@redhat.com>
This commit is contained in:
Ondřej Lysoněk 2017-09-11 09:27:14 +02:00
parent ab598cd6ef
commit a5d2a6e4d3
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tuned/exports/dbus_exporter.py
View file

@ -133,6 +133,9 @@ class DBusExporter(interfaces.ExporterInterface):
self._construct_dbus_object_class()
self.stop()
bus = dbus.SystemBus()
bus_name = dbus.service.BusName(self._bus_name, bus)
self._bus_object = self._dbus_object_cls(bus, self._object_name, bus_name)
self._thread = threading.Thread(target=self._thread_code)
self._thread.start()
@ -143,10 +146,6 @@ class DBusExporter(interfaces.ExporterInterface):
self._thread = None
def _thread_code(self):
bus = dbus.SystemBus()
bus_name = dbus.service.BusName(self._bus_name, bus)
self._bus_object = self._dbus_object_cls(bus, self._object_name, bus_name)
self._main_loop.run()
del self._bus_object
self._bus_object = None