Skip to content

Use a single APC and completion routine #14924

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
seanbudd merged 12 commits into from
Jun 2, 2023
Merged

Use a single APC and completion routine #14924

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
39c0df5
Use a single APC and completion routine
May 11, 2023
894fa39
Linting
May 12, 2023
b5f9f42
use proper cast
LeonarddeR May 12, 2023
12e549b
Review actions
LeonarddeR May 15, 2023
813a565
Fixup
LeonarddeR May 15, 2023
f90df1c
Merge remote-tracking branch 'origin/master' into hwIoSingleAPC
LeonarddeR May 19, 2023
41bd560
Import LPOVERLAPPED and OVERLAPPED directly, more documentation about…
LeonarddeR May 19, 2023
a939279
Merge remote-tracking branch 'origin/master' into hwIoSingleAPC
LeonarddeR May 31, 2023
e7a93e2
Readd autoDeleteApcReferences
LeonarddeR May 31, 2023
10ade40
Rename apcsWillBeStronglyReferenced
LeonarddeR Jun 1, 2023
5228a8c
Merge remote-tracking branch 'origin/master' into hwIoSingleAPC
seanbudd Jun 2, 2023
27b655f
update changes
seanbudd Jun 2, 2023
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
Prev Previous commit
Next Next commit
Rename apcsWillBeStronglyReferenced
  • Loading branch information
@LeonarddeR
LeonarddeR committed Jun 1, 2023
commit 10ade40dfe4f838895cf4d7477985cf94d2b0688
6 changes: 3 additions & 3 deletions source/hwIo/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from logHandler import log
import config
import time
from .ioThread import IoThread, apcsWillBeStronglyReferenced
from .ioThread import IoThread, _apcsWillBeStronglyReferenced
import NVDAState


Expand Down Expand Up @@ -95,7 +95,7 @@ def _initialRead(self):
ioThread = self._ioThreadRef()
if not ioThread:
raise RuntimeError("I/O thread is no longer available")
if apcsWillBeStronglyReferenced:
if _apcsWillBeStronglyReferenced:
ioThread.queueAsApc(self._asyncReadBackwardsCompat)
else:
ioThread.queueAsApc(self._asyncRead)
Expand Down Expand Up @@ -178,7 +178,7 @@ def _asyncRead(self, param: Optional[int] = None):
ioThread.queueAsCompletionRoutine(self._ioDone, self._readOl)
)

if apcsWillBeStronglyReferenced:
if _apcsWillBeStronglyReferenced:
def _asyncReadBackwardsCompat(self, param: Optional[int] = None):
"""Backwards compatible wrapper around L{_asyncRead} that calls it without param.
"""
Expand Down
6 changes: 3 additions & 3 deletions source/hwIo/ioThread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
OVERLAPPED
]
]
apcsWillBeStronglyReferenced = version_year < 2024 and NVDAState._allowDeprecatedAPI()
_apcsWillBeStronglyReferenced = version_year < 2024 and NVDAState._allowDeprecatedAPI()
"""
Starting from NVDA 2024.1, we will weakly reference functions that are executed as an APC.
This will ensure that objects from which APCs have been queuedwon't be scattering around
Expand Down Expand Up @@ -147,7 +147,7 @@ def start(self):
super().start()
self.handle = ctypes.windll.kernel32.OpenThread(winKernel.THREAD_SET_CONTEXT, False, self.ident)

if apcsWillBeStronglyReferenced:
if _apcsWillBeStronglyReferenced:
@contextmanager
def autoDeleteApcReference(self, apcUuid):
log.warning(
Expand Down Expand Up @@ -179,7 +179,7 @@ def _registerToCallAsApc(

# generate a number to identify the function in the store.
internalParam = next(self._apcParamCounter)
useWeak = _alwaysReferenceWeakly or not apcsWillBeStronglyReferenced
useWeak = _alwaysReferenceWeakly or not _apcsWillBeStronglyReferenced
reference = None
if useWeak:
# Generate a weak reference to the function
Expand Down