Klagarge/XF
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

algo work on test 1

Browse Source
This commit is contained in:
Rémi Heredero
2023-10-21 13:25:40 +02:00
parent 268c270a4d
commit 20fd0631c6
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
readme.md
View File

@@ -15,7 +15,8 @@
start start
:rTime = 0 :rTime = 0
relInterval = 0 relInterval = 0
isEnd = it == list.end(); isEnd = it == list.end()
lTime = 0;
if (!isEnd) then (not end) if (!isEnd) then (not end)
:relInterval = it.getRelTicks() :relInterval = it.getRelTicks()
rTime += relInterval; rTime += relInterval;
@@ -24,12 +25,18 @@ if (!isEnd) then (not end)
:isEnd = (++it == list.end()); :isEnd = (++it == list.end());
if (!isEnd) then (not end) if (!isEnd) then (not end)
:relInterval = it.getRelTicks() :relInterval = it.getRelTicks()
lTime = rTime
rTime += relInterval; rTime += relInterval;
endif endif
endwhile endwhile
endif endif
: insert ; if (!isEnd) then (not end)
: subRelTicks(dTime- lTime);
endif
:it.setRelTicks(dTime - rTime);
:insert(it, timeout);
@enduml @enduml

18
src/simplified/xf/port/common/timeoutmanager.cpp
View File

@@ -38,20 +38,20 @@ void XFTimeoutManager::addTimeout(XFTimeout *pNewTimeout) {
int rTime = 0; int rTime = 0;
int relInterval = 0; int relInterval = 0;
bool isEnd = true; bool isEnd = true;
int interval = dTime; int lTime = 0;
this->pMutex_->lock(); this->pMutex_->lock();
TimeoutList::iterator it = this->timeouts_.begin(); TimeoutList::iterator it = this->timeouts_.begin();
isEnd = (it == this->timeouts_.end()); isEnd = (it == this->timeouts_.end());
if(!isEnd){ if(!isEnd){
relInterval = (*it)->getInterval(); relInterval = (*it)->getRelTicks();
rTime += relInterval; rTime += relInterval;
} }
while(!isEnd && ( relInterval <= 0 || (rTime > dTime) )) { while(!isEnd && ( false || (rTime <= dTime) )) {
isEnd = (++it == this->timeouts_.end()); isEnd = (++it == this->timeouts_.end());
interval = rTime - dTime; lTime = rTime;
if(!isEnd) { if(!isEnd) {
relInterval = (*it)->getRelTicks(); relInterval = (*it)->getRelTicks();
rTime += relInterval; rTime += relInterval;
@@ -59,9 +59,9 @@ void XFTimeoutManager::addTimeout(XFTimeout *pNewTimeout) {
} }
if(it == this->timeouts_.begin()) if(it == this->timeouts_.begin())
if(!isEnd) (*it)->substractFromRelTicks(interval); if(!isEnd) (*it)->substractFromRelTicks(dTime-lTime);
it--; //it--;
pNewTimeout->setRelTicks(interval); pNewTimeout->setRelTicks(dTime-lTime);
this->timeouts_.insert(it, pNewTimeout); this->timeouts_.insert(it, pNewTimeout);
this->pMutex_->unlock(); this->pMutex_->unlock();
return; return;
@@ -112,12 +112,12 @@ void XFTimeoutManager::tick() {
while (!isEmpty && (rTime <= 0) ) { while (!isEmpty && (rTime <= 0) ) {
rTime = timeout->getRelTicks();
XFDispatcher::getInstance()->pushEvent(timeout); XFDispatcher::getInstance()->pushEvent(timeout);
this->timeouts_.pop_front(); this->timeouts_.pop_front();
timeout = this->timeouts_.front(); timeout = this->timeouts_.front();
isEmpty = this->timeouts_.empty(); isEmpty = this->timeouts_.empty();
if(!isEmpty) rTime = timeout->getRelTicks();
} }