Skip to content

ServiceBrowser must recheck for handlers to call when holding condition #477

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.

Sign up for GitHub

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

Merged
bdraco merged 1 commit into from
Jun 6, 2021
Merged

ServiceBrowser must recheck for handlers to call when holding condition #477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 23 additions & 7 deletions zeroconf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,17 +1785,33 @@ def cancel(self) -> None:
super().cancel()
self.join()

def _wait_for_next_event(self) -> None:
"""Wait for the next handler or time to send queries."""
# If there are handlers to call
# we want to process them right away
if self._handlers_to_call:
return

# Wait for the type has the smallest next time
next_time = min(self._next_time.values())
now = current_time_millis()

if next_time <= now:
return

with self.zc.condition:
# We must check again while holding the condition
# in case the other thread has added to _handlers_to_call
# between when we checked above when we were not
# holding the condition
if not self._handlers_to_call:
self.zc.condition.wait(millis_to_seconds(next_time - now))

def run(self) -> None:
"""Run the browser thread."""
super().run()
while True:
if not self._handlers_to_call:
# Wait for the type has the smallest next time
next_time = min(self._next_time.values())
now = current_time_millis()
if next_time > now:
self.zc.wait(next_time - now)

self._wait_for_next_event()
if self.zc.done or self.done:
return

Expand Down