X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6601e61aa18bf4f09af135ff61fc7f4771d23b06..060df5ea7c632b1ac8cc8aac1fb59758165c2084:/osfmk/kern/thread_policy.c diff --git a/osfmk/kern/thread_policy.c b/osfmk/kern/thread_policy.c index c9e75fc1e..58028df2d 100644 --- a/osfmk/kern/thread_policy.c +++ b/osfmk/kern/thread_policy.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, - * 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@ */ #include @@ -26,11 +32,14 @@ #include #include #include +#include static void thread_recompute_priority( thread_t thread); + + kern_return_t thread_policy_set( thread_t thread, @@ -38,19 +47,32 @@ thread_policy_set( thread_policy_t policy_info, mach_msg_type_number_t count) { - kern_return_t result = KERN_SUCCESS; - spl_t s; if (thread == THREAD_NULL) return (KERN_INVALID_ARGUMENT); + if (thread->static_param) + return (KERN_SUCCESS); + + return (thread_policy_set_internal(thread, flavor, policy_info, count)); +} + +kern_return_t +thread_policy_set_internal( + thread_t thread, + thread_policy_flavor_t flavor, + thread_policy_t policy_info, + mach_msg_type_number_t count) +{ + kern_return_t result = KERN_SUCCESS; + spl_t s; + thread_mtx_lock(thread); if (!thread->active) { thread_mtx_unlock(thread); return (KERN_TERMINATED); } - switch (flavor) { case THREAD_EXTENDED_POLICY: @@ -75,15 +97,15 @@ thread_policy_set( if (timeshare && !oldmode) { thread->sched_mode |= TH_MODE_TIMESHARE; - if (thread->state & TH_RUN) - pset_share_incr(thread->processor_set); + if ((thread->state & (TH_RUN|TH_IDLE)) == TH_RUN) + sched_share_incr(); } else if (!timeshare && oldmode) { thread->sched_mode &= ~TH_MODE_TIMESHARE; - if (thread->state & TH_RUN) - pset_share_decr(thread->processor_set); + if ((thread->state & (TH_RUN|TH_IDLE)) == TH_RUN) + sched_share_decr(); } thread_recompute_priority(thread); @@ -132,8 +154,8 @@ thread_policy_set( if (thread->sched_mode & TH_MODE_TIMESHARE) { thread->sched_mode &= ~TH_MODE_TIMESHARE; - if (thread->state & TH_RUN) - pset_share_decr(thread->processor_set); + if ((thread->state & (TH_RUN|TH_IDLE)) == TH_RUN) + sched_share_decr(); } thread->sched_mode |= TH_MODE_REALTIME; thread_recompute_priority(thread); @@ -157,7 +179,6 @@ thread_policy_set( result = KERN_INVALID_ARGUMENT; break; } - info = (thread_precedence_policy_t)policy_info; s = splsched(); @@ -173,13 +194,35 @@ thread_policy_set( break; } + case THREAD_AFFINITY_POLICY: + { + thread_affinity_policy_t info; + + if (!thread_affinity_is_supported()) { + result = KERN_NOT_SUPPORTED; + break; + } + if (count < THREAD_AFFINITY_POLICY_COUNT) { + result = KERN_INVALID_ARGUMENT; + break; + } + + info = (thread_affinity_policy_t) policy_info; + /* + * Unlock the thread mutex here and + * return directly after calling thread_affinity_set(). + * This is necessary for correct lock ordering because + * thread_affinity_set() takes the task lock. + */ + thread_mtx_unlock(thread); + return thread_affinity_set(thread, info->affinity_tag); + } default: result = KERN_INVALID_ARGUMENT; break; } thread_mtx_unlock(thread); - return (result); } @@ -238,14 +281,19 @@ void thread_policy_reset( thread_t thread) { + spl_t s; + + s = splsched(); + thread_lock(thread); + if (!(thread->sched_mode & TH_MODE_FAILSAFE)) { thread->sched_mode &= ~TH_MODE_REALTIME; if (!(thread->sched_mode & TH_MODE_TIMESHARE)) { thread->sched_mode |= TH_MODE_TIMESHARE; - if (thread->state & TH_RUN) - pset_share_incr(thread->processor_set); + if ((thread->state & (TH_RUN|TH_IDLE)) == TH_RUN) + sched_share_incr(); } } else { @@ -256,6 +304,9 @@ thread_policy_reset( thread->importance = 0; thread_recompute_priority(thread); + + thread_unlock(thread); + splx(s); } kern_return_t @@ -378,6 +429,29 @@ thread_policy_get( break; } + case THREAD_AFFINITY_POLICY: + { + thread_affinity_policy_t info; + + if (!thread_affinity_is_supported()) { + result = KERN_NOT_SUPPORTED; + break; + } + if (*count < THREAD_AFFINITY_POLICY_COUNT) { + result = KERN_INVALID_ARGUMENT; + break; + } + + info = (thread_affinity_policy_t)policy_info; + + if (!(*get_default)) + info->affinity_tag = thread_affinity_get(thread); + else + info->affinity_tag = THREAD_AFFINITY_TAG_NULL; + + break; + } + default: result = KERN_INVALID_ARGUMENT; break;