/*
- * Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
*
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* Please see the License for the specific language governing rights and
* limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
* Mach Operating System
#include <kern/task.h>
#include <mach/time_value.h>
-#include <kern/lock.h>
+#include <kern/locks.h>
+
+#include <sys/systm.h> /* for unix_syscall_return() */
+#include <libkern/OSAtomic.h>
+
+extern void compute_averunnable(void *); /* XXX */
-#if KTRACE
-#include <sys/uio.h>
-#include <sys/ktrace.h>
-#endif
static void
-_sleep_continue(
- void *parameter,
- wait_result_t wresult)
+_sleep_continue( __unused void *parameter, wait_result_t wresult)
{
- register struct proc *p = current_proc();
- register thread_t self = current_thread();
+ struct proc *p = current_proc();
+ thread_t self = current_thread();
struct uthread * ut;
int sig, catch;
int error = 0;
- int dropmutex;
+ int dropmutex, spinmutex;
ut = get_bsdthread_info(self);
catch = ut->uu_pri & PCATCH;
dropmutex = ut->uu_pri & PDROP;
+ spinmutex = ut->uu_pri & PSPIN;
switch (wresult) {
case THREAD_TIMED_OUT:
if (thread_should_abort(self)) {
error = EINTR;
} else if (SHOULDissignal(p,ut)) {
- if (sig = CURSIG(p)) {
+ if ((sig = CURSIG(p)) != 0) {
if (p->p_sigacts->ps_sigintr & sigmask(sig))
error = EINTR;
else
if (error == EINTR || error == ERESTART)
act_set_astbsd(self);
-#if KTRACE
- if (KTRPOINT(p, KTR_CSW))
- ktrcsw(p->p_tracep, 0, 0);
-#endif
- if (ut->uu_mtx && !dropmutex)
- lck_mtx_lock(ut->uu_mtx);
+ if (ut->uu_mtx && !dropmutex) {
+ if (spinmutex)
+ lck_mtx_lock_spin(ut->uu_mtx);
+ else
+ lck_mtx_lock(ut->uu_mtx);
+ }
+ ut->uu_wchan = NULL;
+ ut->uu_wmesg = NULL;
unix_syscall_return((*ut->uu_continuation)(error));
}
int (*continuation)(int),
lck_mtx_t *mtx)
{
- register struct proc *p;
- register thread_t self = current_thread();
+ struct proc *p;
+ thread_t self = current_thread();
struct uthread * ut;
- int sig, catch = pri & PCATCH;
+ int sig, catch;
int dropmutex = pri & PDROP;
+ int spinmutex = pri & PSPIN;
int wait_result;
int error = 0;
ut = get_bsdthread_info(self);
p = current_proc();
-#if KTRACE
- if (KTRPOINT(p, KTR_CSW))
- ktrcsw(p->p_tracep, 1, 0);
-#endif
p->p_priority = pri & PRIMASK;
- p->p_stats->p_ru.ru_nvcsw++;
+ /* It can still block in proc_exit() after the teardown. */
+ if (p->p_stats != NULL)
+ OSIncrementAtomicLong(&p->p_stats->p_ru.ru_nvcsw);
+
+ if (pri & PCATCH)
+ catch = THREAD_ABORTSAFE;
+ else
+ catch = THREAD_UNINT;
+
+ /* set wait message & channel */
+ ut->uu_wchan = chan;
+ ut->uu_wmesg = wmsg ? wmsg : "unknown";
if (mtx != NULL && chan != NULL && (thread_continue_t)continuation == THREAD_CONTINUE_NULL) {
+ int flags;
+
+ if (dropmutex)
+ flags = LCK_SLEEP_UNLOCK;
+ else
+ flags = LCK_SLEEP_DEFAULT;
+
+ if (spinmutex)
+ flags |= LCK_SLEEP_SPIN;
if (abstime)
- wait_result = lck_mtx_sleep_deadline(mtx, (dropmutex) ? LCK_SLEEP_UNLOCK : 0,
- chan, (catch) ? THREAD_ABORTSAFE : THREAD_UNINT, abstime);
+ wait_result = lck_mtx_sleep_deadline(mtx, flags, chan, catch, abstime);
else
- wait_result = lck_mtx_sleep(mtx, (dropmutex) ? LCK_SLEEP_UNLOCK : 0,
- chan, (catch) ? THREAD_ABORTSAFE : THREAD_UNINT);
+ wait_result = lck_mtx_sleep(mtx, flags, chan, catch);
}
else {
if (chan != NULL)
- assert_wait_deadline(chan, (catch) ? THREAD_ABORTSAFE : THREAD_UNINT, abstime);
+ assert_wait_deadline(chan, catch, abstime);
if (mtx)
lck_mtx_unlock(mtx);
- if (catch) {
+
+ if (catch == THREAD_ABORTSAFE) {
if (SHOULDissignal(p,ut)) {
- if (sig = CURSIG(p)) {
+ if ((sig = CURSIG(p)) != 0) {
if (clear_wait(self, THREAD_INTERRUPTED) == KERN_FAILURE)
goto block;
- /* if SIGTTOU or SIGTTIN then block till SIGCONT */
- if ((pri & PTTYBLOCK) && ((sig == SIGTTOU) || (sig == SIGTTIN))) {
- p->p_flag |= P_TTYSLEEP;
- /* reset signal bits */
- clear_procsiglist(p, sig);
- assert_wait(&p->p_siglist, THREAD_ABORTSAFE);
- /* assert wait can block and SIGCONT should be checked */
- if (p->p_flag & P_TTYSLEEP) {
- thread_block(THREAD_CONTINUE_NULL);
-
- if (mtx && !dropmutex)
- lck_mtx_lock(mtx);
- }
-
- /* return with success */
- error = 0;
- goto out;
- }
if (p->p_sigacts->ps_sigintr & sigmask(sig))
error = EINTR;
else
error = ERESTART;
- if (mtx && !dropmutex)
- lck_mtx_lock(mtx);
+ if (mtx && !dropmutex) {
+ if (spinmutex)
+ lck_mtx_lock_spin(mtx);
+ else
+ lck_mtx_lock(mtx);
+ }
goto out;
}
}
goto block;
error = EINTR;
- if (mtx && !dropmutex)
- lck_mtx_lock(mtx);
+ if (mtx && !dropmutex) {
+ if (spinmutex)
+ lck_mtx_lock_spin(mtx);
+ else
+ lck_mtx_lock(mtx);
+ }
goto out;
}
}
wait_result = thread_block(THREAD_CONTINUE_NULL);
- if (mtx && !dropmutex)
- lck_mtx_lock(mtx);
+ if (mtx && !dropmutex) {
+ if (spinmutex)
+ lck_mtx_lock_spin(mtx);
+ else
+ lck_mtx_lock(mtx);
+ }
}
switch (wait_result) {
* first, regardless of whether awakened due
* to receiving event.
*/
- if (!catch)
+ if (catch != THREAD_ABORTSAFE)
break;
/* else fall through */
case THREAD_INTERRUPTED:
- if (catch) {
+ if (catch == THREAD_ABORTSAFE) {
if (thread_should_abort(self)) {
error = EINTR;
} else if (SHOULDissignal(p, ut)) {
- if (sig = CURSIG(p)) {
+ if ((sig = CURSIG(p)) != 0) {
if (p->p_sigacts->ps_sigintr & sigmask(sig))
error = EINTR;
else
if (thread_should_abort(self)) {
error = EINTR;
}
- }
+ } else if( (ut->uu_flag & ( UT_CANCELDISABLE | UT_CANCEL | UT_CANCELED)) == UT_CANCEL) {
+ /* due to thread cancel */
+ error = EINTR;
+ }
} else
error = EINTR;
break;
out:
if (error == EINTR || error == ERESTART)
act_set_astbsd(self);
+ ut->uu_wchan = NULL;
+ ut->uu_wmesg = NULL;
-#if KTRACE
- if (KTRPOINT(p, KTR_CSW))
- ktrcsw(p->p_tracep, 0, 0);
-#endif
return (error);
}
* Wake up all processes sleeping on chan.
*/
void
-wakeup(chan)
- register void *chan;
+wakeup(void *chan)
{
- thread_wakeup_prim((caddr_t)chan, FALSE, THREAD_AWAKENED);
+ thread_wakeup((caddr_t)chan);
}
/*
* the right one to wakeup.
*/
void
-wakeup_one(chan)
- register caddr_t chan;
+wakeup_one(caddr_t chan)
{
- thread_wakeup_prim((caddr_t)chan, TRUE, THREAD_AWAKENED);
+ thread_wakeup_one((caddr_t)chan);
}
/*
* than that of the current process.
*/
void
-resetpriority(p)
- register struct proc *p;
+resetpriority(struct proc *p)
{
(void)task_importance(p->task, -p->p_nice);
}
};
void
-compute_averunnable(
- void *arg)
+compute_averunnable(void *arg)
{
unsigned int nrun = *(unsigned int *)arg;
struct loadavg *avg = &averunnable;
- register int i;
+ int i;
for (i = 0; i < 3; i++)
avg->ldavg[i] = (cexp[i] * avg->ldavg[i] +
projects / apple / xnu.git / blobdiff