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 898dd3bfac2e67f0acb152c64c48b830b89527c2..9b310f031cb6809ec9fcab9e74d06152bf8b5fc5 100644 (file)
--- a/osfmk/kern/machine.c
+++ b/osfmk/kern/machine.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -88,6 +88,8 @@
 #include <kern/task.h>
 #include <kern/thread.h>
 
 #include <kern/task.h>
 #include <kern/thread.h>
 

+#include <machine/commpage.h>
+

 #if HIBERNATION
 #include <IOKit/IOHibernatePrivate.h>
 #endif
 #if HIBERNATION
 #include <IOKit/IOHibernatePrivate.h>
 #endif


@@ -120,11 +122,14 @@ processor_up(
        init_ast_check(processor);
        pset = processor->processor_set;
        pset_lock(pset);
        init_ast_check(processor);
        pset = processor->processor_set;
        pset_lock(pset);

-       if (++pset->processor_count == 1)
-               pset->low_pri = pset->low_count = 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);
        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);
        pset_unlock(pset);
        ml_cpu_up();
        splx(s);


@@ -214,10 +219,10 @@ processor_shutdown(
        }
 
        if (processor->state == PROCESSOR_IDLE)
        }
 
        if (processor->state == PROCESSOR_IDLE)

-               remqueue(&pset->idle_queue, (queue_entry_t)processor);
+               remqueue((queue_entry_t)processor);

        else
        if (processor->state == PROCESSOR_RUNNING)
        else
        if (processor->state == PROCESSOR_RUNNING)

-               remqueue(&pset->active_queue, (queue_entry_t)processor);
+               remqueue((queue_entry_t)processor);

 
        processor->state = PROCESSOR_SHUTDOWN;
 
 
        processor->state = PROCESSOR_SHUTDOWN;
 


@@ -226,7 +231,7 @@ processor_shutdown(
        processor_doshutdown(processor);
        splx(s);
 
        processor_doshutdown(processor);
        splx(s);
 

-       cpu_exit_wait(processor->cpu_num);
+       cpu_exit_wait(processor->cpu_id);

 
        return (KERN_SUCCESS);
 }
 
        return (KERN_SUCCESS);
 }


@@ -283,6 +288,7 @@ processor_offline(
        new_thread = processor->idle_thread;
        processor->active_thread = new_thread;
        processor->current_pri = IDLEPRI;
        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;
 
        processor->deadline = UINT64_MAX;
        new_thread->last_processor = processor;
 


@@ -293,15 +299,18 @@ processor_offline(
 
        thread_dispatch(old_thread, new_thread);
 
 
        thread_dispatch(old_thread, new_thread);
 

-       PMAP_DEACTIVATE_KERNEL(processor->cpu_num);
+       PMAP_DEACTIVATE_KERNEL(processor->cpu_id);

 
        pset = processor->processor_set;
        pset_lock(pset);
        processor->state = PROCESSOR_OFF_LINE;
 
        pset = processor->processor_set;
        pset_lock(pset);
        processor->state = PROCESSOR_OFF_LINE;

-       if (--pset->processor_count == 0)
-               pset->low_pri = pset->low_count = 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);
        (void)hw_atomic_sub(&processor_avail_count, 1);

-       processor_queue_shutdown(processor);
+       commpage_update_active_cpus();
+       SCHED(processor_queue_shutdown)(processor);

        /* pset lock dropped */
 
        ml_cpu_down();
        /* pset lock dropped */
 
        ml_cpu_down();