@@ -534,10 +534,11 @@ parse_task_awaited_by(
534534 uintptr_t task_address ,
535535 PyObject * awaited_by
536536) {
537- // Read the entire TaskObj at once
538537 char task_obj [SIZEOF_TASK_OBJ ];
538+ size_t size = unwinder -> async_debug_offsets .asyncio_task_object .task_awaited_by_is_set
539+ + sizeof (char );
539540 if (_Py_RemoteDebug_PagedReadRemoteMemory (& unwinder -> handle , task_address ,
540- ( size_t ) unwinder -> async_debug_offsets . asyncio_task_object . size ,
541+ size ,
541542 task_obj ) < 0 ) {
542543 set_exception_cause (unwinder , PyExc_RuntimeError , "Failed to read task object" );
543544 return -1 ;
@@ -571,7 +572,16 @@ process_single_task_node(
571572 PyObject * result_item = NULL ;
572573 PyObject * coroutine_stack = NULL ;
573574
574- tn = parse_task_name (unwinder , task_addr );
575+ char is_task ;
576+ // task_is_task = 1 => task
577+ // task_is_task = 0 => future
578+ if (read_char (unwinder ,
579+ task_addr + unwinder -> async_debug_offsets .asyncio_task_object .task_is_task ,
580+ & is_task ) < 0 ) {
581+ goto error ;
582+ }
583+ tn = is_task ? parse_task_name (unwinder , task_addr )
584+ : PyUnicode_FromFormat ("Future-%p" , (void * )task_addr );
575585 if (tn == NULL ) {
576586 set_exception_cause (unwinder , PyExc_RuntimeError , "Failed to parse task name in single task node" );
577587 goto error ;
@@ -612,6 +622,7 @@ process_single_task_node(
612622 PyStructSequence_SetItem (result_item , 1 , tn ); // steals ref
613623 PyStructSequence_SetItem (result_item , 2 , coroutine_stack ); // steals ref
614624 PyStructSequence_SetItem (result_item , 3 , current_awaited_by ); // steals ref
625+ PyStructSequence_SetItem (result_item , 4 , PyBool_FromLong (!is_task ));
615626
616627 // References transferred to tuple
617628 task_id = NULL ;
@@ -652,37 +663,68 @@ process_single_task_node(
652663static int
653664process_task_waiters (
654665 RemoteUnwinderObject * unwinder ,
655- PyObject * result
666+ PyObject * result ,
667+ bool futures_only
656668) {
669+ Py_ssize_t initial_count = futures_only ? PyList_GET_SIZE (result ) : 0 ;
670+ PyObject * visited = PySet_New (NULL );
671+ if (visited == NULL ) {
672+ return -1 ;
673+ }
657674 for (Py_ssize_t i = 0 ; i < PyList_GET_SIZE (result ); i ++ ) {
658675 PyObject * task_info = PyList_GET_ITEM (result , i );
676+ if (PySet_Add (visited , PyStructSequence_GET_ITEM (task_info , 0 )) < 0 ) {
677+ goto error ;
678+ }
659679 PyObject * waiters = PyStructSequence_GET_ITEM (task_info , 3 );
660680 for (Py_ssize_t j = 0 ; j < PyList_GET_SIZE (waiters ); j ++ ) {
661- if (PyList_GET_SIZE (result ) >= MAX_TASK_WAITER_WALK_TASKS ) {
662- PyErr_SetString (PyExc_RuntimeError ,
663- "Too many task waiters (possible infinite loop)" );
664- set_exception_cause (unwinder , PyExc_RuntimeError ,
665- "Task waiter walk size limit exceeded" );
666- return -1 ;
667- }
668681 PyObject * waiter = PyList_GET_ITEM (waiters , j );
669- // CoroInfo item 1 holds the waiter task address stored by parse_task().
670682 PyObject * task_id = PyStructSequence_GET_ITEM (waiter , 1 );
683+ int seen = PySet_Contains (visited , task_id );
684+ if (seen > 0 ) {
685+ continue ;
686+ }
687+ if (seen < 0 || PySet_Add (visited , task_id ) < 0 ) {
688+ goto error ;
689+ }
671690 void * task_ptr = PyLong_AsVoidPtr (task_id );
672691 if (task_ptr == NULL && PyErr_Occurred ()) {
673692 set_exception_cause (unwinder , PyExc_RuntimeError ,
674693 "Failed to parse waiter task ID" );
675- return -1 ;
694+ goto error ;
695+ }
696+ if (futures_only ) {
697+ char is_task ;
698+ if (read_char (unwinder ,
699+ (uintptr_t )task_ptr + unwinder -> async_debug_offsets .asyncio_task_object .task_is_task ,
700+ & is_task ) < 0 ) {
701+ goto error ;
702+ }
703+ if (is_task ) {
704+ continue ;
705+ }
706+ }
707+ if (PyList_GET_SIZE (result ) - initial_count >= MAX_TASK_WAITER_WALK_TASKS ) {
708+ PyErr_SetString (PyExc_RuntimeError ,
709+ "Too many task waiters (possible infinite loop)" );
710+ set_exception_cause (unwinder , PyExc_RuntimeError ,
711+ "Task waiter walk size limit exceeded" );
712+ goto error ;
676713 }
677714 if (process_single_task_node (
678715 unwinder , (uintptr_t )task_ptr , NULL , result ) < 0 )
679716 {
680- return -1 ;
717+ goto error ;
681718 }
682719 }
683720 }
684721
722+ Py_DECREF (visited );
685723 return 0 ;
724+
725+ error :
726+ Py_DECREF (visited );
727+ return -1 ;
686728}
687729
688730/* ============================================================================
@@ -927,7 +969,7 @@ append_awaited_by(
927969 return -1 ;
928970 }
929971
930- return 0 ;
972+ return process_task_waiters ( unwinder , task_list , true) ;
931973}
932974
933975/* ============================================================================
@@ -991,7 +1033,7 @@ process_running_task_chain(
9911033 }
9921034
9931035 // Now find all tasks that are waiting for this task and process them
994- if (process_task_waiters (unwinder , result ) < 0 ) {
1036+ if (process_task_waiters (unwinder , result , false ) < 0 ) {
9951037 return -1 ;
9961038 }
9971039
0 commit comments