diff options
author | Hunt, Preston <preston.hunt@intel.com> | 2018-09-24 15:46:41 +0000 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2019-02-26 11:05:50 +0200 |
commit | 7199478d8029f90f70655987f453fb9bc032a693 (patch) | |
tree | 49f2cef3e586bec019725abf3e3c18dccbdab643 | |
parent | b60b3328aa27ced43a6fe68d770d2b943a073a2d (diff) | |
download | bluez-7199478d8029f90f70655987f453fb9bc032a693.tar.gz |
test/example-advertisement: add shutdown code
The previous sample code did not release all resources when shutting
down. This is fine when it's a standalone program since Python will free
all resources automatically when the process terminates. However, in a
long-running process, this will eventually cause problems.
This changeset shows how to properly release all resources, if an optional
command line "--timeout" argument is used. The default is no timeout to
maintain behavior of the previous implementation (advertisements will run
forever).
-rwxr-xr-x | test/example-advertisement | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/test/example-advertisement b/test/example-advertisement index fd84eacf8..88a27ab34 100755 --- a/test/example-advertisement +++ b/test/example-advertisement @@ -2,19 +2,18 @@ from __future__ import print_function +import argparse import dbus import dbus.exceptions import dbus.mainloop.glib import dbus.service - -import array +import time +import threading try: - from gi.repository import GObject # python3 + from gi.repository import GObject # python3 except ImportError: - import gobject as GObject # python2 - -from random import randint + import gobject as GObject # python2 mainloop = None @@ -136,6 +135,7 @@ class Advertisement(dbus.service.Object): def Release(self): print('%s: Released!' % self.path) + class TestAdvertisement(Advertisement): def __init__(self, bus, index): @@ -170,7 +170,13 @@ def find_adapter(bus): return None -def main(): +def shutdown(timeout): + print('Advertising for {} seconds...'.format(timeout)) + time.sleep(timeout) + mainloop.quit() + + +def main(timeout=0): global mainloop dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) @@ -183,7 +189,7 @@ def main(): return adapter_props = dbus.Interface(bus.get_object(BLUEZ_SERVICE_NAME, adapter), - "org.freedesktop.DBus.Properties"); + "org.freedesktop.DBus.Properties") adapter_props.Set("org.bluez.Adapter1", "Powered", dbus.Boolean(1)) @@ -198,7 +204,23 @@ def main(): reply_handler=register_ad_cb, error_handler=register_ad_error_cb) - mainloop.run() + if timeout > 0: + threading.Thread(target=shutdown, args=(timeout,)).start() + else: + print('Advertising forever...') + + mainloop.run() # blocks until mainloop.quit() is called + + ad_manager.UnregisterAdvertisement(test_advertisement) + print('Advertisement unregistered') + dbus.service.Object.remove_from_connection(test_advertisement) + if __name__ == '__main__': - main() + parser = argparse.ArgumentParser() + parser.add_argument('--timeout', default=0, type=int, help="advertise " + + "for this many seconds then stop, 0=run forever " + + "(default: 0)") + args = parser.parse_args() + + main(args.timeout) |