Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backend] Fixes #193, add --controller-limit N #194

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions ds4drv/__main__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys
import signal

from threading import Thread
from threading import Thread, Event

from .actions import ActionRegistry
from .backends import BluetoothBackend, HidrawBackend
Expand All @@ -12,14 +12,15 @@


class DS4Controller(object):
def __init__(self, index, options, dynamic=False):
def __init__(self, index, options, dynamic=False, disconnect_device_event=None):
self.index = index
self.dynamic = dynamic
self.logger = Daemon.logger.new_module("controller {0}".format(index))

self.error = None
self.device = None
self.loop = EventLoop()
self.disconnect_device_event = disconnect_device_event

self.actions = [cls(self) for cls in ActionRegistry.actions]
self.bindings = options.parent.bindings
Expand Down Expand Up @@ -87,6 +88,12 @@ def cleanup_device(self):
self.device.close()
self.device = None

# Tell main thread one device was disconnected, maybe he can now connect another controller
if self.disconnect_device_event:
self.logger.debug("Telling main thread a device was disconnected")
self.disconnect_device_event.set()
self.disconnect_device_event.clear()

if self.dynamic:
self.loop.stop()

Expand Down Expand Up @@ -122,8 +129,9 @@ def exit(self, *args, **kwargs):
self.logger.info(*args)


def create_controller_thread(index, controller_options, dynamic=False):
controller = DS4Controller(index, controller_options, dynamic=dynamic)
def create_controller_thread(index, controller_options, dynamic=False, disconnect_device_event=None):
controller = DS4Controller(index, controller_options, dynamic=dynamic,
disconnect_device_event=disconnect_device_event)

thread = Thread(target=controller.run)
thread.controller = controller
Expand Down Expand Up @@ -165,6 +173,11 @@ def main():
else:
backend = BluetoothBackend(Daemon.logger)

disconnect_device_event = None # By default, no event needed if we don't limit number of simultaneous devices
# We want to limit the number of simultaneous connected controllers
if options.controller_limit and options.controller_limit > 0:
disconnect_device_event = Event() # This event is used to tell the main loop that one device is disconnected

try:
backend.setup()
except BackendError as err:
Expand All @@ -174,7 +187,7 @@ def main():
Daemon.fork(options.daemon_log, options.daemon_pid)

for index, controller_options in enumerate(options.controllers):
thread = create_controller_thread(index + 1, controller_options)
thread = create_controller_thread(index + 1, controller_options, disconnect_device_event=disconnect_device_event)
threads.append(thread)

for device in backend.devices:
Expand All @@ -201,10 +214,16 @@ def main():
else:
thread = create_controller_thread(len(threads) + 1,
options.default_controller,
dynamic=True)
dynamic=True,
disconnect_device_event=disconnect_device_event)
threads.append(thread)

thread.controller.setup_device(device)
connected_devices.append(device)

if options.controller_limit and len(connected_devices) >= options.controller_limit:
# We have reached the defined controller limit, we now need to wait until a device is disconnected
disconnect_device_event.wait()

if __name__ == "__main__":
main()
5 changes: 5 additions & 0 deletions ds4drv/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ def add_arguments(self, actions):
"Bluetooth devices does currently not support "
"any LED functionality")

backendopt.add_argument("--controller-limit", metavar="MAX_NUMBER_OF_CONTROLLERS",
action="store",
type=int,
help="Maximum number of simultaneous connected controllers, default is unlimited.")

daemonopt = parser.add_argument_group("daemon options")
daemonopt.add_argument("--daemon", action="store_true",
help="Run in the background as a daemon")
Expand Down