rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-26 16:32:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

SLEEPQUEUE(9): Update due to API changes

Browse Source
This commit is contained in:
Sebastian Huber 2015-04-23 14:56:08 +02:00
parent c0b0b3ed11
commit 67f84974ad
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,7 +378,7 @@ sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags,
sq->sq_blockedcnt[queue]++; sq->sq_blockedcnt[queue]++;
#ifdef __rtems__ #ifdef __rtems__
executing = td->td_thread; executing = td->td_thread;
_Objects_ISR_disable_and_acquire(&executing->Object, &lock_context); _Thread_Lock_acquire_default(executing, &lock_context);
td->td_sq_state = TD_SQ_TIRED; td->td_sq_state = TD_SQ_TIRED;
#endif /* __rtems__ */ #endif /* __rtems__ */
td->td_sleepqueue = NULL; td->td_sleepqueue = NULL;
@ -392,7 +392,7 @@ sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags,
} }
thread_unlock(td); thread_unlock(td);
#else /* __rtems__ */ #else /* __rtems__ */
_Objects_Release_and_ISR_enable(&executing->Object, &lock_context); _Thread_Lock_release_default(executing, &lock_context);
#endif /* __rtems__ */ #endif /* __rtems__ */
} }
@ -608,7 +608,7 @@ sleepq_switch(void *wchan, int pri)
sleepq_release(wchan); sleepq_release(wchan);
executing = _Thread_Acquire_executing(&lock_context); executing = _Thread_Lock_acquire_default_for_executing(&lock_context);
td = rtems_bsd_get_thread(executing); td = rtems_bsd_get_thread(executing);
BSD_ASSERT(td != NULL); BSD_ASSERT(td != NULL);
@ -635,15 +635,14 @@ sleepq_switch(void *wchan, int pri)
Per_CPU_Control *cpu_self; Per_CPU_Control *cpu_self;
bool unblock; bool unblock;
cpu_self = _Objects_Release_and_thread_dispatch_disable( cpu_self = _Thread_Dispatch_disable_critical();
&executing->Object, &lock_context); _Thread_Lock_release_default(executing, &lock_context);
_Giant_Acquire(cpu_self); _Giant_Acquire(cpu_self);
_Thread_Set_state(executing, STATES_WAITING_FOR_BSD_WAKEUP); _Thread_Set_state(executing, STATES_WAITING_FOR_BSD_WAKEUP);
_Giant_Release(cpu_self); _Giant_Release(cpu_self);
_Objects_ISR_disable_and_acquire(&executing->Object, _Thread_Lock_acquire_default(executing, &lock_context);
&lock_context);
unblock = false; unblock = false;
switch (td->td_sq_state) { switch (td->td_sq_state) {
@ -664,8 +663,7 @@ sleepq_switch(void *wchan, int pri)
break; break;
} }
_Objects_Release_and_ISR_enable(&executing->Object, _Thread_Lock_release_default(executing, &lock_context);
&lock_context);
if (unblock) { if (unblock) {
_Giant_Acquire(cpu_self); _Giant_Acquire(cpu_self);
@ -676,8 +674,7 @@ sleepq_switch(void *wchan, int pri)
_Thread_Dispatch_enable(cpu_self); _Thread_Dispatch_enable(cpu_self);
_Objects_ISR_disable_and_acquire(&executing->Object, _Thread_Lock_acquire_default(executing, &lock_context);
&lock_context);
switch (td->td_sq_state) { switch (td->td_sq_state) {
case TD_SQ_NIGHTMARE: case TD_SQ_NIGHTMARE:
@ -692,8 +689,7 @@ sleepq_switch(void *wchan, int pri)
} }
} }
_Objects_Release_and_ISR_enable(&executing->Object, _Thread_Lock_release_default(executing, &lock_context);
&lock_context);
if (remove) { if (remove) {
sleepq_remove(td, wchan); sleepq_remove(td, wchan);
@ -927,7 +923,7 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
#ifdef __rtems__ #ifdef __rtems__
(void)sc; (void)sc;
thread = td->td_thread; thread = td->td_thread;
_Objects_ISR_disable_and_acquire(&thread->Object, &lock_context); _Thread_Lock_acquire_default(thread, &lock_context);
#endif /* __rtems__ */ #endif /* __rtems__ */
td->td_wmesg = NULL; td->td_wmesg = NULL;
@ -973,8 +969,8 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
if (unblock) { if (unblock) {
Per_CPU_Control *cpu_self; Per_CPU_Control *cpu_self;
cpu_self = _Objects_Release_and_thread_dispatch_disable( cpu_self = _Thread_Dispatch_disable_critical();
&thread->Object, &lock_context); _Thread_Lock_release_default(thread, &lock_context);
_Giant_Acquire(cpu_self); _Giant_Acquire(cpu_self);
_Watchdog_Remove(&thread->Timer); _Watchdog_Remove(&thread->Timer);
@ -983,8 +979,7 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
_Giant_Release(cpu_self); _Giant_Release(cpu_self);
_Thread_Dispatch_enable(cpu_self); _Thread_Dispatch_enable(cpu_self);
} else { } else {
_Objects_Release_and_ISR_enable(&thread->Object, _Thread_Lock_release_default(thread, &lock_context);
&lock_context);
} }
#endif /* __rtems__ */ #endif /* __rtems__ */
return (0); return (0);
@ -1185,7 +1180,7 @@ sleepq_timeout(Objects_Id id, void *arg)
td = rtems_bsd_get_thread(thread); td = rtems_bsd_get_thread(thread);
BSD_ASSERT(td != NULL); BSD_ASSERT(td != NULL);
_Objects_ISR_disable_and_acquire(&thread->Object, &lock_context); _Thread_Lock_acquire_default(thread, &lock_context);
unblock = false; unblock = false;
switch (td->td_sq_state) { switch (td->td_sq_state) {
@ -1204,8 +1199,8 @@ sleepq_timeout(Objects_Id id, void *arg)
if (unblock) { if (unblock) {
Per_CPU_Control *cpu_self; Per_CPU_Control *cpu_self;
cpu_self = _Objects_Release_and_thread_dispatch_disable( cpu_self = _Thread_Dispatch_disable_critical();
&thread->Object, &lock_context); _Thread_Lock_release_default(thread, &lock_context);
_Giant_Acquire(cpu_self); _Giant_Acquire(cpu_self);
_Thread_Clear_state(thread, STATES_WAITING_FOR_BSD_WAKEUP); _Thread_Clear_state(thread, STATES_WAITING_FOR_BSD_WAKEUP);
@ -1213,8 +1208,7 @@ sleepq_timeout(Objects_Id id, void *arg)
_Giant_Release(cpu_self); _Giant_Release(cpu_self);
_Thread_Dispatch_enable(cpu_self); _Thread_Dispatch_enable(cpu_self);
} else { } else {
_Objects_Release_and_ISR_enable(&thread->Object, _Thread_Lock_release_default(thread, &lock_context);
&lock_context);
} }
} }
#endif /* __rtems__ */ #endif /* __rtems__ */