ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

user allocated events: fix event cancelling 

for user allocated events use id for event state tracking
skip event canceling when already canceled or dispatched
pull/12319/head
Maciej Bocianski 2020-01-24 12:33:17 +01:00
parent acfdc588af
commit b4fac71325
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
events/UserAllocatedEvent.h
View File

@ -243,7 +243,7 @@ public:
*/ */
bool cancel() bool cancel()
{ {
return equeue_cancel_user_allocated(_equeue, &_e); return _post_ref > 0 ? equeue_cancel_user_allocated(_equeue, &_e) : false;
} }

13
events/source/equeue.c
View File

@ -24,6 +24,12 @@
// check if the event is allocaded by user - event address is outside queues internal buffer address range // check if the event is allocaded by user - event address is outside queues internal buffer address range
#define EQUEUE_IS_USER_ALLOCATED_EVENT(e) ((q->buffer == NULL) || ((uintptr_t)(e) < (uintptr_t)q->buffer) || ((uintptr_t)(e) > ((uintptr_t)q->slab.data))) #define EQUEUE_IS_USER_ALLOCATED_EVENT(e) ((q->buffer == NULL) || ((uintptr_t)(e) < (uintptr_t)q->buffer) || ((uintptr_t)(e) > ((uintptr_t)q->slab.data)))
// for user allocated events use event id to track event state
enum {
EQUEUE_USER_ALLOCATED_EVENT_STATE_INPROGRESS = 1,
EQUEUE_USER_ALLOCATED_EVENT_STATE_DONE = 0 // event canceled or dispatching done
};
// calculate the relative-difference between absolute times while // calculate the relative-difference between absolute times while
// correctly handling overflow conditions // correctly handling overflow conditions
static inline int equeue_tickdiff(unsigned a, unsigned b) static inline int equeue_tickdiff(unsigned a, unsigned b)
@ -229,7 +235,9 @@ void equeue_dealloc(equeue_t *q, void *p)
e->dtor(e + 1); e->dtor(e + 1);
} }
if (!EQUEUE_IS_USER_ALLOCATED_EVENT(e)) { if (EQUEUE_IS_USER_ALLOCATED_EVENT(e)) {
e->id = EQUEUE_USER_ALLOCATED_EVENT_STATE_DONE;
} else {
equeue_mem_dealloc(q, e); equeue_mem_dealloc(q, e);
} }
} }
@ -402,6 +410,7 @@ void equeue_post_user_allocated(equeue_t *q, void (*cb)(void *), void *p)
unsigned tick = equeue_tick(); unsigned tick = equeue_tick();
e->cb = cb; e->cb = cb;
e->target = tick + e->target; e->target = tick + e->target;
e->id = EQUEUE_USER_ALLOCATED_EVENT_STATE_INPROGRESS;
equeue_enqueue(q, e, tick); equeue_enqueue(q, e, tick);
equeue_sema_signal(&q->eventsema); equeue_sema_signal(&q->eventsema);
@ -424,7 +433,7 @@ bool equeue_cancel(equeue_t *q, int id)
bool equeue_cancel_user_allocated(equeue_t *q, void *e) bool equeue_cancel_user_allocated(equeue_t *q, void *e)
{ {
if (!e) { if (!e || ((struct equeue_event *)e)->id == EQUEUE_USER_ALLOCATED_EVENT_STATE_DONE) {
return false; return false;
} }