xnu-792.10.96.tar.gz

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

diff --git a/osfmk/kern/task_policy.c b/osfmk/kern/task_policy.c
index c382f56ace0bf0b61f14e04fe230a096827ee2c0..a0029e1df90188ca2caecf456da9710cfc02457a 100644 (file)
--- a/osfmk/kern/task_policy.c
+++ b/osfmk/kern/task_policy.c
@@ -1,36 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
-/*
- * Copyright (c) 2000 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- * 15 October 2000 (debo)
- *  Created.
- */
 
+#include <mach/mach_types.h>
+#include <mach/task_server.h>
+
+#include <kern/sched.h>
 #include <kern/task.h>
 
 static void
@@ -102,7 +95,7 @@ task_policy_set(
                                        task->sec_token.val[0] != 0                     )
                                result = KERN_INVALID_ARGUMENT;
                        else {
-                               task_priority(task, MAXPRI_SYSTEM - 3, MAXPRI_SYSTEM);
+                               task_priority(task, MAXPRI_RESERVED - 3, MAXPRI_RESERVED);
                                task->role = info->role;
                        }
                }
@@ -128,7 +121,7 @@ task_priority(
        integer_t               priority,
        integer_t               max_priority)
 {
-       thread_act_t    act;
+       thread_t                thread;
 
        task->max_priority = max_priority;
 
@@ -140,13 +133,13 @@ task_priority(
 
        task->priority = priority;
 
-       queue_iterate(&task->threads, act, thread_act_t, task_threads) {
-               thread_t                thread = act_lock_thread(act);
+       queue_iterate(&task->threads, thread, thread_t, task_threads) {
+               thread_mtx_lock(thread);
 
-               if (act->active)
+               if (thread->active)
                        thread_task_priority(thread, priority, max_priority);
 
-               act_unlock_thread(act);
+               thread_mtx_unlock(thread);
        }
 }