Skip to content

Commit 7a78882

Browse files
author
Arto Kinnunen
committed
Squashed 'features/nanostack/sal-stack-nanostack-eventloop/' changes from b8b664b..7745556
7745556 Fix post-event state change for user events git-subtree-dir: features/nanostack/sal-stack-nanostack-eventloop git-subtree-split: 7745556bcce16b50923a7d774a161312418c1e6d
1 parent 99c2f61 commit 7a78882

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

source/event.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,23 +179,25 @@ arm_event_storage_t *event_core_get(void)
179179

180180
void event_core_free_push(arm_event_storage_t *free)
181181
{
182-
free->state = ARM_LIB_EVENT_UNQUEUED;
183-
184182
switch (free->allocator) {
185183
case ARM_LIB_EVENT_STARTUP_POOL:
184+
free->state = ARM_LIB_EVENT_UNQUEUED;
186185
platform_enter_critical();
187186
ns_list_add_to_start(&free_event_entry, free);
188187
platform_exit_critical();
189188
break;
190189
case ARM_LIB_EVENT_DYNAMIC:
191190
// Free all dynamically allocated events.
191+
// No need to set state to UNQUEUED - it's being freed.
192192
ns_dyn_mem_free(free);
193193
break;
194194
case ARM_LIB_EVENT_TIMER:
195195
// Hand it back to the timer system
196+
free->state = ARM_LIB_EVENT_UNQUEUED;
196197
timer_sys_event_free(free);
197198
break;
198199
case ARM_LIB_EVENT_USER:
200+
// No need set state to UNQUEUED - we forget about it.
199201
default:
200202
break;
201203
}

0 commit comments

Comments
 (0)