From ce29edbca63640421f81b5de374e0e2f7a01a785 Mon Sep 17 00:00:00 2001
From: Vincent Wei <vincent@minigui.org>
Date: Sun, 14 Jul 2019 17:08:36 +0800
Subject: [PATCH] disable timer thread for MiniGUI-Threads

---
 src/kernel/init.c  |  8 ++++++++
 src/kernel/timer.c | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/kernel/init.c b/src/kernel/init.c
index db1bad31..93298ec2 100644
--- a/src/kernel/init.c
+++ b/src/kernel/init.c
@@ -182,6 +182,14 @@ static void* EventLoop (void* data)
     while (__mg_quiting_stage > _MG_QUITING_STAGE_EVENT) {
         EXTRA_INPUT_EVENT extra;
 
+        /* VM: Since 4.0.0, update timer counter in event loop */
+#ifndef __USE_TIMER_THREAD
+        if (__mg_quiting_stage > _MG_QUITING_STAGE_TIMER) {
+            extern void __mg_timer_action (void *data);
+            __mg_timer_action (NULL);
+        }
+#endif
+
         extra.params_mask = 0;
         event = IAL_WaitEvent (0, NULL, NULL, NULL, &__mg_event_timeout, &extra);
         if (event < 0)
diff --git a/src/kernel/timer.c b/src/kernel/timer.c
index 37dba15a..1e4dc931 100644
--- a/src/kernel/timer.c
+++ b/src/kernel/timer.c
@@ -79,7 +79,7 @@ static pthread_mutex_t timerLock;
 #endif
 
 /* timer action for minigui timers */
-static void __mg_timer_action (void *data)
+void __mg_timer_action (void *data)
 {
 #if defined(_MGRM_PROCESSES)
     SHAREDRES_TIMER_COUNTER = __mg_os_get_time_ms()/10;
@@ -101,7 +101,7 @@ static void __mg_timer_action (void *data)
 
 static OS_TIMER_ID __mg_os_timer = 0;
 
-#else /* __AOS__ */
+#elif defined(__USE_TIMER_THREAD) /* __AOS__ */
 static void* TimerEntry (void* data)
 {
     sem_post ((sem_t*)data);
@@ -114,7 +114,7 @@ static void* TimerEntry (void* data)
     /* printf("quit from TimerEntry()\n"); */
     return NULL;
 }
-#endif /* !__AOS__ */
+#endif /* __USE_TIMER_THREAD */
 
 int __mg_timer_init (void)
 {
@@ -127,7 +127,7 @@ int __mg_timer_init (void)
     __mg_os_timer = tp_os_timer_create ("mgtimer", __mg_timer_action,
                                          NULL, AOS_TIMER_TICKT,
                                          OS_AUTO_ACTIVATE | OS_AUTO_LOAD);
-#else /* NOT __AOS__ */
+#elif defined(__USE_TIMER_THREAD) /* __AOS__ */
     {
         sem_t wait;
         sem_init (&wait, 0, 0);
@@ -135,7 +135,7 @@ int __mg_timer_init (void)
         sem_wait (&wait);
         sem_destroy (&wait);
     }
-#endif /* __AOS__ */
+#endif /* __USE_TIMER_THREAD */
 
     return 0;
 }