support corutine mode for event

pikasTech · pikasTech · commit 05719194e9f3 · 2025-06-02T15:06:53.000+08:00
diff --git a/src/PikaObj.c b/src/PikaObj.c
@@ -3183,16 +3183,17 @@ Arg* obj_runMethodArg2(PikaObj* self, Arg* methodArg, Arg* arg1, Arg* arg2) {
 Arg* __eventListener_runEvent(PikaEventListener* listener,
                               uintptr_t eventId,
                               Arg* eventData) {
+    pika_debug("event listener: 0x%p", listener);
     PikaObj* handler = pika_eventListener_getEventHandleObj(listener, eventId);
-    pika_debug("event handler: %p", handler);
+    pika_debug("event handler: 0x%p", handler);
     if (NULL == handler) {
         pika_platform_printf(
             "Error: can not find event handler by id: [0x%02" PRIxPTR "]\r\n",
             eventId);
         return NULL;
     }
     Arg* eventCallBack = obj_getArg(handler, "eventCallBack");
-    pika_debug("run event handler: %p", handler);
+    pika_debug("event data: %p", eventData);
     Arg* res = pika_runFunction1(arg_copy(eventCallBack), arg_copy(eventData));
     return res;
 }
@@ -3230,6 +3231,7 @@ PIKA_RES _do_pika_eventListener_send(PikaEventListener* self,
                                      Arg* eventData,
                                      int eventSignal,
                                      PIKA_BOOL pickupWhenNoVM) {
+    pika_assert(NULL != self);
 #if !PIKA_EVENT_ENABLE
     pika_platform_printf("PIKA_EVENT_ENABLE is not enable");
     while (1) {
@@ -3238,6 +3240,8 @@ PIKA_RES _do_pika_eventListener_send(PikaEventListener* self,
     if (NULL != eventData && !_VM_is_first_lock()) {
 #if PIKA_EVENT_THREAD_ENABLE
         _VM_lock_init();
+#elif PIKA_COROUTINE_ENABLE
+        pika_debug("sending arg event with corutine mode");
 #else
         pika_platform_printf(
             "Error: can not send arg event data without thread support\r\n");
@@ -3252,52 +3256,58 @@ PIKA_RES _do_pika_eventListener_send(PikaEventListener* self,
             return PIKA_RES_ERR_RUNTIME_ERROR;
         }
     }
+
+#if !PIKA_COROUTINE_ENABLE  // skip wait for corutine
     /* using multi thread */
-    if (pika_GIL_isInit()) {
-        /* python thread is running */
-        /* wait python thread get first lock */
-        while (1) {
-            if (_VM_is_first_lock()) {
-                break;
-            }
-            if (g_PikaVMState.vm_cnt == 0) {
-                break;
-            }
-            if (pika_GIL_getBareLock() == 0) {
-                break;
-            }
-            pika_platform_thread_yield();
+    if (!pika_GIL_isInit()) {
+        return (PIKA_RES)0;
+    };
+
+    /* python thread is running */
+    /* wait python thread get first lock */
+    while (1) {
+        if (_VM_is_first_lock()) {
+            break;
         }
-        pika_GIL_ENTER();
-#if PIKA_EVENT_THREAD_ENABLE
-        if (!g_PikaVMState.event_thread) {
-            // avoid _VMEvent_pickupEvent() in _time.c as soon as
-            // possible
-            g_PikaVMState.event_thread = pika_platform_thread_init(
-                "pika_event", _thread_event, NULL, PIKA_EVENT_THREAD_STACK_SIZE,
-                PIKA_THREAD_PRIO, PIKA_THREAD_TICK);
-            pika_debug("event thread init");
+        if (g_PikaVMState.vm_cnt == 0) {
+            break;
         }
+        if (pika_GIL_getBareLock() == 0) {
+            break;
+        }
+        pika_platform_thread_yield();
+    }
 #endif
 
-        if (NULL != eventData) {
-            if (PIKA_RES_OK !=
-                __eventListener_pushEvent(self, eventId, eventData)) {
-                goto __gil_exit;
-            }
+    pika_GIL_ENTER();
+#if PIKA_EVENT_THREAD_ENABLE
+    if (!g_PikaVMState.event_thread) {
+        // avoid _VMEvent_pickupEvent() in _time.c as soon as
+        // possible
+        g_PikaVMState.event_thread = pika_platform_thread_init(
+            "pika_event", _thread_event, NULL, PIKA_EVENT_THREAD_STACK_SIZE,
+            PIKA_THREAD_PRIO, PIKA_THREAD_TICK);
+        pika_debug("event thread init");
+    }
+#endif
+
+    if (NULL != eventData) {
+        if (PIKA_RES_OK !=
+            __eventListener_pushEvent(self, eventId, eventData)) {
+            goto __gil_exit;
         }
+    }
 
-        if (pickupWhenNoVM) {
-            int vmCnt = _VMEvent_getVMCnt();
-            if (0 == vmCnt) {
-                /* no vm running, pick up event imediately */
-                pika_debug("vmCnt: %d, pick up imediately", vmCnt);
-                _VMEvent_pickupEvent();
-            }
+    if (pickupWhenNoVM) {
+        int vmCnt = _VMEvent_getVMCnt();
+        if (0 == vmCnt) {
+            /* no vm running, pick up event imediately */
+            pika_debug("vmCnt: %d, pick up imediately", vmCnt);
+            _VMEvent_pickupEvent();
         }
-    __gil_exit:
-        pika_GIL_EXIT();
     }
+__gil_exit:
+    pika_GIL_EXIT();
     return (PIKA_RES)0;
 #endif
 }
diff --git a/src/PikaVersion.h b/src/PikaVersion.h
@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 4
 
-#define PIKA_EDIT_TIME "2025/06/02 13:54:26"
+#define PIKA_EDIT_TIME "2025/06/02 15:06:43"
diff --git a/src/pika_config_valid.h b/src/pika_config_valid.h
@@ -483,6 +483,10 @@ extern "C" {
         #define PIKA_EVENT_THREAD_ENABLE 1
     #endif
 
+    #ifndef PIKA_COROUTINE_ENABLE
+        #define PIKA_COROUTINE_ENABLE 0
+    #endif
+
     #ifndef PIKA_GC_MARK_SWEEP_ENABLE
         #define PIKA_GC_MARK_SWEEP_ENABLE 0
     #endif
@@ -524,6 +528,9 @@ extern "C" {
     #endif
 
     /* configuration validation */
+#if PIKA_COROUTINE_ENABLE && PIKA_EVENT_THREAD_ENABLE
+    #error "PIKA_COROUTINE_ENABLE can not used with PIKA_EVENT_THREAD_ENABLE"
+#endif
 
 #endif
 #ifdef __cplusplus
