support gil exit with bare

pikasTech · May 14, 2024 · 65249be · 65249be
1 parent 599759a
commit 65249be
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/src/PikaObj.c b/src/PikaObj.c
@@ -559,12 +559,12 @@ PikaObj* _pika_dict_new(int num_args, ...) {
 }
 
 NativeProperty* obj_getProp(PikaObj* self) {
-    Arg* aProp = obj_getArg(self, "@p");
+    Arg* aProp = obj_getArg(self, "@p_");
     PikaObj* class_obj = NULL;
     if (NULL == aProp) {
         if (NULL != self->constructor) {
             class_obj = obj_getClassObj(self);
-            aProp = obj_getArg(class_obj, "@p");
+            aProp = obj_getArg(class_obj, "@p_");
         }
     }
     NativeProperty* prop = NULL;
@@ -694,7 +694,7 @@ void* getNewClassObjFunByName(PikaObj* obj, char* name) {
 PikaObj* removeMethodInfo(PikaObj* thisClass) {
 #if PIKA_METHOD_CACHE_ENABLE
 #else
-    args_removeArg(thisClass->list, args_getArg(thisClass->list, "@p"));
+    args_removeArg(thisClass->list, args_getArg(thisClass->list, "@p_"));
 #endif
     return thisClass;
 }
@@ -2962,7 +2962,7 @@ void pika_debug_bytes(uint8_t* buff, size_t len) {
     for (size_t i = 0; i < len; i++) {
         pika_debug_raw("0x%02X", buff[i]);
         if (i < len - 1) {
-            printf(",");
+            pika_debug_raw(",");
         }
     }
     pika_debug_raw("]\n");
@@ -3016,7 +3016,16 @@ PIKA_RES _do_pika_eventListener_send(PikaEventListener* self,
     if (pika_GIL_isInit()) {
         /* python thread is running */
         /* wait python thread get first lock */
-        while (!_VM_is_first_lock() && g_PikaVMState.vm_cnt != 0) {
+        while (1){
+            if (_VM_is_first_lock()){
+                break;
+            }
+            if (pika_GIL_getBareLock() == 0){
+                break;
+            }
+            if (g_PikaVMState.vm_cnt == 0){
+                break;
+            }
             pika_platform_thread_yield();
         }
         pika_GIL_ENTER();

diff --git a/src/PikaObj.h b/src/PikaObj.h
@@ -778,7 +778,7 @@ const MethodProp floatMethod = {
 
 void _obj_updateProxyFlag(PikaObj* self);
 #define obj_setClass(_self, _method)                        \
-    obj_setPtr((_self), "@p", (void*)&pika_class(_method)); \
+    obj_setPtr((_self), "@p_", (void*)&pika_class(_method)); \
     _obj_updateProxyFlag((_self))
 
 Arg* _obj_getPropArg(PikaObj* obj, char* name);
@@ -840,6 +840,8 @@ uint32_t pikaGC_printFreeList(void);
 
 int pika_GIL_EXIT(void);
 int pika_GIL_ENTER(void);
+int pika_GIL_getBareLock(void);
+
 
 int32_t pika_debug_find_break_point_pc(char* pyFile, uint32_t pyLine);
 

diff --git a/src/PikaVM.c b/src/PikaVM.c
@@ -92,6 +92,10 @@ int pika_GIL_ENTER(void) {
     return ret;
 }
 
+int pika_GIL_getBareLock(void){
+    return g_pikaGIL.mutex.bare_lock;
+}
+
 int pika_GIL_EXIT(void) {
     if (!g_pikaGIL.mutex.is_init) {
         g_pikaGIL.mutex.bare_lock = 0;

diff --git a/src/pika_config_valid.h b/src/pika_config_valid.h
@@ -207,7 +207,7 @@ extern "C" {
     #endif
 
     #ifndef PIKA_STACK_BUFF_SIZE
-        #define PIKA_STACK_BUFF_SIZE 256
+        #define PIKA_STACK_BUFF_SIZE 512
     #endif
 
     #ifndef PIKA_NAME_BUFF_SIZE