/*
- * Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * @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 <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/proc_internal.h>
#include <sys/user.h>
-#include <sys/file.h>
+#include <sys/file_internal.h>
#include <sys/vnode.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
#include <machine/spl.h>
#include <kern/task.h>
#include <mach/time_value.h>
+#include <kern/lock.h>
+
+#include <sys/systm.h> /* for unix_syscall_return() */
+#include <libkern/OSAtomic.h>
+
+extern boolean_t thread_should_abort(thread_t); /* XXX */
+extern void compute_averunnable(void *); /* XXX */
+
-#if KTRACE
-#include <sys/uio.h>
-#include <sys/ktrace.h>
-#endif
static void
-_sleep_continue(void)
+_sleep_continue( __unused void *parameter, wait_result_t wresult)
{
- register struct proc *p;
- register thread_t thread = current_thread();
- thread_act_t th_act;
+ struct proc *p = current_proc();
+ thread_t self = current_thread();
struct uthread * ut;
int sig, catch;
int error = 0;
+ int dropmutex;
- th_act = current_act();
- ut = get_bsdthread_info(th_act);
- catch = ut->uu_pri & PCATCH;
- p = current_proc();
+ ut = get_bsdthread_info(self);
+ catch = ut->uu_pri & PCATCH;
+ dropmutex = ut->uu_pri & PDROP;
-#if FIXME /* [ */
- thread->wait_mesg = NULL;
-#endif /* FIXME ] */
- switch (get_thread_waitresult(thread)) {
+ switch (wresult) {
case THREAD_TIMED_OUT:
error = EWOULDBLOCK;
break;
/* else fall through */
case THREAD_INTERRUPTED:
if (catch) {
- if (thread_should_abort(current_thread())) {
+ 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
error = ERESTART;
}
- if (thread_should_abort(current_thread())) {
+ 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;
}
if (error == EINTR || error == ERESTART)
- act_set_astbsd(th_act);
+ act_set_astbsd(self);
- if (ut->uu_timo)
- thread_cancel_timer();
+ if (ut->uu_mtx && !dropmutex)
+ lck_mtx_lock(ut->uu_mtx);
-#if KTRACE
- if (KTRPOINT(p, KTR_CSW))
- ktrcsw(p->p_tracep, 0, 0, -1);
-#endif
+ ut->uu_wchan = NULL;
+ ut->uu_wmesg = NULL;
unix_syscall_return((*ut->uu_continuation)(error));
}
* Callers of this routine must be prepared for
* premature return, and check that the reason for
* sleeping has gone away.
+ *
+ * if msleep was the entry point, than we have a mutex to deal with
+ *
+ * The mutex is unlocked before the caller is blocked, and
+ * relocked before msleep returns unless the priority includes the PDROP
+ * flag... if PDROP is specified, _sleep returns with the mutex unlocked
+ * regardless of whether it actually blocked or not.
*/
static int
_sleep(
caddr_t chan,
- int pri,
- char *wmsg,
+ int pri,
+ const char *wmsg,
u_int64_t abstime,
- int (*continuation)(int))
+ int (*continuation)(int),
+ lck_mtx_t *mtx)
{
- register struct proc *p;
- register thread_t thread = current_thread();
- thread_act_t th_act;
+ struct proc *p;
+ thread_t self = current_thread();
struct uthread * ut;
int sig, catch = pri & PCATCH;
- int sigttblock = pri & PTTYBLOCK;
+ int dropmutex = pri & PDROP;
int wait_result;
int error = 0;
- spl_t s;
- s = splhigh();
+ ut = get_bsdthread_info(self);
- th_act = current_act();
- ut = get_bsdthread_info(th_act);
-
p = current_proc();
-#if KTRACE
- if (KTRPOINT(p, KTR_CSW))
- ktrcsw(p->p_tracep, 1, 0, -1);
-#endif
p->p_priority = pri & PRIMASK;
-
- if (chan)
- wait_result = assert_wait(chan,
- (catch) ? THREAD_ABORTSAFE : THREAD_UNINT);
-
- if (abstime)
- thread_set_timer_deadline(abstime);
-
- /*
- * We start our timeout
- * before calling CURSIG, as we could stop there, and a wakeup
- * or a SIGCONT (or both) could occur while we were stopped.
- * A SIGCONT would cause us to be marked as SSLEEP
- * without resuming us, thus we must be ready for sleep
- * when CURSIG is called. If the wakeup happens while we're
- * stopped, p->p_wchan will be 0 upon return from CURSIG.
- */
- if (catch) {
- if (SHOULDissignal(p,ut)) {
- if (sig = CURSIG(p)) {
- clear_wait(thread, THREAD_INTERRUPTED);
- /* if SIGTTOU or SIGTTIN then block till SIGCONT */
- if (sigttblock && ((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);
- /* return with success */
- error = 0;
+ /* It can still block in proc_exit() after the teardown. */
+ if (p->p_stats != NULL)
+ OSIncrementAtomic(&p->p_stats->p_ru.ru_nvcsw);
+
+ /* 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) {
+
+ if (abstime)
+ wait_result = lck_mtx_sleep_deadline(mtx, (dropmutex) ? LCK_SLEEP_UNLOCK : 0,
+ chan, (catch) ? THREAD_ABORTSAFE : THREAD_UNINT, abstime);
+ else
+ wait_result = lck_mtx_sleep(mtx, (dropmutex) ? LCK_SLEEP_UNLOCK : 0,
+ chan, (catch) ? THREAD_ABORTSAFE : THREAD_UNINT);
+ }
+ else {
+ if (chan != NULL)
+ assert_wait_deadline(chan, (catch) ? THREAD_ABORTSAFE : THREAD_UNINT, abstime);
+ if (mtx)
+ lck_mtx_unlock(mtx);
+ if (catch) {
+ if (SHOULDissignal(p,ut)) {
+ if ((sig = CURSIG(p)) != 0) {
+ if (clear_wait(self, THREAD_INTERRUPTED) == KERN_FAILURE)
+ goto block;
+ if (p->p_sigacts->ps_sigintr & sigmask(sig))
+ error = EINTR;
+ else
+ error = ERESTART;
+ if (mtx && !dropmutex)
+ lck_mtx_lock(mtx);
goto out;
}
- if (p->p_sigacts->ps_sigintr & sigmask(sig))
- error = EINTR;
- else
- error = ERESTART;
+ }
+ if (thread_should_abort(self)) {
+ if (clear_wait(self, THREAD_INTERRUPTED) == KERN_FAILURE)
+ goto block;
+ error = EINTR;
+
+ if (mtx && !dropmutex)
+ lck_mtx_lock(mtx);
goto out;
}
+ }
+
+
+block:
+ if ((thread_continue_t)continuation != THREAD_CONTINUE_NULL) {
+ ut->uu_continuation = continuation;
+ ut->uu_pri = pri;
+ ut->uu_timo = abstime? 1: 0;
+ ut->uu_mtx = mtx;
+ (void) thread_block(_sleep_continue);
+ /* NOTREACHED */
}
- if (thread_should_abort(current_thread())) {
- clear_wait(thread, THREAD_INTERRUPTED);
- error = EINTR;
- goto out;
- }
- if (get_thread_waitresult(thread) != THREAD_WAITING) {
- /*already happened */
- goto out;
- }
- }
+
+ wait_result = thread_block(THREAD_CONTINUE_NULL);
-#if FIXME /* [ */
- thread->wait_mesg = wmsg;
-#endif /* FIXME ] */
- splx(s);
- p->p_stats->p_ru.ru_nvcsw++;
-
- if (continuation != THREAD_CONTINUE_NULL ) {
- ut->uu_continuation = continuation;
- ut->uu_pri = pri;
- ut->uu_timo = abstime? 1: 0;
- (void) thread_block(_sleep_continue);
- /* NOTREACHED */
+ if (mtx && !dropmutex)
+ lck_mtx_lock(mtx);
}
- wait_result = thread_block(THREAD_CONTINUE_NULL);
-
-#if FIXME /* [ */
- thread->wait_mesg = NULL;
-#endif /* FIXME ] */
switch (wait_result) {
case THREAD_TIMED_OUT:
error = EWOULDBLOCK;
/* else fall through */
case THREAD_INTERRUPTED:
if (catch) {
- if (thread_should_abort(current_thread())) {
+ if (thread_should_abort(self)) {
error = EINTR;
- } else if (SHOULDissignal(p,ut)) {
- if (sig = CURSIG(p)) {
+ } else if (SHOULDissignal(p, ut)) {
+ if ((sig = CURSIG(p)) != 0) {
if (p->p_sigacts->ps_sigintr & sigmask(sig))
error = EINTR;
else
error = ERESTART;
}
- if (thread_should_abort(current_thread())) {
+ if (thread_should_abort(self)) {
error = EINTR;
}
}
}
out:
if (error == EINTR || error == ERESTART)
- act_set_astbsd(th_act);
- if (abstime)
- thread_cancel_timer();
- (void) splx(s);
-#if KTRACE
- if (KTRPOINT(p, KTR_CSW))
- ktrcsw(p->p_tracep, 0, 0, -1);
-#endif
+ act_set_astbsd(self);
+ ut->uu_wchan = NULL;
+ ut->uu_wmesg = NULL;
+
return (error);
}
void *chan,
int pri)
{
- return _sleep((caddr_t)chan, pri, (char *)NULL, 0, (int (*)(int))0);
+ return _sleep((caddr_t)chan, pri, (char *)NULL, 0, (int (*)(int))0, (lck_mtx_t *)0);
+}
+
+int
+msleep0(
+ void *chan,
+ lck_mtx_t *mtx,
+ int pri,
+ const char *wmsg,
+ int timo,
+ int (*continuation)(int))
+{
+ u_int64_t abstime = 0;
+
+ if (timo)
+ clock_interval_to_deadline(timo, NSEC_PER_SEC / hz, &abstime);
+
+ return _sleep((caddr_t)chan, pri, wmsg, abstime, continuation, mtx);
+}
+
+int
+msleep(
+ void *chan,
+ lck_mtx_t *mtx,
+ int pri,
+ const char *wmsg,
+ struct timespec *ts)
+{
+ u_int64_t abstime = 0;
+
+ if (ts && (ts->tv_sec || ts->tv_nsec)) {
+ nanoseconds_to_absolutetime((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec, &abstime );
+ clock_absolutetime_interval_to_deadline( abstime, &abstime );
+ }
+
+ return _sleep((caddr_t)chan, pri, wmsg, abstime, (int (*)(int))0, mtx);
+}
+
+int
+msleep1(
+ void *chan,
+ lck_mtx_t *mtx,
+ int pri,
+ const char *wmsg,
+ u_int64_t abstime)
+{
+ return _sleep((caddr_t)chan, pri, wmsg, abstime, (int (*)(int))0, mtx);
}
int
tsleep(
- void *chan,
+ void *chan,
int pri,
- char *wmsg,
+ const char *wmsg,
int timo)
{
u_int64_t abstime = 0;
if (timo)
clock_interval_to_deadline(timo, NSEC_PER_SEC / hz, &abstime);
- return _sleep((caddr_t)chan, pri, wmsg, abstime, (int (*)(int))0);
+ return _sleep((caddr_t)chan, pri, wmsg, abstime, (int (*)(int))0, (lck_mtx_t *)0);
}
int
tsleep0(
- void *chan,
+ void *chan,
int pri,
- char *wmsg,
+ const char *wmsg,
int timo,
int (*continuation)(int))
{
if (timo)
clock_interval_to_deadline(timo, NSEC_PER_SEC / hz, &abstime);
- return _sleep((caddr_t)chan, pri, wmsg, abstime, continuation);
+ return _sleep((caddr_t)chan, pri, wmsg, abstime, continuation, (lck_mtx_t *)0);
}
int
tsleep1(
void *chan,
- int pri,
- char *wmsg,
+ int pri,
+ const char *wmsg,
u_int64_t abstime,
- int (*continuation)(int))
+ int (*continuation)(int))
{
- return _sleep((caddr_t)chan, pri, wmsg, abstime, continuation);
+ return _sleep((caddr_t)chan, pri, wmsg, abstime, continuation, (lck_mtx_t *)0);
}
/*
* 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);
}
* 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);
}
* 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(
- register int nrun)
+compute_averunnable(void *arg)
{
- register int i;
+ unsigned int nrun = *(unsigned int *)arg;
struct loadavg *avg = &averunnable;
+ int i;
for (i = 0; i < 3; i++)
avg->ldavg[i] = (cexp[i] * avg->ldavg[i] +
projects / apple / xnu.git / blobdiff