修复HCPPTimer的BUG

HEYAHONG · Jun 13, 2024 · 730e409 · 730e409
1 parent b5a9b02
commit 730e409
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/hcppbox/HCPPTimer.cpp b/hcppbox/HCPPTimer.cpp
@@ -47,7 +47,7 @@ void HCPPTimer::timeout()
 bool HCPPTimer::SetParent(HCPPObject * parent,bool force_update)
 {
     //定时器必须要求顶层父对象为线程
-    if(parent==NULL || parent->GetTopHCPPObject()->GetType() == HCPPOBJECT_TYPE_THREAD)
+    if(parent==NULL || parent->GetTopHCPPObject()->GetType() != HCPPOBJECT_TYPE_THREAD)
     {
         parent=HCPPTimerGlobal::g_timerthread.GetThread();
     }

diff --git a/test/HCPPObjectTest/Timer.cpp b/test/HCPPObjectTest/Timer.cpp
@@ -6,7 +6,17 @@
 void Timer_main()
 {
     printf(__FILE__  " Start\r\n");
-
+    printf("-----Test 1-----\r\n");
+    HCPPThread *threadhandle=HCPPThread::New();
+    new HCPPTimer(threadhandle,std::chrono::seconds(1),[](HCPPTimer *timer)
+    {
+        static int cnt=0;
+        printf("Period Timer %08X:cnt=%d\r\n",(uint32_t)reinterpret_cast<uintptr_t>(timer),cnt++);
+    },false);
+    std::this_thread::sleep_for(std::chrono::seconds(5));
+    threadhandle->DeleteThread();
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    printf("-----Test 2-----\r\n");
     new HCPPTimer(NULL,std::chrono::seconds(1),[](HCPPTimer *timer)
     {
         printf("OneShot Timer %08X\r\n",(uint32_t)reinterpret_cast<uintptr_t>(timer));