*
* @APPLE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
_sleep_continue(void)
{
register struct proc *p;
- register thread_t thread = current_thread();
- thread_act_t th_act;
+ register thread_t self = current_act();
struct uthread * ut;
int sig, catch;
int error = 0;
- th_act = current_act();
- ut = get_bsdthread_info(th_act);
+ ut = get_bsdthread_info(self);
catch = ut->uu_pri & PCATCH;
p = current_proc();
-#if FIXME /* [ */
- thread->wait_mesg = NULL;
-#endif /* FIXME ] */
- switch (get_thread_waitresult(thread)) {
+ switch (get_thread_waitresult(self)) {
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)) {
else
error = ERESTART;
}
- if (thread_should_abort(current_thread())) {
+ if (thread_should_abort(self)) {
error = EINTR;
}
}
}
if (error == EINTR || error == ERESTART)
- act_set_astbsd(th_act);
+ act_set_astbsd(self);
if (ut->uu_timo)
thread_cancel_timer();
int (*continuation)(int))
{
register struct proc *p;
- register thread_t thread = current_thread();
- thread_act_t th_act;
+ register thread_t self = current_act();
struct uthread * ut;
int sig, catch = pri & PCATCH;
int sigttblock = pri & PTTYBLOCK;
s = splhigh();
- th_act = current_act();
- ut = get_bsdthread_info(th_act);
+ ut = get_bsdthread_info(self);
p = current_proc();
#if KTRACE
#endif
p->p_priority = pri & PRIMASK;
- if (chan)
- wait_result = assert_wait(chan,
- (catch) ? THREAD_ABORTSAFE : THREAD_UNINT);
-
- if (abstime)
+ if (chan != NULL)
+ assert_wait_prim(chan, NULL, abstime,
+ (catch) ? THREAD_ABORTSAFE : THREAD_UNINT);
+ else
+ if (abstime != 0)
thread_set_timer_deadline(abstime);
/*
if (catch) {
if (SHOULDissignal(p,ut)) {
if (sig = CURSIG(p)) {
- clear_wait(thread, THREAD_INTERRUPTED);
+ if (clear_wait(self, THREAD_INTERRUPTED) == KERN_FAILURE)
+ goto block;
/* if SIGTTOU or SIGTTIN then block till SIGCONT */
if (sigttblock && ((sig == SIGTTOU) || (sig == SIGTTIN))) {
p->p_flag |= P_TTYSLEEP;
goto out;
}
}
- if (thread_should_abort(current_thread())) {
- clear_wait(thread, THREAD_INTERRUPTED);
+ if (thread_should_abort(self)) {
+ if (clear_wait(self, THREAD_INTERRUPTED) == KERN_FAILURE)
+ goto block;
error = EINTR;
goto out;
}
- if (get_thread_waitresult(thread) != THREAD_WAITING) {
+ if (get_thread_waitresult(self) != THREAD_WAITING) {
/*already happened */
goto out;
}
}
-#if FIXME /* [ */
- thread->wait_mesg = wmsg;
-#endif /* FIXME ] */
+block:
+
splx(s);
p->p_stats->p_ru.ru_nvcsw++;
- if (continuation != THREAD_CONTINUE_NULL ) {
+ if ((thread_continue_t)continuation != THREAD_CONTINUE_NULL ) {
ut->uu_continuation = continuation;
ut->uu_pri = pri;
ut->uu_timo = abstime? 1: 0;
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
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);
+ act_set_astbsd(self);
if (abstime)
thread_cancel_timer();
(void) splx(s);
projects / apple / xnu.git / blobdiff