test for result test picture

readme.md

@@ -9,31 +9,33 @@
 # Time Algorithm
 
 ```plantuml
-
 @startuml
 
 start
-:rTime = 0
+:newTime = 0
-relInterval = 0
+totalTime = 0
-isEnd = it == list.end();
+isEnd = it == list.end()
-if (!isEnd) then (not end)
+lastTime = 0;
- :relInterval = it.getRelTicks()
- rTime += relInterval;
 
-    while ( !isEnd && ( relInterval <= 0 || (rTime < dTime) ) is (goForward)
+#tomato:if (!isEnd) then (not end)
+ #tomato:totalTime += it.getRelTicks();
+endif
+
+    while ( !isEnd && (totalTime <= newTime) ) is (goForward)
     :isEnd = (++it == list.end());
-        if (!isEnd) then (not end)
+        :lastTime = totalTime;
-            :relInterval = it.getRelTicks()
+        #tomato:if (!isEnd) then (not end)
-            rTime += relInterval;
+            #tomato:totalTime += it.getRelTicks();
         endif
     endwhile
     
+#tomato:if (!isEnd) then (not end)
+    #tomato:subRelTicks(newTime- lastTime);
 endif
-: insert ;
+:it.setRelTicks(newTime - lastTime);
+:insert(it, newTimeout);
 
 @enduml
-
-
 ```
 
 
@@ -48,7 +50,7 @@ The Test Factory (TestFactory01) instantiates 2 objects:
 <details>
   <summary>QT result ✅</summary>
 
-![result.PNG](test-bench%2Ftest1%2Fide-qtcreator-test1-idf%2Fresult.PNG)
+![result.PNG](./test-bench%2Ftest1%2Fide-qtcreator-test1-idf%2Fresult.PNG)
 
 This test is successfully passed
 
@@ -56,7 +58,7 @@ This test is successfully passed
 <details>
   <summary>STM result ✅</summary>
 
-![result.png](test-bench%2Ftest1%2Fide-cubeide-test1-idf%2Fresult.png)
+![result.png](./test-bench%2Ftest1%2Fide-cubeide-test1-idf%2Fresult.png)
 
 </details>
 

src/simplified/xf/port/common/timeoutmanager.cpp

@@ -34,37 +34,29 @@ XFTimeoutManager::~XFTimeoutManager() {
 
 void XFTimeoutManager::addTimeout(XFTimeout *pNewTimeout) {
 
-    const int dTime = pNewTimeout->getInterval();
+    const int newTime = pNewTimeout->getInterval();
-    int rTime = 0;
+    int totalTime = 0;
-    int relInterval = 0;
     bool isEnd = true;
-    int interval = dTime;
+    int lastTime = 0;
 
     this->pMutex_->lock();
     TimeoutList::iterator it = this->timeouts_.begin();
     isEnd = (it == this->timeouts_.end());
 
-    if(!isEnd){
+    if(!isEnd) totalTime += (*it)->getRelTicks();
-        relInterval = (*it)->getInterval();
-        rTime += relInterval;
-    }
 
-    while(!isEnd && ( relInterval <= 0 || (rTime > dTime) )) {
+    while(!isEnd && (totalTime <= newTime)) {
         isEnd = (++it == this->timeouts_.end());
-        interval = rTime - dTime;
+        lastTime = totalTime;
-        if(!isEnd) {
+        if(!isEnd) totalTime += (*it)->getRelTicks();
-            relInterval = (*it)->getRelTicks();
-            rTime += relInterval;
     }
-    }
-    if(it == this->timeouts_.begin())
 
-    if(!isEnd) (*it)->substractFromRelTicks(interval);
+    if(!isEnd) (*it)->substractFromRelTicks(newTime-lastTime);
-    it--;
+
-    pNewTimeout->setRelTicks(interval);
+    pNewTimeout->setRelTicks(newTime-lastTime);
     this->timeouts_.insert(it, pNewTimeout);
+
     this->pMutex_->unlock();
-    return;
 
 }
 
@@ -112,12 +104,12 @@ void XFTimeoutManager::tick() {
 
         while (!isEmpty && (rTime <= 0) ) {
 
-            rTime = timeout->getRelTicks();
-
             XFDispatcher::getInstance()->pushEvent(timeout);
             this->timeouts_.pop_front();
+
             timeout = this->timeouts_.front();
             isEmpty = this->timeouts_.empty();
+            if(!isEmpty) rTime = timeout->getRelTicks();
 
         }