auto init lock for event_handler

Author: pikasTech

port/linux/.vscode/launch.json

@@ -24,7 +24,7 @@
                 // "--gtest_filter=vm.test_cmodule_import_as"
                 // "--gtest_filter=vm.subsrc_import"
                 // "--gtest_filter=event.event_thread"
-                "--gtest_filter=socket.socket_download"
+                "--gtest_filter=*mqtt*"
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",

port/linux/package/pikascript/pikascript-lib/mqtt/_mqtt__MQTT.c

@@ -490,6 +490,7 @@ void Subscribe_Handler(void* client, message_data_t* msg) {
         return;
     }
 
+    pika_GIL_ENTER();
     Arg* evt_obj_arg = arg_newDirectObj(New_TinyObj);
     PikaObj* evt_obj = arg_getPtr(evt_obj_arg);
     obj_setStr(evt_obj, "topic", (char*)msg->topic_name);
@@ -498,6 +499,7 @@ void Subscribe_Handler(void* client, message_data_t* msg) {
 
     pika_eventListener_send(g_mqtt_event_listener, hash_time33(msg->topic_name),
                             evt_obj_arg);
+    pika_GIL_EXIT();
 
     // MQTT_LOG_I("\n>>>------------------");
     // MQTT_LOG_I("Topic:%s \nlen:%d,message: %s", msg->topic_name,

port/linux/test/python/event/event_thread.py

@@ -12,6 +12,7 @@
 EVENT_SIGAL_IO_FALLING_EDGE = 0x02
 
 callback_times = 0
+loop_times = 0
 
 
 def callBack1(signal):
@@ -42,4 +43,4 @@ def insert_task():
 
 
 # launch a thread to enable evnet_thread
-_thread.start_new_thread(thread_test, ())
+# _thread.start_new_thread(thread_test, ())

src/PikaObj.c

@@ -2987,10 +2987,14 @@ PIKA_RES _do_pika_eventListener_send(PikaEventListener* self,
     };
 #else
     if (NULL != eventData && !_VM_is_first_lock()) {
+#if PIKA_EVENT_THREAD_ENABLE
+        _VM_lock_init();
+#else
         pika_platform_printf(
             "Error: can not send arg event data without thread support\r\n");
         arg_deinit(eventData);
         return PIKA_RES_ERR_RUNTIME_ERROR;
+#endif
     }
     if (NULL == eventData) {
         // for event signal
@@ -3000,11 +3004,19 @@ PIKA_RES _do_pika_eventListener_send(PikaEventListener* self,
         }
     }
     /* using multi thread */
-    if (_VM_is_first_lock()) {
+    if (pika_GIL_isInit()) {
+        /* python thread is running */
+        if (g_PikaVMState.vm_cnt != 0) {
+            /* wait python thread get first lock */
+            while (!_VM_is_first_lock()) {
+                pika_platform_thread_yield();
+            }
+        }
         pika_GIL_ENTER();
 #if PIKA_EVENT_THREAD_ENABLE
         if (!g_PikaVMState.event_thread) {
-            // avoid _VMEvent_pickupEvent() in _time.c as soon as possible
+            // 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);

src/PikaVM.c

@@ -237,6 +237,8 @@ void _VMEvent_deinit(void) {
         while (!g_PikaVMState.event_thread_exit_done) {
             pika_platform_thread_yield();
         }
+        g_PikaVMState.event_thread_exit = 0;
+        g_PikaVMState.event_thread_exit_done = 0;
         pika_GIL_ENTER();
     }
 #endif

src/PikaVersion.h

@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 3
 
-#define PIKA_EDIT_TIME "2024/04/26 14:28:02"
+#define PIKA_EDIT_TIME "2024/05/02 23:58:57"