Merge branch 'zhangtao' into 'dev'

fix thread bug See merge request maix_sw/k230_canmv!219
kendryte · Apr 25, 2024 · f2d15cf · f2d15cf
2 parents ae7b417 + d2d211c
commit f2d15cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/micropython_port/core/mpthreadport.c b/micropython_port/core/mpthreadport.c
@@ -80,7 +80,7 @@ STATIC sem_t thread_signal_done;
 #endif
 
 void mp_thread_unix_begin_atomic_section(void) {
-    pthread_mutex_lock(&thread_mutex);
+    while (pthread_mutex_lock(&thread_mutex) != 0);
 }
 
 void mp_thread_unix_end_atomic_section(void) {
@@ -305,10 +305,8 @@ void mp_thread_mutex_init(mp_thread_mutex_t *mutex) {
 int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
     int ret;
     if (wait) {
-        ret = pthread_mutex_lock(mutex);
-        if (ret == 0) {
-            return 1;
-        }
+        while (pthread_mutex_lock(mutex) != 0);
+        return 1;
     } else {
         ret = pthread_mutex_trylock(mutex);
         if (ret == 0) {

diff --git a/micropython_port/media/media.py b/micropython_port/media/media.py
@@ -1,5 +1,4 @@
 from mpp import *
-import _thread
 
 
 MAX_MEDIA_BUFFER_POOLS = 16 #FIX VALUE
@@ -117,8 +116,6 @@ class media:
     config_index = 0
     __buf_has_init = False
 
-    lock = _thread.allocate_lock()
-
     # create media link
     @classmethod
     def create_link(cls, souce, sink):