fix pya load

Author: pikasTech

package/time/_time.c

@@ -16,7 +16,7 @@ static void _do_sleep_ms_tick(uint32_t ms) {
     while (1) {
         pika_platform_thread_yield();
 #if PIKA_EVENT_ENABLE
-        if (!g_PikaVMSignal.event_thread) {
+        if (!pika_GIL_isInit()) {
             _VMEvent_pickupEvent();
         }
 #endif

port/linux/package/pikascript/pikascript-lib/time/_time.c

@@ -16,7 +16,7 @@ static void _do_sleep_ms_tick(uint32_t ms) {
     while (1) {
         pika_platform_thread_yield();
 #if PIKA_EVENT_ENABLE
-        if (!g_PikaVMSignal.event_thread) {
+        if (!pika_GIL_isInit()) {
             _VMEvent_pickupEvent();
         }
 #endif

port/linux/test/module-test.cpp

@@ -517,8 +517,6 @@ TEST(module, REPL_runbytecode) {
     EXPECT_EQ(pikaMemNow(), 0);
 }
 
-#if 0
-//! TODO: fix this test
 TEST(module, REPL_pya) {
     /* init */
     g_PikaMemInfo.heapUsedMax = 0;
@@ -539,7 +537,6 @@ TEST(module, REPL_pya) {
     obj_deinit(pikaMain);
     EXPECT_EQ(pikaMemNow(), 0);
 }
-#endif
 
 TEST(module, REPL_script) {
     /* init */

src/PikaObj.c

@@ -1941,7 +1941,9 @@ void _do_pikaScriptShell(PikaObj* self, ShellConfig* cfg) {
                 uint8_t* size_byte = (uint8_t*)&size;
                 size_byte[i] = cfg->fn_getchar();
             }
-            size += sizeof(uint32_t) * 2;
+            if (magic_code[3] == 'o') {
+                size += sizeof(uint32_t) * 2;
+            }
             uint8_t* buff = pikaMalloc(size);
             /* save magic code and size */
             memcpy(buff, magic_code, sizeof(magic_code));
@@ -1969,6 +1971,8 @@ void _do_pikaScriptShell(PikaObj* self, ShellConfig* cfg) {
                 pika_platform_printf(
                     "=============== [REBOOT] ===============\r\n");
                 pika_platform_reboot();
+                pikaFree(buff, size);
+                return;
             }
         }
 #endif
@@ -2740,15 +2744,17 @@ static void _thread_event(void* arg) {
     pika_assert(_VM_is_first_lock());
     while (1) {
         pika_GIL_ENTER();
-        _VMEvent_pickupEvent();
-        pika_GIL_EXIT();
-        pika_platform_thread_yield();
 #if PIKA_EVENT_ENABLE
         if (g_PikaVMSignal.event_thread_exit) {
+            g_PikaVMSignal.event_thread_exit_done = 1;
             break;
         }
 #endif
+        _VMEvent_pickupEvent();
+        pika_GIL_EXIT();
+        pika_platform_thread_yield();
     }
+    pika_GIL_EXIT();
 }
 
 void _do_pika_eventListener_send(PikaEventListener* self,

src/PikaObj.h

@@ -739,6 +739,7 @@ uint32_t pikaGC_printFreeList(void);
 
 int pika_GIL_EXIT(void);
 int pika_GIL_ENTER(void);
+pika_bool pika_GIL_isInit(void);
 
 /* builtins */
 PikaObj* New_builtins(Args* args);

src/PikaPlatform.c

@@ -340,8 +340,7 @@ PIKA_WEAK int pika_platform_fclose(FILE* stream) {
 }
 
 /* fwrite */
-PIKA_WEAK size_t 
-pika_platform_fwrite(const void* ptr,
+PIKA_WEAK size_t pika_platform_fwrite(const void* ptr,
                                       size_t size,
                                       size_t n,
                                       FILE* stream) {
@@ -716,7 +715,11 @@ PIKA_WEAK void pika_platform_thread_timer_usleep(unsigned long usec) {
 }
 
 PIKA_WEAK void pika_platform_reboot(void) {
+#if __linux
+    pika_platform_printf("reboot\n");
+#else
     WEAK_FUNCTION_NEED_OVERRIDE_ERROR();
+#endif
 }
 
 PIKA_WEAK void pika_platform_clear(void) {

src/PikaVM.c

@@ -62,6 +62,10 @@ static uint8_t _getLRegIndex(char* data);
 static PikaObj* New_Locals(Args* args);
 char* string_slice(Args* outBuffs, char* str, int start, int end);
 
+pika_bool pika_GIL_isInit(void) {
+    return g_pikaGIL.is_init;
+}
+
 int pika_GIL_ENTER(void) {
     if (!g_pikaGIL.is_init) {
         return 0;
@@ -208,6 +212,11 @@ void _VMEvent_deinit(void) {
         g_PikaVMSignal.event_thread_exit = 1;
         pika_platform_thread_destroy(g_PikaVMSignal.event_thread);
         g_PikaVMSignal.event_thread = NULL;
+        pika_GIL_EXIT();
+        while (!g_PikaVMSignal.event_thread_exit_done) {
+            pika_platform_thread_yield();
+        }
+        pika_GIL_ENTER();
     }
 #endif
 }
@@ -4295,7 +4304,7 @@ PikaObj* pikaVM_runFile(PikaObj* self, char* file_name) {
 
 void _pikaVM_yield(void) {
 #if PIKA_EVENT_ENABLE
-    if (!g_PikaVMSignal.event_thread) {
+    if (!pika_GIL_isInit()) {
         _VMEvent_pickupEvent();
     }
 #endif

src/PikaVM.h

@@ -156,6 +156,7 @@ struct VMSignal {
     int event_pickup_cnt;
     pika_platform_thread_t* event_thread;
     pika_bool event_thread_exit;
+    pika_bool event_thread_exit_done;
 #endif
 };