fix other issue for isinstance

pikasTech · pikasTech · commit bd4205681e33 · 2024-08-03T17:05:14.000+08:00
diff --git a/examples/_thread/thread_issue1.py b/examples/_thread/thread_issue1.py
@@ -0,0 +1,14 @@
+import time
+import _thread
+
+
+def task2():
+    while True:
+        print("123")
+        time.sleep_ms(2001)
+
+
+_thread.start_new_thread(task2, ())
+
+while True:
+    time.sleep_ms(2000)
diff --git a/package/_thread/_thread.c b/package/_thread/_thread.c
@@ -155,7 +155,6 @@ void _thread_start_new_thread(PikaObj* self, Arg* function, Arg* args_) {
         obj_setSysOut(self, "thread create failed");
         return;
     }
-    pika_platform_thread_startup(info->thread);
 #if !PIKA_THREAD_MALLOC_STACK_ENABLE
     g_PikaMemInfo.heapUsed += info->stack_size;
 #endif
diff --git a/port/linux/.vscode/launch.json b/port/linux/.vscode/launch.json
@@ -34,7 +34,9 @@
                 // "--gtest_filter=jrpc.cmd"
                 // "--gtest_filter=jrpc.exec_get_val"
                 // "--gtest_filter=jrpc.exec_get_val"
-                "--gtest_filter=builtin.issue_isinstance"
+                // "--gtest_filter=thread.issue1"
+                // "--gtest_filter=except.isinstance"
+                "--gtest_filter=builtin.isinstance"
             ],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
diff --git a/port/linux/test/py-test.cpp b/port/linux/test/py-test.cpp
@@ -109,6 +109,9 @@ TEST_RUN_SINGLE_FILE_EXCEPT_OUTPUT(socket,
                                    "test/python/socket/socket_download.py",
                                    "PASS\r\n")
 
+TEST_RUN_SINGLE_FILE_PASS(builtin,
+                          issue_isinstance,
+                          "test/python/builtins/issue_isinstance.py");
 #endif
 
 TEST_END
diff --git a/port/linux/test/python/_thread/thread_issue1.py b/port/linux/test/python/_thread/thread_issue1.py
@@ -0,0 +1,14 @@
+import time
+import _thread
+
+
+def task2():
+    while True:
+        print("123")
+        time.sleep_ms(2001)
+
+
+_thread.start_new_thread(task2, ())
+
+while True:
+    time.sleep_ms(2000)
diff --git a/src/PikaObj.c b/src/PikaObj.c
@@ -4010,7 +4010,7 @@ pika_bool _isinstance(Arg* aObj, Arg* classinfo) {
             goto __exit;
         }
         Arg* aObjSuper = methodArg_super(aObjType, &objProp);
-        if (NULL == aObjSuper) {
+        if ((NULL == aObjSuper) && (NULL == objProp)) {
             res = pika_false;
             goto __exit;
         }
diff --git a/src/PikaPlatform.c b/src/PikaPlatform.c
@@ -612,8 +612,10 @@ PIKA_WEAK void pika_platform_thread_yield(void) {
     pika_thread_idle_hook();
 #if PIKA_FREERTOS_ENABLE
     vTaskDelay(1);
-#elif defined(__linux) || defined(_WIN32)
-    return;
+#elif defined(_WIN32)
+    SwitchToThread();
+#elif defined(__linux)
+    sched_yield();
 #elif PIKA_RTTHREAD_ENABLE
     rt_thread_yield();
 #elif PIKA_ZEUSOS_ENABLE
diff --git a/src/PikaPlatform.h b/src/PikaPlatform.h
@@ -261,6 +261,7 @@ uint8_t pika_is_locked_pikaMemory(void);
 /* Thread Platform */
 #ifdef __linux
 #include <pthread.h>
+#include <sched.h>
 typedef struct pika_platform_thread {
     pthread_t thread;
     pthread_mutex_t mutex;
diff --git a/src/PikaVersion.h b/src/PikaVersion.h
@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 3
 
-#define PIKA_EDIT_TIME "2024/08/02 18:06:51"
+#define PIKA_EDIT_TIME "2024/08/03 17:05:07"

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,6 @@ void _thread_start_new_thread(PikaObj* self, Arg* function, Arg* args_) {`
`155`	`155`	`obj_setSysOut(self, "thread create failed");`
`156`	`156`	`return;`
`157`	`157`	`}`
`158`		`- pika_platform_thread_startup(info->thread);`
`159`	`158`	`#if !PIKA_THREAD_MALLOC_STACK_ENABLE`
`160`	`159`	`g_PikaMemInfo.heapUsed += info->stack_size;`
`161`	`160`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -4010,7 +4010,7 @@ pika_bool _isinstance(Arg* aObj, Arg* classinfo) {`
`4010`	`4010`	`goto __exit;`
`4011`	`4011`	`}`
`4012`	`4012`	`Arg* aObjSuper = methodArg_super(aObjType, &objProp);`
`4013`		`- if (NULL == aObjSuper) {`
	`4013`	`+ if ((NULL == aObjSuper) && (NULL == objProp)) {`
`4014`	`4014`	`res = pika_false;`
`4015`	`4015`	`goto __exit;`
`4016`	`4016`	`}`