X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..b36670cedae0009469e8ee117453de831de64a6b:/osfmk/kern/wait_queue.c?ds=sidebyside diff --git a/osfmk/kern/wait_queue.c b/osfmk/kern/wait_queue.c index 627bf793c..8faa4013f 100644 --- a/osfmk/kern/wait_queue.c +++ b/osfmk/kern/wait_queue.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -69,6 +69,18 @@ #include +/* forward declarations */ +static boolean_t wait_queue_member_locked( + wait_queue_t wq, + wait_queue_set_t wq_set); + +void wait_queue_unlink_one( + wait_queue_t wq, + wait_queue_set_t *wq_setp); + +kern_return_t wait_queue_set_unlink_all_nofree( + wait_queue_set_t wq_set); + /* * Routine: wait_queue_init * Purpose: @@ -114,7 +126,7 @@ wait_queue_alloc( if (wq != WAIT_QUEUE_NULL) { ret = wait_queue_init(wq, policy); if (ret != KERN_SUCCESS) { - kfree((vm_offset_t)wq, sizeof(struct wait_queue)); + kfree(wq, sizeof(struct wait_queue)); wq = WAIT_QUEUE_NULL; } } @@ -136,7 +148,7 @@ wait_queue_free( return KERN_INVALID_ARGUMENT; if (!queue_empty(&wq->wq_queue)) return KERN_FAILURE; - kfree((vm_offset_t)wq, sizeof(struct wait_queue)); + kfree(wq, sizeof(struct wait_queue)); return KERN_SUCCESS; } @@ -169,7 +181,7 @@ wait_queue_set_init( return KERN_SUCCESS; } -/* legacy API */ + kern_return_t wait_queue_sub_init( wait_queue_set_t wqset, @@ -178,6 +190,19 @@ wait_queue_sub_init( return wait_queue_set_init(wqset, policy); } +kern_return_t +wait_queue_sub_clearrefs( + wait_queue_set_t wq_set) +{ + if (!wait_queue_is_set(wq_set)) + return KERN_INVALID_ARGUMENT; + + wqs_lock(wq_set); + wq_set->wqs_refcount = 0; + wqs_unlock(wq_set); + return KERN_SUCCESS; +} + /* * Routine: wait_queue_set_alloc * Purpose: @@ -201,7 +226,7 @@ wait_queue_set_alloc( ret = wait_queue_set_init(wq_set, policy); if (ret != KERN_SUCCESS) { - kfree((vm_offset_t)wq_set, sizeof(struct wait_queue_set)); + kfree(wq_set, sizeof(struct wait_queue_set)); wq_set = WAIT_QUEUE_SET_NULL; } } @@ -225,22 +250,10 @@ wait_queue_set_free( if (!queue_empty(&wq_set->wqs_wait_queue.wq_queue)) return KERN_FAILURE; - kfree((vm_offset_t)wq_set, sizeof(struct wait_queue_set)); + kfree(wq_set, sizeof(struct wait_queue_set)); return KERN_SUCCESS; } -kern_return_t -wait_queue_sub_clearrefs( - wait_queue_set_t wq_set) -{ - if (!wait_queue_is_set(wq_set)) - return KERN_INVALID_ARGUMENT; - - wqs_lock(wq_set); - wq_set->wqs_refcount = 0; - wqs_unlock(wq_set); - return KERN_SUCCESS; -} /* * @@ -322,7 +335,7 @@ MACRO_END * The wait queue is locked * The set queue is just that, a set queue */ -__private_extern__ boolean_t +static boolean_t wait_queue_member_locked( wait_queue_t wq, wait_queue_set_t wq_set) @@ -408,14 +421,12 @@ wait_queue_link_noalloc( */ s = splsched(); wait_queue_lock(wq); - wqs_lock(wq_set); q = &wq->wq_queue; wq_element = (wait_queue_element_t) queue_first(q); while (!queue_end(q, (queue_entry_t)wq_element)) { WAIT_QUEUE_ELEMENT_CHECK(wq, wq_element); if (wq_element->wqe_type == WAIT_QUEUE_LINK && ((wait_queue_link_t)wq_element)->wql_setqueue == wq_set) { - wqs_unlock(wq_set); wait_queue_unlock(wq); splx(s); return KERN_ALREADY_IN_SET; @@ -427,6 +438,7 @@ wait_queue_link_noalloc( /* * Not already a member, so we can add it. */ + wqs_lock(wq_set); WAIT_QUEUE_SET_CHECK(wq_set); @@ -466,7 +478,7 @@ wait_queue_link( ret = wait_queue_link_noalloc(wq, wq_set, wql); if (ret != KERN_SUCCESS) - kfree((vm_offset_t)wql, sizeof(struct wait_queue_link)); + kfree(wql, sizeof(struct wait_queue_link)); return ret; } @@ -533,7 +545,7 @@ wait_queue_unlink( wqs_unlock(wq_set); wait_queue_unlock(wq); splx(s); - kfree((vm_offset_t)wql, sizeof(struct wait_queue_link)); + kfree(wql, sizeof(struct wait_queue_link)); return KERN_SUCCESS; } } @@ -653,7 +665,7 @@ wait_queue_unlink_all( while(!queue_empty(links)) { wql = (wait_queue_link_t) dequeue(links); - kfree((vm_offset_t) wql, sizeof(struct wait_queue_link)); + kfree(wql, sizeof(struct wait_queue_link)); } return(KERN_SUCCESS); @@ -676,7 +688,6 @@ wait_queue_set_unlink_all_nofree( wait_queue_link_t wql; wait_queue_t wq; queue_t q; - kern_return_t kret; spl_t s; if (!wait_queue_is_set(wq_set)) { @@ -736,7 +747,6 @@ wait_queue_set_unlink_all( queue_t q; queue_head_t links_queue_head; queue_t links = &links_queue_head; - kern_return_t kret; spl_t s; if (!wait_queue_is_set(wq_set)) { @@ -772,7 +782,7 @@ retry: while (!queue_empty (links)) { wql = (wait_queue_link_t) dequeue(links); - kfree((vm_offset_t)wql, sizeof(struct wait_queue_link)); + kfree(wql, sizeof(struct wait_queue_link)); } return(KERN_SUCCESS); } @@ -811,7 +821,7 @@ wait_queue_unlink_one( wqs_unlock(wq_set); wait_queue_unlock(wq); splx(s); - kfree((vm_offset_t)wql,sizeof(struct wait_queue_link)); + kfree(wql,sizeof(struct wait_queue_link)); *wq_setp = wq_set; return; } @@ -833,6 +843,7 @@ wait_queue_unlink_one( * * Conditions: * The wait queue is assumed locked. + * The waiting thread is assumed locked. * */ __private_extern__ wait_result_t @@ -840,18 +851,19 @@ wait_queue_assert_wait64_locked( wait_queue_t wq, event64_t event, wait_interrupt_t interruptible, - boolean_t unlock) + uint64_t deadline, + thread_t thread) { - thread_t thread; wait_result_t wait_result; + if (!wait_queue_assert_possible(thread)) + panic("wait_queue_assert_wait64_locked"); + if (wq->wq_type == _WAIT_QUEUE_SET_inited) { wait_queue_set_t wqs = (wait_queue_set_t)wq; - if (wqs->wqs_isprepost && wqs->wqs_refcount > 0) { - if (unlock) - wait_queue_unlock(wq); + + if (wqs->wqs_isprepost && wqs->wqs_refcount > 0) return(THREAD_AWAKENED); - } } /* @@ -860,20 +872,22 @@ wait_queue_assert_wait64_locked( * the front of the queue. Later, these queues will honor the policy * value set at wait_queue_init time. */ - thread = current_thread(); - thread_lock(thread); wait_result = thread_mark_wait_locked(thread, interruptible); if (wait_result == THREAD_WAITING) { - if (thread->vm_privilege) + if (thread->options & TH_OPT_VMPRIV) enqueue_head(&wq->wq_queue, (queue_entry_t) thread); else enqueue_tail(&wq->wq_queue, (queue_entry_t) thread); + thread->wait_event = event; thread->wait_queue = wq; + + if (deadline != 0) { + if (!timer_call_enter(&thread->wait_timer, deadline)) + thread->wait_timer_active++; + thread->wait_timer_is_set = TRUE; + } } - thread_unlock(thread); - if (unlock) - wait_queue_unlock(wq); return(wait_result); } @@ -890,23 +904,24 @@ wait_result_t wait_queue_assert_wait( wait_queue_t wq, event_t event, - wait_interrupt_t interruptible) + wait_interrupt_t interruptible, + uint64_t deadline) { spl_t s; wait_result_t ret; + thread_t thread = current_thread(); /* If it is an invalid wait queue, you can't wait on it */ - if (!wait_queue_is_valid(wq)) { - thread_t thread = current_thread(); + if (!wait_queue_is_valid(wq)) return (thread->wait_result = THREAD_RESTART); - } s = splsched(); wait_queue_lock(wq); - ret = wait_queue_assert_wait64_locked( - wq, (event64_t)((uint32_t)event), - interruptible, TRUE); - /* wait queue unlocked */ + thread_lock(thread); + ret = wait_queue_assert_wait64_locked(wq, (event64_t)((uint32_t)event), + interruptible, deadline, thread); + thread_unlock(thread); + wait_queue_unlock(wq); splx(s); return(ret); } @@ -923,26 +938,27 @@ wait_result_t wait_queue_assert_wait64( wait_queue_t wq, event64_t event, - wait_interrupt_t interruptible) + wait_interrupt_t interruptible, + uint64_t deadline) { spl_t s; wait_result_t ret; + thread_t thread = current_thread(); /* If it is an invalid wait queue, you cant wait on it */ - if (!wait_queue_is_valid(wq)) { - thread_t thread = current_thread(); + if (!wait_queue_is_valid(wq)) return (thread->wait_result = THREAD_RESTART); - } s = splsched(); wait_queue_lock(wq); - ret = wait_queue_assert_wait64_locked(wq, event, interruptible, TRUE); - /* wait queue unlocked */ + thread_lock(thread); + ret = wait_queue_assert_wait64_locked(wq, event, interruptible, deadline, thread); + thread_unlock(thread); + wait_queue_unlock(wq); splx(s); return(ret); } - /* * Routine: _wait_queue_select64_all * Purpose: @@ -1061,7 +1077,7 @@ wait_queue_wakeup64_all_locked( res = KERN_NOT_WAITING; while (!queue_empty (q)) { thread_t thread = (thread_t) dequeue(q); - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); thread_unlock(thread); } @@ -1195,8 +1211,7 @@ _wait_queue_select64_one( * the event we are posting to this queue, pull * it off the queue and stick it in out wake_queue. */ - thread_t t = (thread_t)wq_element; - + t = (thread_t)wq_element; if (t->wait_event == event) { thread_lock(t); remqueue(q, (queue_entry_t) t); @@ -1205,6 +1220,8 @@ _wait_queue_select64_one( t->at_safe_point = FALSE; return t; /* still locked */ } + + t = THREAD_NULL; } wq_element = wqe_next; } @@ -1238,7 +1255,6 @@ wait_queue_peek64_locked( { wait_queue_element_t wq_element; wait_queue_element_t wqe_next; - thread_t t; queue_t q; assert(wq->wq_fifo); @@ -1424,7 +1440,7 @@ wait_queue_wakeup64_identity_locked( wait_queue_unlock(wq); if (thread) { - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); } return thread; /* still locked if not NULL */ @@ -1463,7 +1479,7 @@ wait_queue_wakeup64_one_locked( if (thread) { kern_return_t res; - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); thread_unlock(thread); return res; @@ -1504,7 +1520,7 @@ wait_queue_wakeup_one( if (thread) { kern_return_t res; - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); thread_unlock(thread); splx(s); @@ -1546,7 +1562,7 @@ wait_queue_wakeup64_one( if (thread) { kern_return_t res; - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); thread_unlock(thread); splx(s); @@ -1600,7 +1616,7 @@ wait_queue_wakeup64_thread_locked( if (res != KERN_SUCCESS) return KERN_NOT_WAITING; - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); thread_unlock(thread); return res; @@ -1645,7 +1661,7 @@ wait_queue_wakeup_thread( wait_queue_unlock(wq); if (res == KERN_SUCCESS) { - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); thread_unlock(thread); splx(s); @@ -1694,7 +1710,7 @@ wait_queue_wakeup64_thread( wait_queue_unlock(wq); if (res == KERN_SUCCESS) { - res = thread_go_locked(thread, result); + res = thread_go(thread, result); assert(res == KERN_SUCCESS); thread_unlock(thread); splx(s);