Fix VMM handle leaks in virtual memory paths #2235
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -306,24 +306,26 @@ def is_nested_sequence(obj: object) -> bool: | |
|
|
||
| class Transaction: | ||
| """ | ||
| A context manager for transactional operations with failure and exit callbacks. | ||
|
|
||
| Failure callbacks are executed in LIFO order if the transaction exits without being committed. | ||
| Exit callbacks always run: in LIFO order on rollback or FIFO order during commit. | ||
|
|
||
| Usage: | ||
| with Transaction() as txn: | ||
| txn.on_failure(some_cleanup_function, arg1, arg2) | ||
| txn.on_exit(some_finalize_function, arg1, arg2) | ||
| # ... perform operations ... | ||
| txn.commit() | ||
|
|
||
| Methods: | ||
| on_failure(fn, *args, **kwargs): Register a callback to be called on rollback. | ||
| on_exit(fn, *args, **kwargs): Register a callback to be called on rollback or commit. | ||
| commit(): Disarm failure callbacks and run exit callbacks. | ||
| """ | ||
| def __init__(self) -> None: | ||
| self._stack = ExitStack() | ||
| self._on_exit: list[Callable[[], Any]] = [] | ||
| self._entered = False | ||
|
|
||
| def __enter__(self): | ||
|
|
@@ -334,23 +336,38 @@ class Transaction: | |
| def __exit__(self, exc_type, exc, tb): | ||
| # If exit callbacks remain, they'll run in LIFO order. | ||
| self._entered = False | ||
| self._on_exit.clear() | ||
| return self._stack.__exit__(exc_type, exc, tb) | ||
|
|
||
| def on_failure(self, fn: Callable[..., Any], /, *args: Any, **kwargs: Any) -> None: | ||
| """ | ||
| Register a failure callback (runs if the with-block exits without commit()). | ||
| Values are bound now via partial so late mutations don't bite you. | ||
| """ | ||
| if not self._entered: | ||
| raise RuntimeError("Transaction must be entered before on_failure()") | ||
| self._stack.callback(partial(fn, *args, **kwargs)) | ||
|
|
||
| def on_exit(self, fn: Callable[..., Any], /, *args: Any, **kwargs: Any) -> None: | ||
| """ | ||
| Register an exit callback (runs exactly once, on rollback or during commit()). | ||
| Values are bound now via partial so late mutations don't bite you. | ||
| """ | ||
| if not self._entered: | ||
| raise RuntimeError("Transaction must be entered before on_exit()") | ||
| callback = partial(fn, *args, **kwargs) | ||
| self._stack.callback(callback) | ||
| self._on_exit.append(callback) | ||
|
Comment on lines
+351
to
+360
Member
There was a problem hiding this comment. Non-blocking nit before merge: def _register(self, callback: Callable[[], Any], on_commit: bool) -> None:
if not self._entered:
raise RuntimeError("Transaction must be entered before registering callbacks")
# The ExitStack copy runs on rollback (LIFO, interleaved with the failure
# callbacks); the _on_exit copy runs at commit(). commit() disarms the stack
# before running _on_exit, so exactly one of the two ever fires.
self._stack.callback(callback)
if on_commit:
self._on_exit.append(callback)
def on_failure(self, fn: Callable[..., Any], /, *args: Any, **kwargs: Any) -> None:
"""Register a failure callback (runs if the with-block exits without commit())."""
self._register(partial(fn, *args, **kwargs), on_commit=False)
def on_exit(self, fn: Callable[..., Any], /, *args: Any, **kwargs: Any) -> None:
"""Register an exit callback (runs exactly once, on rollback or during commit())."""
self._register(partial(fn, *args, **kwargs), on_commit=True)Besides the dedup, the comment at the dual-registration site is the important part — a reviewer already tripped on why
Contributor
Author
There was a problem hiding this comment. Thanks, I can fix this in a few hours. @leofang |
||
|
|
||
| def commit(self) -> None: | ||
| """ | ||
| Disarm all failure callbacks, then run exit callbacks in FIFO order. | ||
| """ | ||
| # pop_all() empties this stack so no callbacks are triggered on exit. | ||
| self._stack.pop_all() | ||
| for fn in self._on_exit: | ||
| fn() | ||
| self._on_exit.clear() | ||
|
|
||
|
|
||
| # Track whether we've already warned about fork method | ||
|
|
||
This file contains hidden or 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
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.
Note to myself:
append()is gone but this is not public API.