rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-14 00:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

SLEEPQUEUE(9): Properly remove timeout timer

Browse Source
This commit is contained in:
Sebastian Huber 2016-11-23 14:17:25 +01:00
parent 616ffa9668
commit cfec446525
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freebsd/sys/kern/subr_sleepqueue.c
View File

@ -668,7 +668,6 @@ sleepq_switch(void *wchan, int pri)
_Thread_Wait_release_default(executing, &lock_context); _Thread_Wait_release_default(executing, &lock_context);
if (unblock) { if (unblock) {
_Thread_Timer_remove(executing);
_Thread_Clear_state(executing, STATES_WAITING_FOR_BSD_WAKEUP); _Thread_Clear_state(executing, STATES_WAITING_FOR_BSD_WAKEUP);
} }
@ -689,6 +688,7 @@ sleepq_switch(void *wchan, int pri)
} }
_Thread_Wait_release_default(executing, &lock_context); _Thread_Wait_release_default(executing, &lock_context);
_Thread_Timer_remove(executing);
if (remove) { if (remove) {
sleepq_remove(td, wchan); sleepq_remove(td, wchan);
@ -951,7 +951,7 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
return (setrunnable(td)); return (setrunnable(td));
} }
#else /* __rtems__ */ #else /* __rtems__ */
unblock = _Watchdog_Is_scheduled(&thread->Timer.Watchdog); unblock = false;
switch (td->td_sq_state) { switch (td->td_sq_state) {
case TD_SQ_SLEEPING: case TD_SQ_SLEEPING:
unblock = true; unblock = true;
@ -971,10 +971,7 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
cpu_self = _Thread_Dispatch_disable_critical(&lock_context); cpu_self = _Thread_Dispatch_disable_critical(&lock_context);
_Thread_Wait_release_default(thread, &lock_context); _Thread_Wait_release_default(thread, &lock_context);
_Thread_Timer_remove(thread);
_Thread_Clear_state(thread, STATES_WAITING_FOR_BSD_WAKEUP); _Thread_Clear_state(thread, STATES_WAITING_FOR_BSD_WAKEUP);
_Thread_Dispatch_direct(cpu_self); _Thread_Dispatch_direct(cpu_self);
} else { } else {
_Thread_Wait_release_default(thread, &lock_context); _Thread_Wait_release_default(thread, &lock_context);