ccn-lite-riot: remove message from queue on remove interest #359
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cgundogan
reviewed
Jun 14, 2019
| @@ -342,6 +342,15 @@ static inline void ccnl_riot_interest_remove(evtimer_t *et, struct ccnl_interest | |||
| { | |||
| evtimer_del(et, (evtimer_event_t *)&i->evtmsg_retrans); | |||
| evtimer_del(et, (evtimer_event_t *)&i->evtmsg_timeout); | |||
|
|
|||
| /* remove messages that relate to this interest from the message queue */ | |||
| thread_t *me = (thread_t*) sched_threads[sched_active_pid]; | |||
There was a problem hiding this comment.
I wonder whether we should disable interrupts while iterating the message queue?
There was a problem hiding this comment.
Yes. I've added that and amended to the first commit.
PeterKietzmann
force-pushed
the
pr_remove_msg
branch
from
22ef89e
to
bb66d55
Compare
PeterKietzmann
commented
Jun 17, 2019
| unsigned state = irq_disable(); | ||
| /* remove messages that relate to this interest from the message queue */ | ||
| thread_t *me = (thread_t*) sched_threads[sched_active_pid]; | ||
| for (unsigned j = 0; j <= me->msg_queue.mask; j++) { |
There was a problem hiding this comment.
On an iotlab-m3 node this takes around 4-7 us with a message queue length of 8.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contribution description
This PR removes any message that relates to an Interest from the RIOT message queue of the the CCN-lite thread, when removing this Interest (i.e., by
ccnl_interest_remove()). This fixes a rare case that occurs when a retransmission message is queued and can't be processed before the pending Interest is satisfied, which will callccnl_interest_remove(). Without this fix, the message will be processed at some point and reference an Interest that doesn't exist anymore.