Compare commits
3 Commits
c1b4baeb2e
...
main
Author | SHA1 | Date | |
---|---|---|---|
c9d2c05b73 | |||
c07c47385e | |||
68fd8440fc |
BIN
UML/event.png
Normal file
BIN
UML/event.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 44 KiB |
55
UML/event.puml
Normal file
55
UML/event.puml
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
@startuml
|
||||||
|
|
||||||
|
participant Behavior as b
|
||||||
|
participant Dispatcher as d
|
||||||
|
entity Event as e
|
||||||
|
participant EventQueue as eq
|
||||||
|
queue "EventQueue::queue_" as q
|
||||||
|
|
||||||
|
== Create an Event ==
|
||||||
|
|||
|
||||||
|
?->> b ++ : GEN
|
||||||
|
b -> e ** : new
|
||||||
|
b -> b --++ : pushEvent
|
||||||
|
e -> b : getBehavior
|
||||||
|
b --> e ++: setBehavior
|
||||||
|
e --> b --
|
||||||
|
b -> d ++ : getDispatcher
|
||||||
|
d --> b
|
||||||
|
b -> d -- : pushEvent
|
||||||
|
d ->? -- : push
|
||||||
|
|
||||||
|
|
||||||
|
|||
|
||||||
|
|||
|
||||||
|
== Push Event ==
|
||||||
|
|||
|
||||||
|
?->> d ++: pushEvent
|
||||||
|
d -> eq--++: push
|
||||||
|
eq -> q ++
|
||||||
|
q --> eq
|
||||||
|
eq -> q -- : pushEndQueue
|
||||||
|
|
||||||
|
|||
|
||||||
|
|||
|
||||||
|
== Dispatch ==
|
||||||
|
|||
|
||||||
|
?->> d ++: executeOnce
|
||||||
|
d -> q : getFront
|
||||||
|
q -> e ++
|
||||||
|
e --> q
|
||||||
|
q --> d : event
|
||||||
|
d -> q : pop
|
||||||
|
deactivate q
|
||||||
|
d -> d --++ : dispatchEvent
|
||||||
|
d -> b ++ : getBehavior
|
||||||
|
b --> d
|
||||||
|
d -> b -- : process
|
||||||
|
b -> b--: processEvent
|
||||||
|
|
||||||
|
destroy e
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@enduml
|
BIN
UML/timeout.png
Normal file
BIN
UML/timeout.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 63 KiB |
62
UML/timeout.puml
Normal file
62
UML/timeout.puml
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
@startuml
|
||||||
|
|
||||||
|
participant "Behavior::StateMachine" as sm
|
||||||
|
participant Dispatcher as d
|
||||||
|
participant TimeoutManager as tm
|
||||||
|
entity "Event::Timeout" as t
|
||||||
|
queue "TimeoutManager::timeouts_" as timeouts
|
||||||
|
|
||||||
|
autoactivate off
|
||||||
|
|||
|
||||||
|
|||
|
||||||
|
== Schedule timeout ==
|
||||||
|
|||
|
||||||
|
sm -> sm++ : scheduleTimeout
|
||||||
|
sm -> d ++: getDispatcher
|
||||||
|
d --> sm --: dispatcher
|
||||||
|
sm -> d --++ : scheduleTimeout
|
||||||
|
d -> tm ++: getTimeoutManager
|
||||||
|
tm --> d --: timeoutManager
|
||||||
|
d -> tm --++ : scheduleTimeout
|
||||||
|
tm -> t ** : new
|
||||||
|
t --> tm
|
||||||
|
tm -> timeouts --++: insert
|
||||||
|
|
||||||
|
|||
|
||||||
|
|||
|
||||||
|
== Decrement timeout (and dispatch) ==
|
||||||
|
|||
|
||||||
|
loop every tickInterval
|
||||||
|
?->> tm ++: tick
|
||||||
|
tm -> timeouts : getFront
|
||||||
|
timeouts -> t ++
|
||||||
|
t --> timeouts
|
||||||
|
timeouts --> tm : timeout
|
||||||
|
tm -> t --: decrement
|
||||||
|
end
|
||||||
|
|||
|
||||||
|
note left t
|
||||||
|
When timeout is 0,
|
||||||
|
dispatch event
|
||||||
|
end note
|
||||||
|
t -> timeouts : pop
|
||||||
|
deactivate timeouts
|
||||||
|
t ->? --: pushEvent
|
||||||
|
|
||||||
|
|||
|
||||||
|
|||
|
||||||
|
== Unschedule timeout ==
|
||||||
|
|||
|
||||||
|
sm -> sm++ : unscheduleTimeout
|
||||||
|
sm -> d ++: getDispatcher
|
||||||
|
d --> sm --: dispatcher
|
||||||
|
sm -> d --++ : unscheduleTimeout
|
||||||
|
d -> tm ++: getTimeoutManager
|
||||||
|
tm --> d --: timeoutManager
|
||||||
|
d -> tm --++ : unscheduleTimeout
|
||||||
|
tm -> timeouts --: erase
|
||||||
|
timeouts -> t !!
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@enduml
|
35
readme.md
35
readme.md
@ -8,38 +8,17 @@
|
|||||||
|
|
||||||
# Time Algorithm
|
# Time Algorithm
|
||||||
|
|
||||||
```plantuml
|
|
||||||
@startuml
|
|
||||||
|
|
||||||
start
|
|
||||||
:newTime = 0
|
|
||||||
totalTime = 0
|
|
||||||
isEnd = it == list.end()
|
|
||||||
lastTime = 0;
|
|
||||||
|
|
||||||
#tomato:if (!isEnd) then (not end)
|
|
||||||
#tomato:totalTime += it.getRelTicks();
|
|
||||||
endif
|
|
||||||
|
|
||||||
while ( !isEnd && (totalTime <= newTime) ) is (goForward)
|
|
||||||
:isEnd = (++it == list.end());
|
|
||||||
:lastTime = totalTime;
|
|
||||||
#tomato:if (!isEnd) then (not end)
|
|
||||||
#tomato:totalTime += it.getRelTicks();
|
|
||||||
endif
|
|
||||||
endwhile
|
|
||||||
|
|
||||||
#tomato:if (!isEnd) then (not end)
|
|
||||||
#tomato:subRelTicks(newTime- lastTime);
|
|
||||||
endif
|
|
||||||
:it.setRelTicks(newTime - lastTime);
|
|
||||||
:insert(it, newTimeout);
|
|
||||||
|
|
||||||
@enduml
|
|
||||||
```
|
|
||||||
<img src="./UML/timeAlgorithme.png">
|
<img src="./UML/timeAlgorithme.png">
|
||||||
|
|
||||||
|
# Sequence Diagrams
|
||||||
|
## Timeout
|
||||||
|
|
||||||
|
<img src="./UML/timeout.png">
|
||||||
|
|
||||||
|
## Event
|
||||||
|
|
||||||
|
<img src="./UML/event.png">
|
||||||
|
|
||||||
# Tests
|
# Tests
|
||||||
## Test 1
|
## Test 1
|
||||||
|
@ -16,6 +16,12 @@ void XFBehavior::startBehavior() {
|
|||||||
GEN(XFInitialEvent());
|
GEN(XFInitialEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Pushes the given event to the dispatcher.
|
||||||
|
*
|
||||||
|
* If the event has no behavior assigned, the behavior of this object is assigned.
|
||||||
|
* @param pEvent Event to push to the dispatcher.
|
||||||
|
*/
|
||||||
void XFBehavior::pushEvent(XFEvent *pEvent) {
|
void XFBehavior::pushEvent(XFEvent *pEvent) {
|
||||||
if(pEvent->getBehavior()==nullptr) {
|
if(pEvent->getBehavior()==nullptr) {
|
||||||
pEvent->setBehavior(this);
|
pEvent->setBehavior(this);
|
||||||
@ -39,6 +45,13 @@ interface::XFDispatcher *XFBehavior::getDispatcher() {
|
|||||||
return interface::XFDispatcher::getInstance();
|
return interface::XFDispatcher::getInstance();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Returns a reference to the actually processed timeout.
|
||||||
|
*
|
||||||
|
* Will work only if the current event is of type IXFEvent::Timeout.
|
||||||
|
*
|
||||||
|
* @return Pointer to the currently processed timeout or nullptr if the current event is not a timeout.
|
||||||
|
*/
|
||||||
const XFTimeout *XFBehavior::getCurrentTimeout() {
|
const XFTimeout *XFBehavior::getCurrentTimeout() {
|
||||||
if(pCurrentEvent_->getEventType() == XFEvent::Timeout) {
|
if(pCurrentEvent_->getEventType() == XFEvent::Timeout) {
|
||||||
return (XFTimeout*) this->pCurrentEvent_;
|
return (XFTimeout*) this->pCurrentEvent_;
|
||||||
@ -51,13 +64,33 @@ void XFBehavior::setCurrentEvent(const XFEvent *pEvent) {
|
|||||||
this->pCurrentEvent_ = pEvent;
|
this->pCurrentEvent_ = pEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Processes the given event.
|
||||||
|
*
|
||||||
|
* The dispatcher calls this method every time a new event
|
||||||
|
* or timeout arrives. The process method stores the actual
|
||||||
|
* event using the #_pCurrentEvent and then calls
|
||||||
|
* processEvent().
|
||||||
|
*
|
||||||
|
* In case you intend to call process() inside your state machine you
|
||||||
|
* are doing something wrong! Call GEN() or pushEvent() instead!
|
||||||
|
*
|
||||||
|
* @param pEvent Event to process
|
||||||
|
* @return if the behavior is terminated (basically a boolean)
|
||||||
|
*/
|
||||||
XFBehavior::TerminateBehavior XFBehavior::process(const XFEvent *pEvent) {
|
XFBehavior::TerminateBehavior XFBehavior::process(const XFEvent *pEvent) {
|
||||||
this->setCurrentEvent(pEvent);
|
this->setCurrentEvent(pEvent);
|
||||||
|
|
||||||
|
// Get status of the event processing
|
||||||
XFEventStatus status = XFEventStatus::Unknown;
|
XFEventStatus status = XFEventStatus::Unknown;
|
||||||
status = this->processEvent();
|
status = this->processEvent();
|
||||||
|
|
||||||
|
// Check if event was consumed and if it should be deleted
|
||||||
if(status == XFEventStatus::Consumed && pEvent->deleteAfterConsume()) {
|
if(status == XFEventStatus::Consumed && pEvent->deleteAfterConsume()) {
|
||||||
delete pEvent;
|
delete pEvent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if the behavior is terminated and return the result
|
||||||
XFBehavior::TerminateBehavior terminateBehavior = false;
|
XFBehavior::TerminateBehavior terminateBehavior = false;
|
||||||
if(status == XFEventStatus::Terminate) {
|
if(status == XFEventStatus::Terminate) {
|
||||||
terminateBehavior = true;
|
terminateBehavior = true;
|
||||||
|
Reference in New Issue
Block a user