@ -29,7 +29,7 @@
# include "py/pairheap.h" # include "py/pairheap.h"
# include "py/mphal.h" # include "py/mphal.h"
# if MICROPY_PY_U ASYNCIO # if MICROPY_PY_ASYNCIO
// Used when task cannot be guaranteed to be non-NULL.
// Used when task cannot be guaranteed to be non-NULL.
# define TASK_PAIRHEAP(task) ((task) ? &(task)->pairheap : NULL) # define TASK_PAIRHEAP(task) ((task) ? &(task)->pairheap : NULL)
@ -155,8 +155,8 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
/******************************************************************************/ /******************************************************************************/
// Task class
// Task class
// This is the core u asyncio context with cur_task, _task_queue and CancelledError.
// This is the core asyncio context with cur_task, _task_queue and CancelledError.
STATIC mp_obj_t u asyncio_context= MP_OBJ_NULL ; STATIC mp_obj_t asyncio_context = MP_OBJ_NULL ;
STATIC mp_obj_t task_make_new ( const mp_obj_type_t * type , size_t n_args , size_t n_kw , const mp_obj_t * args ) { STATIC mp_obj_t task_make_new ( const mp_obj_type_t * type , size_t n_args , size_t n_kw , const mp_obj_t * args ) {
mp_arg_check_num ( n_args , n_kw , 1 , 2 , false ) ; mp_arg_check_num ( n_args , n_kw , 1 , 2 , false ) ;
@ -168,7 +168,7 @@ STATIC mp_obj_t task_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
self - > state = TASK_STATE_RUNNING_NOT_WAITED_ON ; self - > state = TASK_STATE_RUNNING_NOT_WAITED_ON ;
self - > ph_key = MP_OBJ_NEW_SMALL_INT ( 0 ) ; self - > ph_key = MP_OBJ_NEW_SMALL_INT ( 0 ) ;
if ( n_args = = 2 ) { if ( n_args = = 2 ) {
u asyncio_context= args [ 1 ] ; asyncio_context = args [ 1 ] ;
} }
return MP_OBJ_FROM_PTR ( self ) ; return MP_OBJ_FROM_PTR ( self ) ;
} }
@ -186,7 +186,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
return mp_const_false ; return mp_const_false ;
} }
// Can't cancel self (not supported yet).
// Can't cancel self (not supported yet).
mp_obj_t cur_task = mp_obj_dict_get ( u asyncio_context, MP_OBJ_NEW_QSTR ( MP_QSTR_cur_task ) ) ; mp_obj_t cur_task = mp_obj_dict_get ( asyncio_context , MP_OBJ_NEW_QSTR ( MP_QSTR_cur_task ) ) ;
if ( self_in = = cur_task ) { if ( self_in = = cur_task ) {
mp_raise_msg ( & mp_type_RuntimeError , MP_ERROR_TEXT ( " can't cancel self " ) ) ; mp_raise_msg ( & mp_type_RuntimeError , MP_ERROR_TEXT ( " can't cancel self " ) ) ;
} }
@ -195,7 +195,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
self = MP_OBJ_TO_PTR ( self - > data ) ; self = MP_OBJ_TO_PTR ( self - > data ) ;
} }
mp_obj_t _task_queue = mp_obj_dict_get ( u asyncio_context, MP_OBJ_NEW_QSTR ( MP_QSTR__task_queue ) ) ; mp_obj_t _task_queue = mp_obj_dict_get ( asyncio_context , MP_OBJ_NEW_QSTR ( MP_QSTR__task_queue ) ) ;
// Reschedule Task as a cancelled task.
// Reschedule Task as a cancelled task.
mp_obj_t dest [ 3 ] ; mp_obj_t dest [ 3 ] ;
@ -218,7 +218,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
task_queue_push ( 2 , dest ) ; task_queue_push ( 2 , dest ) ;
} }
self - > data = mp_obj_dict_get ( u asyncio_context, MP_OBJ_NEW_QSTR ( MP_QSTR_CancelledError ) ) ; self - > data = mp_obj_dict_get ( asyncio_context , MP_OBJ_NEW_QSTR ( MP_QSTR_CancelledError ) ) ;
return mp_const_true ; return mp_const_true ;
} }
@ -278,7 +278,7 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
nlr_raise ( self - > data ) ; nlr_raise ( self - > data ) ;
} else { } else {
// Put calling task on waiting queue.
// Put calling task on waiting queue.
mp_obj_t cur_task = mp_obj_dict_get ( u asyncio_context, MP_OBJ_NEW_QSTR ( MP_QSTR_cur_task ) ) ; mp_obj_t cur_task = mp_obj_dict_get ( asyncio_context , MP_OBJ_NEW_QSTR ( MP_QSTR_cur_task ) ) ;
mp_obj_t args [ 2 ] = { self - > state , cur_task } ; mp_obj_t args [ 2 ] = { self - > state , cur_task } ;
task_queue_push ( 2 , args ) ; task_queue_push ( 2 , args ) ;
// Set calling task's data to this task that it waits on, to double-link it.
// Set calling task's data to this task that it waits on, to double-link it.
@ -302,20 +302,20 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
) ; ) ;
/******************************************************************************/ /******************************************************************************/
// C-level u asyncio module
// C-level asyncio module
STATIC const mp_rom_map_elem_t mp_module_u asyncio_globals_table [ ] = { STATIC const mp_rom_map_elem_t mp_module_asyncio_globals_table [ ] = {
{ MP_ROM_QSTR ( MP_QSTR___name__ ) , MP_ROM_QSTR ( MP_QSTR__u asyncio ) } , { MP_ROM_QSTR ( MP_QSTR___name__ ) , MP_ROM_QSTR ( MP_QSTR__asyncio ) } ,
{ MP_ROM_QSTR ( MP_QSTR_TaskQueue ) , MP_ROM_PTR ( & task_queue_type ) } , { MP_ROM_QSTR ( MP_QSTR_TaskQueue ) , MP_ROM_PTR ( & task_queue_type ) } ,
{ MP_ROM_QSTR ( MP_QSTR_Task ) , MP_ROM_PTR ( & task_type ) } , { MP_ROM_QSTR ( MP_QSTR_Task ) , MP_ROM_PTR ( & task_type ) } ,
} ; } ;
STATIC MP_DEFINE_CONST_DICT ( mp_module_u asyncio_globals , mp_module_u asyncio_globals_table ) ; STATIC MP_DEFINE_CONST_DICT ( mp_module_asyncio_globals , mp_module_asyncio_globals_table ) ;
const mp_obj_module_t mp_module_u asyncio = { const mp_obj_module_t mp_module_asyncio = {
. base = { & mp_type_module } , . base = { & mp_type_module } ,
. globals = ( mp_obj_dict_t * ) & mp_module_u asyncio_globals , . globals = ( mp_obj_dict_t * ) & mp_module_asyncio_globals ,
} ; } ;
MP_REGISTER_MODULE ( MP_QSTR__u asyncio , mp_module_u asyncio ) ; MP_REGISTER_MODULE ( MP_QSTR__asyncio , mp_module_asyncio ) ;
# endif // MICROPY_PY_U ASYNCIO
# endif // MICROPY_PY_ASYNCIO
Jim Mussared
1 year ago
Damien George