This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Fix threadsafety in ThreadedMemoryReactorClock #8497
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Fix a threadsafety bug in unit tests. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,11 @@ | ||
import json | ||
import logging | ||
from collections import deque | ||
from io import SEEK_END, BytesIO | ||
from typing import Callable | ||
|
||
import attr | ||
from typing_extensions import Deque | ||
from zope.interface import implementer | ||
|
||
from twisted.internet import address, threads, udp | ||
|
@@ -251,6 +254,7 @@ def __init__(self): | |
self._tcp_callbacks = {} | ||
self._udp = [] | ||
lookups = self.lookups = {} | ||
self._thread_callbacks = deque() # type: Deque[Callable[[], None]]() | ||
|
||
@implementer(IResolverSimple) | ||
class FakeResolver: | ||
|
@@ -272,10 +276,10 @@ def callFromThread(self, callback, *args, **kwargs): | |
""" | ||
Make the callback fire in the next reactor iteration. | ||
""" | ||
d = Deferred() | ||
d.addCallback(lambda x: callback(*args, **kwargs)) | ||
self.callLater(0, d.callback, True) | ||
return d | ||
cb = lambda: callback(*args, **kwargs) | ||
# it's not safe to call callLater() here, so we append the callback to a | ||
# separate queue. | ||
self._thread_callbacks.append(cb) | ||
|
||
def getThreadPool(self): | ||
return self.threadpool | ||
|
@@ -303,6 +307,30 @@ def connectTCP(self, host, port, factory, timeout=30, bindAddress=None): | |
|
||
return conn | ||
|
||
def advance(self, amount): | ||
# first advance our reactor's time, and run any "callLater" callbacks that | ||
# makes ready | ||
Comment on lines
+311
to
+312
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is indeed easier to understand - though I'm not sure if "makes ready" is a typo. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it's not a typo, though there may be better ways of expressing it. Suppose our fake reactor thinks it is 12:00:00, and we have registered a |
||
super().advance(amount) | ||
|
||
# now run any "callFromThread" callbacks | ||
while True: | ||
try: | ||
callback = self._thread_callbacks.popleft() | ||
except IndexError: | ||
break | ||
callback() | ||
|
||
# check for more "callLater" callbacks added by the thread callback | ||
# This isn't required in a regular reactor, but it ends up meaning that | ||
# our database queries can complete in a single call to `advance` [1] which | ||
# simplifies tests. | ||
# | ||
# [1]: we replace the threadbool backing the db connection pool with a | ||
richvdh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# mock ThreadPool which doesn't really use threads; but still use | ||
richvdh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# reactor.callFromThread to feed results back from the db functions to the | ||
# main thread. | ||
super().advance(0) | ||
|
||
|
||
class ThreadPool: | ||
""" | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you using a deque simply for the performance benefits of
popleft
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm using it because I don't think a
list
is threadsafe.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doing some research it looks to be threadsafe in CPython, however using a deque is likely a safer bet.