Compare commits

..

No commits in common. "5c2e9723152a20e0ec8cef808bb295e5e1e61a13" and "ae95e0c83ebba4060625b8698b8239a017c72606" have entirely different histories.

4 changed files with 25 additions and 109 deletions

View File

@ -46,7 +46,6 @@ from dataclasses import (
from functools import partial
import inspect
from pprint import pformat
import textwrap
from typing import (
Any,
AsyncGenerator,
@ -336,7 +335,6 @@ class Context:
extra_fields: dict[str, Any]|None = None,
# ^-TODO-^ some built-in extra state fields
# we'll want in some devx specific cases?
indent: str|None = None,
) -> str:
ds: str = '='
@ -356,6 +354,7 @@ class Context:
show_error_fields=True
)
fmtstr: str = (
f'<Context(\n'
# f'\n'
# f' ---\n'
f' |_ipc: {self.dst_maddr}\n'
@ -402,20 +401,11 @@ class Context:
f' {key}{ds}{val!r}\n'
)
if indent:
fmtstr = textwrap.indent(
fmtstr,
prefix=indent,
)
return (
'<Context(\n'
+
fmtstr
+
f'{indent})>\n'
')>\n'
)
# NOTE: making this return a value that can be passed to
# `eval()` is entirely **optional** dawggg B)
# https://docs.python.org/3/library/functions.html#repr

View File

@ -374,12 +374,11 @@ class ActorNursery:
@acm
async def _open_and_supervise_one_cancels_all_nursery(
actor: Actor,
tb_hide: bool = False,
) -> typing.AsyncGenerator[ActorNursery, None]:
# normally don't need to show user by default
__tracebackhide__: bool = tb_hide
__tracebackhide__: bool = True
outer_err: BaseException|None = None
inner_err: BaseException|None = None

View File

@ -72,10 +72,6 @@ from tractor.to_asyncio import run_trio_task_in_future
from tractor.log import get_logger
from tractor._context import Context
from tractor import _state
from tractor._exceptions import (
InternalError,
NoRuntime,
)
from tractor._state import (
current_actor,
is_root_process,
@ -695,14 +691,6 @@ async def lock_stdio_for_peer(
DebugStatus.unshield_sigint()
class DebugStateError(InternalError):
'''
Something inconsistent or unexpected happend with a sub-actor's
debug mutex request to the root actor.
'''
# TODO: rename to ReplState or somethin?
# DebugRequest, make it a singleton instance?
class DebugStatus:
@ -872,37 +860,20 @@ class DebugStatus:
`trio.to_thread.run_sync()`.
'''
try:
async_lib: str = sniffio.current_async_library()
except sniffio.AsyncLibraryNotFoundError:
async_lib = None
is_main_thread: bool = trio._util.is_main_thread()
# ^TODO, since this is private, @oremanj says
# we should just copy the impl for now..?
if is_main_thread:
thread_name: str = 'main'
else:
thread_name: str = threading.current_thread().name
is_trio_main = (
is_main_thread
# TODO: since this is private, @oremanj says
# we should just copy the impl for now..
(is_main_thread := trio._util.is_main_thread())
and
(async_lib == 'trio')
(async_lib := sniffio.current_async_library()) == 'trio'
)
report: str = f'Running thread: {thread_name!r}\n'
if async_lib:
report += (
if (
not is_trio_main
and is_main_thread
):
log.warning(
f'Current async-lib detected by `sniffio`: {async_lib}\n'
)
else:
report += (
'No async-lib detected (by `sniffio`) ??\n'
)
if not is_trio_main:
log.warning(report)
return is_trio_main
# XXX apparently unreliable..see ^
# (
@ -2644,15 +2615,7 @@ def pause_from_sync(
bg_task: Task = current_task()
# assert repl is repl
# assert bg_task is repl_owner
if bg_task is not repl_owner:
raise DebugStateError(
f'The registered bg task for this debug request is NOT its owner ??\n'
f'bg_task: {bg_task}\n'
f'repl_owner: {repl_owner}\n\n'
f'{DebugStatus.repr()}\n'
)
assert bg_task is repl_owner
# NOTE: normally set inside `_enter_repl_sync()`
DebugStatus.repl_task: str = repl_owner
@ -2752,28 +2715,17 @@ def _post_mortem(
'''
__tracebackhide__: bool = hide_tb
try:
actor: tractor.Actor = current_actor()
actor_repr: str = str(actor.uid)
# ^TODO, instead a nice runtime-info + maddr + uid?
# -[ ] impl a `Actor.__repr()__`??
# |_ <task>:<thread> @ <actor>
except NoRuntime:
actor_repr: str = '<no-actor-runtime?>'
try:
task_repr: Task = current_task()
except RuntimeError:
task_repr: str = '<unknown-Task>'
# TODO: print the actor supervion tree up to the root
# here! Bo
log.pdb(
f'{_crash_msg}\n'
f'x>(\n'
f' |_ {task_repr} @ {actor_repr}\n'
f' |_ {current_task()} @ {actor.uid}\n'
# TODO: make an `Actor.__repr()__`
# f'|_ {current_task()} @ {actor.name}\n'
)
# NOTE only replacing this from `pdbp.xpm()` to add the
@ -3070,15 +3022,11 @@ def open_crash_handler(
if type(err) not in ignore:
# use our re-impl-ed version
try:
_post_mortem(
repl=mk_pdb(),
tb=sys.exc_info()[2],
api_frame=inspect.currentframe().f_back,
)
except bdb.BdbQuit:
__tracebackhide__: bool = False
raise
# XXX NOTE, `pdbp`'s version seems to lose the up-stack
# tb-info?

View File

@ -590,36 +590,15 @@ async def drain_to_final_msg(
# SHOULD NOT raise that far end error,
# 2. WE DID NOT REQUEST that cancel and thus
# SHOULD RAISE HERE!
except trio.Cancelled as _taskc:
taskc: trio.Cancelled = _taskc
# report when the cancellation wasn't (ostensibly) due to
# RPC operation, some surrounding parent cancel-scope.
if not ctx._scope.cancel_called:
task: trio.lowlevel.Task = trio.lowlevel.current_task()
rent_n: trio.Nursery = task.parent_nursery
if (
(local_cs := rent_n.cancel_scope).cancel_called
):
log.cancel(
'RPC-ctx cancelled by local-parent scope during drain!\n\n'
f'c}}>\n'
f' |_{rent_n}\n'
f' |_.cancel_scope = {local_cs}\n'
f' |_>c}}\n'
f' |_{ctx.pformat(indent=" "*9)}'
# ^TODO, some (other) simpler repr here?
)
__tracebackhide__: bool = False
except trio.Cancelled as taskc:
# CASE 2: mask the local cancelled-error(s)
# only when we are sure the remote error is
# the source cause of this local task's
# cancellation.
ctx.maybe_raise(
hide_tb=hide_tb,
from_src_exc=taskc,
# ?TODO? when *should* we use this?
# TODO: when use this?
# from_src_exc=taskc,
)
# CASE 1: we DID request the cancel we simply