xnu-1228.7.58.tar.gz

[apple/xnu.git] / osfmk / kern / syscall_subr.c

diff --git a/osfmk/kern/syscall_subr.c b/osfmk/kern/syscall_subr.c
index c74f325ad300f201b1d7cfa3384f8b0db4f10607..311e96c7dad5ebe338ebb03312c87574385ab9c1 100644 (file)
--- a/osfmk/kern/syscall_subr.c
+++ b/osfmk/kern/syscall_subr.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -96,8 +96,7 @@ swtch_continue(void)
 
     disable_preemption();
        myprocessor = current_processor();
 
     disable_preemption();
        myprocessor = current_processor();

-       result =                myprocessor->runq.count > 0                                     ||
-                               myprocessor->processor_set->runq.count > 0;
+       result = myprocessor->runq.count > 0 || rt_runq.count > 0;

        enable_preemption();
 
        thread_syscall_return(result);
        enable_preemption();
 
        thread_syscall_return(result);


@@ -113,8 +112,7 @@ swtch(
 
        disable_preemption();
        myprocessor = current_processor();
 
        disable_preemption();
        myprocessor = current_processor();

-       if (            myprocessor->runq.count == 0                            &&
-                       myprocessor->processor_set->runq.count == 0                     ) {
+       if (myprocessor->runq.count == 0 &&     rt_runq.count == 0) {

                mp_enable_preemption();
 
                return (FALSE);
                mp_enable_preemption();
 
                return (FALSE);


@@ -127,8 +125,7 @@ swtch(
 
        disable_preemption();
        myprocessor = current_processor();
 
        disable_preemption();
        myprocessor = current_processor();

-       result =                myprocessor->runq.count > 0                                     ||
-                               myprocessor->processor_set->runq.count > 0;
+       result = myprocessor->runq.count > 0 || rt_runq.count > 0;

        enable_preemption();
 
        return (result);
        enable_preemption();
 
        return (result);


@@ -144,8 +141,7 @@ swtch_pri_continue(void)
 
     disable_preemption();
        myprocessor = current_processor();
 
     disable_preemption();
        myprocessor = current_processor();

-       result =                myprocessor->runq.count > 0                                     ||
-                               myprocessor->processor_set->runq.count > 0;
+       result = myprocessor->runq.count > 0 || rt_runq.count > 0;

        mp_enable_preemption();
 
        thread_syscall_return(result);
        mp_enable_preemption();
 
        thread_syscall_return(result);


@@ -161,8 +157,7 @@ __unused    struct swtch_pri_args *args)
 
        disable_preemption();
        myprocessor = current_processor();
 
        disable_preemption();
        myprocessor = current_processor();

-       if (    myprocessor->runq.count == 0                                    &&
-                       myprocessor->processor_set->runq.count == 0                     ) {
+       if (myprocessor->runq.count == 0 && rt_runq.count == 0) {

                mp_enable_preemption();
 
                return (FALSE);
                mp_enable_preemption();
 
                return (FALSE);


@@ -179,8 +174,7 @@ __unused    struct swtch_pri_args *args)
 
        disable_preemption();
        myprocessor = current_processor();
 
        disable_preemption();
        myprocessor = current_processor();

-       result =        myprocessor->runq.count > 0                                             ||
-                               myprocessor->processor_set->runq.count > 0;
+       result = myprocessor->runq.count > 0 || rt_runq.count > 0;

        enable_preemption();
 
        return (result);
        enable_preemption();
 
        return (result);


@@ -242,7 +236,7 @@ thread_switch(
                        ipc_port_release(port);
 
                        if (thread == self) {
                        ipc_port_release(port);
 
                        if (thread == self) {

-                               thread_deallocate_internal(thread);
+                               (void)thread_deallocate_internal(thread);

                                thread = THREAD_NULL;
                        }
                }
                                thread = THREAD_NULL;
                        }
                }


@@ -263,9 +257,9 @@ thread_switch(
                thread_lock(thread);
 
                /*
                thread_lock(thread);
 
                /*

-                *      Check if the thread is in the right pset,
-                *      is not bound to a different processor,
-                *      and that realtime is not involved.
+                *      Check that the thread is not bound
+                *      to a different processor, and that realtime
+                *      is not involved.

                 *
                 *      Next, pull it off its run queue.  If it
                 *      doesn't come, it's not eligible.
                 *
                 *      Next, pull it off its run queue.  If it
                 *      doesn't come, it's not eligible.


@@ -273,16 +267,15 @@ thread_switch(
                processor = current_processor();
                if (processor->current_pri < BASEPRI_RTQUEUES                   &&
                        thread->sched_pri < BASEPRI_RTQUEUES                            &&
                processor = current_processor();
                if (processor->current_pri < BASEPRI_RTQUEUES                   &&
                        thread->sched_pri < BASEPRI_RTQUEUES                            &&

-                       thread->processor_set == processor->processor_set       &&

                        (thread->bound_processor == PROCESSOR_NULL      ||
                         thread->bound_processor == processor)                          &&
                        (thread->bound_processor == PROCESSOR_NULL      ||
                         thread->bound_processor == processor)                          &&

-                       run_queue_remove(thread) != RUN_QUEUE_NULL                      ) {
+                               run_queue_remove(thread)                                                        ) {

                        /*
                         *      Hah, got it!!
                         */
                        thread_unlock(thread);
 
                        /*
                         *      Hah, got it!!
                         */
                        thread_unlock(thread);
 

-                       thread_deallocate_internal(thread);
+                       (void)thread_deallocate_internal(thread);

 
                        if (option == SWITCH_OPTION_WAIT)
                                assert_wait_timeout((event_t)assert_wait_timeout, THREAD_ABORTSAFE,
 
                        if (option == SWITCH_OPTION_WAIT)
                                assert_wait_timeout((event_t)assert_wait_timeout, THREAD_ABORTSAFE,


@@ -338,7 +331,6 @@ thread_depress_abstime(
 
                self->sched_pri = DEPRESSPRI;
                myprocessor->current_pri = self->sched_pri;
 
                self->sched_pri = DEPRESSPRI;
                myprocessor->current_pri = self->sched_pri;

-               self->sched_mode &= ~TH_MODE_PREEMPT;

                self->sched_mode |= TH_MODE_DEPRESS;
 
                if (interval != 0) {
                self->sched_mode |= TH_MODE_DEPRESS;
 
                if (interval != 0) {


@@ -434,7 +426,6 @@ thread_poll_yield(
                        if (!(self->sched_mode & TH_MODE_ISDEPRESSED)) {
                                self->sched_pri = DEPRESSPRI;
                                myprocessor->current_pri = self->sched_pri;
                        if (!(self->sched_mode & TH_MODE_ISDEPRESSED)) {
                                self->sched_pri = DEPRESSPRI;
                                myprocessor->current_pri = self->sched_pri;

-                               self->sched_mode &= ~TH_MODE_PREEMPT;

                        }
                        self->computation_epoch = abstime;
                        self->computation_metered = 0;
                        }
                        self->computation_epoch = abstime;
                        self->computation_metered = 0;


@@ -451,3 +442,27 @@ thread_poll_yield(
        }
        splx(s);
 }
        }
        splx(s);
 }

+
+
+void
+thread_yield_internal(
+       mach_msg_timeout_t      ms)
+{
+       processor_t     myprocessor;
+
+       disable_preemption();
+       myprocessor = current_processor();
+       if (myprocessor->runq.count == 0 && rt_runq.count == 0) {
+               mp_enable_preemption();
+
+               return;
+       }
+       enable_preemption();
+
+       thread_depress_ms(ms);
+
+       thread_block_reason(THREAD_CONTINUE_NULL, NULL, AST_YIELD);
+
+       thread_depress_abort_internal(current_thread());
+}
+