add recursive_mutex support

Author: pikasTech

package/pika_lvgl/pika_lvgl_canvas.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

package/pika_lvgl/pika_lvgl_indev_t.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

package/pika_lvgl/pika_lvgl_lv_event.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

package/pika_lvgl/pika_lvgl_lv_obj.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

package/pika_lvgl/pika_lvgl_lv_wegit.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"
@@ -1490,7 +1490,6 @@ int pika_lvgl_keyboard_get_selected_btn(PikaObj* self) {
     return lv_keyboard_get_selected_btn(lv_obj);
 }
 
-
 /*
 class ime_pinyin(lv_obj):
     def __init__(self, parent: lv_obj): ...
@@ -1534,5 +1533,4 @@ PikaObj* pika_lvgl_ime_pinyin_get_cand_panel(PikaObj* self) {
     return new_obj;
 }
 
-
 #endif

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_canvas.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_indev_t.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_lv_event.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_lv_obj.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"

port/linux/package/pikascript/pikascript-lib/pika_lvgl/pika_lvgl_lv_wegit.c

@@ -1,4 +1,4 @@
-#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
 #include "lvgl.h"
 #else
 #include "../../lvgl.h"
@@ -1490,7 +1490,6 @@ int pika_lvgl_keyboard_get_selected_btn(PikaObj* self) {
     return lv_keyboard_get_selected_btn(lv_obj);
 }
 
-
 /*
 class ime_pinyin(lv_obj):
     def __init__(self, parent: lv_obj): ...
@@ -1534,5 +1533,4 @@ PikaObj* pika_lvgl_ime_pinyin_get_cand_panel(PikaObj* self) {
     return new_obj;
 }
 
-
 #endif

src/PikaPlatform.c

@@ -805,6 +805,62 @@ PIKA_WEAK int pika_platform_thread_mutex_destroy(
 #endif
 }
 
+int pika_thread_recursive_mutex_init(pika_thread_recursive_mutex_t* m) {
+    int ret = pika_platform_thread_mutex_init(&m->mutex);
+    if (ret != 0) {
+        return ret;
+    }
+    m->owner = 0;
+    m->lock_times = 0;
+    return 0;
+}
+
+int pika_thread_recursive_mutex_lock(pika_thread_recursive_mutex_t* m) {
+    uint64_t self = pika_platform_thread_self();
+    if (m->owner == self) {
+        m->lock_times++;
+        return 0;
+    }
+    int ret = pika_platform_thread_mutex_lock(&m->mutex);
+    if (ret != 0) {
+        return ret;
+    }
+    m->owner = self;
+    m->lock_times = 1;
+    return 0;
+}
+
+int pika_thread_recursive_mutex_trylock(pika_thread_recursive_mutex_t* m) {
+    uint64_t self = pika_platform_thread_self();
+    if (m->owner == self) {
+        m->lock_times++;
+        return 0;
+    }
+    int ret = pika_platform_thread_mutex_trylock(&m->mutex);
+    if (ret != 0) {
+        return ret;
+    }
+    m->owner = self;
+    m->lock_times = 1;
+    return 0;
+}
+
+int pika_thread_recursive_mutex_unlock(pika_thread_recursive_mutex_t* m) {
+    if (m->owner != pika_platform_thread_self()) {
+        return -1;
+    }
+    m->lock_times--;
+    if (m->lock_times == 0) {
+        m->owner = 0;
+        return pika_platform_thread_mutex_unlock(&m->mutex);
+    }
+    return 0;
+}
+
+int pika_thread_recursive_mutex_destroy(pika_thread_recursive_mutex_t* m) {
+    return pika_platform_thread_mutex_destroy(&m->mutex);
+}
+
 PIKA_WEAK void pika_platform_thread_timer_init(pika_platform_timer_t* timer) {
 #ifdef __linux
     timer->time = (struct timeval){0, 0};

src/PikaPlatform.h

@@ -318,6 +318,18 @@ int pika_platform_thread_mutex_trylock(pika_platform_thread_mutex_t* m);
 int pika_platform_thread_mutex_unlock(pika_platform_thread_mutex_t* m);
 int pika_platform_thread_mutex_destroy(pika_platform_thread_mutex_t* m);
 
+typedef struct pika_thread_recursive_mutex {
+    pika_platform_thread_mutex_t mutex;
+    uint64_t owner;
+    volatile int lock_times;
+} pika_thread_recursive_mutex_t;
+
+int pika_thread_recursive_mutex_init(pika_thread_recursive_mutex_t* m);
+int pika_thread_recursive_mutex_lock(pika_thread_recursive_mutex_t* m);
+int pika_thread_recursive_mutex_trylock(pika_thread_recursive_mutex_t* m);
+int pika_thread_recursive_mutex_unlock(pika_thread_recursive_mutex_t* m);
+int pika_thread_recursive_mutex_destroy(pika_thread_recursive_mutex_t* m);
+
 #ifdef __linux
 #include <sys/time.h>
 typedef struct pika_platform_timer {

src/PikaVersion.h

@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 2
 
-#define PIKA_EDIT_TIME "2024/02/18 20:58:13"
+#define PIKA_EDIT_TIME "2024/02/19 22:35:07"