/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <mach/mach_types.h>
#include <mach/kern_return.h>
#include <mach/alert.h>
-#include <mach_prof.h>
#include <mach/rpc.h>
#include <mach/thread_act_server.h>
#include <kern/ast.h>
#include <kern/mach_param.h>
#include <kern/zalloc.h>
+#include <kern/extmod_statistics.h>
#include <kern/thread.h>
#include <kern/task.h>
#include <kern/sched_prim.h>
#include <kern/exception.h>
#include <kern/ipc_mig.h>
#include <kern/ipc_tt.h>
-#include <kern/profile.h>
#include <kern/machine.h>
#include <kern/spl.h>
#include <kern/syscall_subr.h>
#include <kern/sync_lock.h>
#include <kern/processor.h>
#include <kern/timer.h>
-#include <mach_prof.h>
+#include <kern/affinity.h>
+
#include <mach/rpc.h>
void act_abort(thread_t);
-void act_set_apc(thread_t);
void install_special_handler_locked(thread_t);
void special_handler_continue(void);
+/*
+ * Internal routine to mark a thread as started.
+ * Always called with the thread locked.
+ *
+ * Note: function intentionally declared with the noinline attribute to
+ * prevent multiple declaration of probe symbols in this file; we would
+ * prefer "#pragma noinline", but gcc does not support it.
+ * PR-6385749 -- the lwp-start probe should fire from within the context
+ * of the newly created thread. Commented out for now, in case we
+ * turn it into a dead code probe.
+ */
+void
+thread_start_internal(
+ thread_t thread)
+{
+ clear_wait(thread, THREAD_AWAKENED);
+ thread->started = TRUE;
+ // DTRACE_PROC1(lwp__start, thread_t, thread);
+}
+
/*
* Internal routine to terminate a thread.
* Sometimes called with task already locked.
if (thread->started)
clear_wait(thread, THREAD_INTERRUPTED);
else {
- clear_wait(thread, THREAD_AWAKENED);
- thread->started = TRUE;
+ thread_start_internal(thread);
}
}
else
result = KERN_TERMINATED;
+ if (thread->affinity_set != NULL)
+ thread_affinity_terminate(thread);
+
thread_mtx_unlock(thread);
if (thread != current_thread() && result == KERN_SUCCESS)
if (thread->started)
thread_wakeup_one(&thread->suspend_count);
else {
- clear_wait(thread, THREAD_AWAKENED);
- thread->started = TRUE;
+ thread_start_internal(thread);
}
}
}
if (thread->started)
thread_wakeup_one(&thread->suspend_count);
else {
- clear_wait(thread, THREAD_AWAKENED);
- thread->started = TRUE;
+ thread_start_internal(thread);
}
}
}
thread_lock(thread);
- if (!(thread->state & TH_ABORT)) {
- thread->state |= TH_ABORT;
+ if (!(thread->sched_flags & TH_SFLAG_ABORT)) {
+ thread->sched_flags |= TH_SFLAG_ABORT;
install_special_handler_locked(thread);
}
else
- thread->state &= ~TH_ABORT_SAFELY;
+ thread->sched_flags &= ~TH_SFLAG_ABORTSAFELY;
thread_unlock(thread);
splx(s);
thread_lock(thread);
if (!thread->at_safe_point ||
- clear_wait_internal(thread, THREAD_INTERRUPTED) != KERN_SUCCESS) {
- if (!(thread->state & TH_ABORT)) {
- thread->state |= (TH_ABORT|TH_ABORT_SAFELY);
+ clear_wait_internal(thread, THREAD_INTERRUPTED) != KERN_SUCCESS) {
+ if (!(thread->sched_flags & TH_SFLAG_ABORT)) {
+ thread->sched_flags |= TH_SFLAG_ABORTED_MASK;
install_special_handler_locked(thread);
}
}
* Change thread's machine-dependent state. Called with nothing
* locked. Returns same way.
*/
-kern_return_t
-thread_set_state(
+static kern_return_t
+thread_set_state_internal(
register thread_t thread,
int flavor,
thread_state_t state,
- mach_msg_type_number_t state_count)
+ mach_msg_type_number_t state_count,
+ boolean_t from_user)
{
kern_return_t result = KERN_SUCCESS;
else
result = KERN_TERMINATED;
+ if ((result == KERN_SUCCESS) && from_user)
+ extmod_statistics_incr_thread_set_state(thread);
+
thread_mtx_unlock(thread);
return (result);
}
+
+/* No prototype, since thread_act_server.h has the _from_user version if KERNEL_SERVER */
+kern_return_t
+thread_set_state(
+ register thread_t thread,
+ int flavor,
+ thread_state_t state,
+ mach_msg_type_number_t state_count);
+
+kern_return_t
+thread_set_state(
+ register thread_t thread,
+ int flavor,
+ thread_state_t state,
+ mach_msg_type_number_t state_count)
+{
+ return thread_set_state_internal(thread, flavor, state, state_count, FALSE);
+}
+kern_return_t
+thread_set_state_from_user(
+ register thread_t thread,
+ int flavor,
+ thread_state_t state,
+ mach_msg_type_number_t state_count)
+{
+ return thread_set_state_internal(thread, flavor, state, state_count, TRUE);
+}
/*
* Kernel-internal "thread" interfaces used outside this file:
if (thread_stop(target)) {
thread_mtx_lock(target);
result = machine_thread_dup(self, target);
+ if (self->affinity_set != AFFINITY_SET_NULL)
+ thread_affinity_dup(self, target);
thread_unstop(target);
}
else {
* a chance to do locking required to
* block itself in special_handler().
*/
- if (thread->sched_mode & TH_MODE_ISDEPRESSED)
- compute_priority(thread, TRUE);
+ if (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK)
+ SCHED(compute_priority)(thread, TRUE);
thread_ast_set(thread, AST_APC);
spl_t s = splsched();
thread_lock(thread);
- if (thread->sched_mode & TH_MODE_ISDEPRESSED) {
+ if (thread->sched_flags & TH_SFLAG_DEPRESSED_MASK) {
processor_t myprocessor = thread->last_processor;
thread->sched_pri = DEPRESSPRI;
myprocessor->current_pri = thread->sched_pri;
- thread->sched_mode &= ~TH_MODE_PREEMPT;
}
thread_unlock(thread);
splx(s);
s = splsched();
thread_lock(thread);
- thread->state &= ~(TH_ABORT|TH_ABORT_SAFELY); /* clear any aborts */
+ thread->sched_flags &= ~TH_SFLAG_ABORTED_MASK;
thread_unlock(thread);
splx(s);
thread_mtx_unlock(thread);
}
+/* Prototype, see justification above */
+kern_return_t
+act_set_state(
+ thread_t thread,
+ int flavor,
+ thread_state_t state,
+ mach_msg_type_number_t count);
+
kern_return_t
act_set_state(
thread_t thread,
}
+kern_return_t
+act_set_state_from_user(
+ thread_t thread,
+ int flavor,
+ thread_state_t state,
+ mach_msg_type_number_t count)
+{
+ if (thread == current_thread())
+ return (KERN_INVALID_ARGUMENT);
+
+ return (thread_set_state_from_user(thread, flavor, state, count));
+
+}
+
kern_return_t
act_get_state(
thread_t thread,
projects / apple / xnu.git / blobdiff