xnu-1699.22.73.tar.gz

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

diff --git a/osfmk/kern/machine.c b/osfmk/kern/machine.c
index 1e7d3e96fc78da756365faa92de93e59878a7bb0..9b310f031cb6809ec9fcab9e74d06152bf8b5fc5 100644 (file)
--- a/osfmk/kern/machine.c
+++ b/osfmk/kern/machine.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -88,6 +88,8 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 
+#include <machine/commpage.h>
+
 #if HIBERNATION
 #include <IOKit/IOHibernatePrivate.h>
 #endif
@@ -120,10 +122,14 @@ processor_up(
        init_ast_check(processor);
        pset = processor->processor_set;
        pset_lock(pset);
-       pset->processor_count++;
-       enqueue_head(&pset->active_queue, (queue_entry_t)processor);
+       if (++pset->online_processor_count == 1) {
+               pset_pri_init_hint(pset, processor);
+               pset_count_init_hint(pset, processor);
+       }
+       enqueue_tail(&pset->active_queue, (queue_entry_t)processor);
        processor->state = PROCESSOR_RUNNING;
        (void)hw_atomic_add(&processor_avail_count, 1);
+       commpage_update_active_cpus();
        pset_unlock(pset);
        ml_cpu_up();
        splx(s);
@@ -212,15 +218,11 @@ processor_shutdown(
                return (KERN_SUCCESS);
        }
 
-       if (processor->state == PROCESSOR_IDLE) {
-               remqueue(&pset->idle_queue, (queue_entry_t)processor);
-               pset->idle_count--;
-       }
+       if (processor->state == PROCESSOR_IDLE)
+               remqueue((queue_entry_t)processor);
        else
        if (processor->state == PROCESSOR_RUNNING)
-               remqueue(&pset->active_queue, (queue_entry_t)processor);
-       else
-               panic("processor_shutdown");
+               remqueue((queue_entry_t)processor);
 
        processor->state = PROCESSOR_SHUTDOWN;
 
@@ -229,7 +231,7 @@ processor_shutdown(
        processor_doshutdown(processor);
        splx(s);
 
-       cpu_exit_wait(PROCESSOR_DATA(processor, slot_num));
+       cpu_exit_wait(processor->cpu_id);
 
        return (KERN_SUCCESS);
 }
@@ -269,24 +271,6 @@ processor_doshutdown(
        old_thread = machine_processor_shutdown(self, processor_offline, processor);
 
        thread_dispatch(old_thread, self);
-
-       /*
-        * If we just shutdown another processor, move any
-        * threads and timer call outs to the current processor.
-        */
-       if (processor != current_processor()) {
-               processor_set_t         pset = processor->processor_set;
-
-               pset_lock(pset);
-
-               if (processor->state == PROCESSOR_OFF_LINE || processor->state == PROCESSOR_SHUTDOWN) {
-                       timer_call_shutdown(processor);
-                       processor_queue_shutdown(processor);
-                       return;
-               }
-
-               pset_unlock(pset);
-       }
 }
 
 /*
@@ -304,6 +288,7 @@ processor_offline(
        new_thread = processor->idle_thread;
        processor->active_thread = new_thread;
        processor->current_pri = IDLEPRI;
+       processor->current_thmode = TH_MODE_NONE;
        processor->deadline = UINT64_MAX;
        new_thread->last_processor = processor;
 
@@ -314,16 +299,20 @@ processor_offline(
 
        thread_dispatch(old_thread, new_thread);
 
-       PMAP_DEACTIVATE_KERNEL(PROCESSOR_DATA(processor, slot_num));
+       PMAP_DEACTIVATE_KERNEL(processor->cpu_id);
 
        pset = processor->processor_set;
        pset_lock(pset);
-       pset->processor_count--;
        processor->state = PROCESSOR_OFF_LINE;
-       if (processor == pset->low_hint)
-               pset->low_hint = PROCESSOR_NULL;
+       if (--pset->online_processor_count == 0) {
+               pset_pri_init_hint(pset, PROCESSOR_NULL);
+               pset_count_init_hint(pset, PROCESSOR_NULL);
+       }
        (void)hw_atomic_sub(&processor_avail_count, 1);
-       pset_unlock(pset);
+       commpage_update_active_cpus();
+       SCHED(processor_queue_shutdown)(processor);
+       /* pset lock dropped */
+
        ml_cpu_down();
 
        cpu_sleep();