xnu-3247.10.11.tar.gz

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

diff --git a/osfmk/kern/mk_sp.c b/osfmk/kern/mk_sp.c
index 565681e39b2b2434d587e3059cb5f52df7b386a8..f902e916cd5e778a68ad5a275a99dea13ee63014 100644 (file)
--- a/osfmk/kern/mk_sp.c
+++ b/osfmk/kern/mk_sp.c
@@ -1,23 +1,29 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -53,81 +59,6 @@
 #include <mach/thread_act_server.h>
 #include <mach/host_priv_server.h>
 
 #include <mach/thread_act_server.h>
 #include <mach/host_priv_server.h>
 

-/*
- *     thread_policy_common:
- *
- *     Set scheduling policy & priority for thread.
- */
-static kern_return_t
-thread_policy_common(
-       thread_t                thread,
-       integer_t               policy,
-       integer_t               priority)
-{
-       spl_t                   s;
-
-       if (    thread == THREAD_NULL           ||
-                       invalid_policy(policy)          )
-               return(KERN_INVALID_ARGUMENT);
-
-       s = splsched();
-       thread_lock(thread);
-
-       if (    !(thread->sched_mode & TH_MODE_REALTIME)        &&
-                       !(thread->safe_mode & TH_MODE_REALTIME)                 ) {
-               if (!(thread->sched_mode & TH_MODE_FAILSAFE)) {
-                       integer_t       oldmode = (thread->sched_mode & TH_MODE_TIMESHARE);
-
-                       if (policy == POLICY_TIMESHARE && !oldmode) {
-                               thread->sched_mode |= TH_MODE_TIMESHARE;
-
-                               if (thread->state & TH_RUN)
-                                       pset_share_incr(thread->processor_set);
-                       }
-                       else
-                       if (policy != POLICY_TIMESHARE && oldmode) {
-                               thread->sched_mode &= ~TH_MODE_TIMESHARE;
-
-                               if (thread->state & TH_RUN)
-                                       pset_share_decr(thread->processor_set);
-                       }
-               }
-               else {
-                       if (policy == POLICY_TIMESHARE)
-                               thread->safe_mode |= TH_MODE_TIMESHARE;
-                       else
-                               thread->safe_mode &= ~TH_MODE_TIMESHARE;
-               }
-
-               if (priority >= thread->max_priority)
-                       priority = thread->max_priority - thread->task_priority;
-               else
-               if (priority >= MINPRI_KERNEL)
-                       priority -= MINPRI_KERNEL;
-               else
-               if (priority >= MINPRI_RESERVED)
-                       priority -= MINPRI_RESERVED;
-               else
-                       priority -= BASEPRI_DEFAULT;
-
-               priority += thread->task_priority;
-
-               if (priority > thread->max_priority)
-                       priority = thread->max_priority;
-               else
-               if (priority < MINPRI)
-                       priority = MINPRI;
-
-               thread->importance = priority - thread->task_priority;
-
-               set_priority(thread, priority);
-       }
-
-       thread_unlock(thread);
-       splx(s);
-
-       return (KERN_SUCCESS);
-}

 
 /*
  *     thread_set_policy
 
 /*
  *     thread_set_policy


@@ -150,16 +81,13 @@ thread_set_policy(
        kern_return_t                   result = KERN_SUCCESS;
 
        if (    thread == THREAD_NULL                   ||
        kern_return_t                   result = KERN_SUCCESS;
 
        if (    thread == THREAD_NULL                   ||

-                       pset == PROCESSOR_SET_NULL              )
+                       pset == PROCESSOR_SET_NULL || pset != &pset0)

                return (KERN_INVALID_ARGUMENT);
 
                return (KERN_INVALID_ARGUMENT);
 

-       thread_mtx_lock(thread);
-
-       if (pset != thread->processor_set) {
-               thread_mtx_unlock(thread);
+       if (invalid_policy(policy))
+               return(KERN_INVALID_ARGUMENT);  

 
 

-               return (KERN_FAILURE);
-       }
+       thread_mtx_lock(thread);

 
        switch (policy) {
 
 
        switch (policy) {
 


@@ -237,7 +165,10 @@ thread_set_policy(
                return (result);
        }
 
                return (result);
        }
 

-       result = thread_policy_common(thread, policy, bas);
+       /* Note that we do not pass on max priority. */
+       if (result == KERN_SUCCESS) {
+           result = thread_set_mode_and_absolute_pri(thread, policy, bas);
+       }

 
        thread_mtx_unlock(thread);
 
 
        thread_mtx_unlock(thread);
 


@@ -261,9 +192,9 @@ thread_policy(
        boolean_t                               set_limit)
 {
        kern_return_t                   result = KERN_SUCCESS;
        boolean_t                               set_limit)
 {
        kern_return_t                   result = KERN_SUCCESS;

-       processor_set_t                 pset;
-       policy_limit_t                  limit;
-       int                                             limcount;
+       processor_set_t                 pset = &pset0;
+       policy_limit_t                  limit = NULL;
+       int                                             limcount = 0;

        policy_rr_limit_data_t                  rr_limit;
        policy_fifo_limit_data_t                fifo_limit;
        policy_timeshare_limit_data_t   ts_limit;
        policy_rr_limit_data_t                  rr_limit;
        policy_fifo_limit_data_t                fifo_limit;
        policy_timeshare_limit_data_t   ts_limit;


@@ -273,13 +204,6 @@ thread_policy(
 
        thread_mtx_lock(thread);
 
 
        thread_mtx_lock(thread);
 

-       pset = thread->processor_set;
-       if (pset == PROCESSOR_SET_NULL) {
-               thread_mtx_unlock(thread);
-
-               return (KERN_INVALID_ARGUMENT);
-       }
-

        if (    invalid_policy(policy)                                                                                  ||
                        ((POLICY_TIMESHARE | POLICY_RR | POLICY_FIFO) & policy) == 0    ) {
                thread_mtx_unlock(thread);
        if (    invalid_policy(policy)                                                                                  ||
                        ((POLICY_TIMESHARE | POLICY_RR | POLICY_FIFO) & policy) == 0    ) {
                thread_mtx_unlock(thread);