xnu-792.1.5.tar.gz

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

diff --git a/osfmk/kern/processor.c b/osfmk/kern/processor.c
index 4e00eef381be2a40151e6fb5b1833673d747b4b4..6f93f5ef4d706fdeca14fffba0000b868d2f7515 100644 (file)
--- a/osfmk/kern/processor.c
+++ b/osfmk/kern/processor.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -54,11 +54,9 @@
  *     processor.c: processor and processor_set manipulation routines.
  */
 
  *     processor.c: processor and processor_set manipulation routines.
  */
 

-#include <cpus.h>
-#include <mach_host.h>
-

 #include <mach/boolean.h>
 #include <mach/policy.h>
 #include <mach/boolean.h>
 #include <mach/policy.h>

+#include <mach/processor.h>

 #include <mach/processor_info.h>
 #include <mach/vm_param.h>
 #include <kern/cpu_number.h>
 #include <mach/processor_info.h>
 #include <mach/vm_param.h>
 #include <kern/cpu_number.h>


@@ -74,39 +72,26 @@
 #include <ipc/ipc_port.h>
 #include <kern/kalloc.h>
 
 #include <ipc/ipc_port.h>
 #include <kern/kalloc.h>
 

-#if    MACH_HOST
-#include <kern/zalloc.h>
-zone_t pset_zone;
-#endif /* MACH_HOST */
-
-#include <kern/sf.h>
-#include <kern/mk_sp.h>        /*** ??? fix so this can be removed ***/
-

 /*
  * Exported interface
  */
 #include <mach/mach_host_server.h>
 /*
  * Exported interface
  */
 #include <mach/mach_host_server.h>

+#include <mach/processor_set_server.h>

 
 /*
  *     Exported variables.
  */
 
 /*
  *     Exported variables.
  */

-struct processor_set default_pset;
-struct processor processor_array[NCPUS];
+struct processor_set   default_pset;
+
+processor_t                            processor_list;
+unsigned int                   processor_count;
+static processor_t             processor_list_tail;
+decl_simple_lock_data(,processor_list_lock)

 
 processor_t    master_processor;
 
 processor_t    master_processor;

-processor_t    processor_ptr[NCPUS];
+int            master_cpu = 0;

 
 /* Forwards */
 
 /* Forwards */

-void   pset_init(
-               processor_set_t pset);
-
-void   processor_init(
-               register processor_t    pr,
-               int                     slot_num);
-
-void   quantum_set(
-               processor_set_t         pset);
-

 kern_return_t  processor_set_base(
                processor_set_t         pset,
                policy_t                policy,
 kern_return_t  processor_set_base(
                processor_set_t         pset,
                policy_t                policy,


@@ -125,85 +110,54 @@ kern_return_t     processor_set_things(
                mach_msg_type_number_t  *count,
                int                     type);
 
                mach_msg_type_number_t  *count,
                int                     type);
 

-
-/*
- *     Bootstrap the processor/pset system so the scheduler can run.
- */

 void
 void

-pset_sys_bootstrap(void)
+processor_bootstrap(void)

 {
 {

-       register int    i;
+       simple_lock_init(&processor_list_lock, 0);

 
 

-       pset_init(&default_pset);
-       for (i = 0; i < NCPUS; i++) {
-               /*
-                *      Initialize processor data structures.
-                *      Note that cpu_to_processor(i) is processor_ptr[i].
-                */
-               processor_ptr[i] = &processor_array[i];
-               processor_init(processor_ptr[i], i);
-       }

        master_processor = cpu_to_processor(master_cpu);
        master_processor = cpu_to_processor(master_cpu);

-       default_pset.active = TRUE;
+
+       processor_init(master_processor, master_cpu);

 }
 
 /*
  *     Initialize the given processor_set structure.
  */
 
 }
 
 /*
  *     Initialize the given processor_set structure.
  */
 

-void pset_init(
+void
+pset_init(

        register processor_set_t        pset)
 {
        register processor_set_t        pset)
 {

-       int     i;
+       register int    i;

 
 

-       /* setup run-queues */
-       simple_lock_init(&pset->runq.lock, ETAP_THREAD_PSET_RUNQ);
-       pset->runq.count = 0;
-       for (i = 0; i < NRQBM; i++) {
+       /* setup run queue */
+       pset->runq.highq = IDLEPRI;
+       for (i = 0; i < NRQBM; i++)

            pset->runq.bitmap[i] = 0;
            pset->runq.bitmap[i] = 0;

-       }

        setbit(MAXPRI - IDLEPRI, pset->runq.bitmap); 
        setbit(MAXPRI - IDLEPRI, pset->runq.bitmap); 

-       pset->runq.highq = IDLEPRI;
-       for (i = 0; i < NRQS; i++) {
-           queue_init(&(pset->runq.queues[i]));
-       }
+       pset->runq.urgency = pset->runq.count = 0;
+       for (i = 0; i < NRQS; i++)
+           queue_init(&pset->runq.queues[i]);

 
        queue_init(&pset->idle_queue);
        pset->idle_count = 0;
 
        queue_init(&pset->idle_queue);
        pset->idle_count = 0;

-       simple_lock_init(&pset->idle_lock, ETAP_THREAD_PSET_IDLE);
+       queue_init(&pset->active_queue);
+       simple_lock_init(&pset->sched_lock, 0);
+       pset->run_count = pset->share_count = 0;

        pset->mach_factor = pset->load_average = 0;
        pset->mach_factor = pset->load_average = 0;

-       pset->sched_load = 0;
+       pset->pri_shift = INT8_MAX;

        queue_init(&pset->processors);
        pset->processor_count = 0;
        queue_init(&pset->processors);
        pset->processor_count = 0;

-       simple_lock_init(&pset->processors_lock, ETAP_THREAD_PSET);

        queue_init(&pset->tasks);
        pset->task_count = 0;
        queue_init(&pset->threads);
        pset->thread_count = 0;
        pset->ref_count = 1;
        queue_init(&pset->tasks);
        pset->task_count = 0;
        queue_init(&pset->threads);
        pset->thread_count = 0;
        pset->ref_count = 1;

-       pset->active = FALSE;
-       mutex_init(&pset->lock, ETAP_THREAD_PSET);
+       pset->active = TRUE;
+       mutex_init(&pset->lock, 0);

        pset->pset_self = IP_NULL;
        pset->pset_name_self = IP_NULL;
        pset->pset_self = IP_NULL;
        pset->pset_name_self = IP_NULL;

-       pset->max_priority = MAXPRI_STANDARD;
-       pset->policies = POLICY_TIMESHARE | POLICY_FIFO | POLICY_RR;
-       pset->set_quantum = min_quantum;
-
-       pset->quantum_adj_index = 0;
-       simple_lock_init(&pset->quantum_adj_lock, ETAP_THREAD_PSET_QUANT);
-
-       for (i = 0; i <= NCPUS; i++) {
-           pset->machine_quantum[i] = min_quantum;
-       }
-
-       pset->policy_default = POLICY_TIMESHARE;
-       pset->policy_limit.ts.max_priority = MAXPRI_STANDARD;
-       pset->policy_limit.rr.max_priority = MAXPRI_STANDARD;
-       pset->policy_limit.fifo.max_priority = MAXPRI_STANDARD;
-       pset->policy_base.ts.base_priority = BASEPRI_DEFAULT;
-       pset->policy_base.rr.base_priority = BASEPRI_DEFAULT;
-       pset->policy_base.rr.quantum = min_quantum;
-       pset->policy_base.fifo.base_priority = BASEPRI_DEFAULT;
+       pset->timeshare_quanta = 1;

 }
 
 /*
 }
 
 /*


@@ -212,38 +166,77 @@ void pset_init(
  */
 void
 processor_init(
  */
 void
 processor_init(

-       register processor_t    pr,
-       int                     slot_num)
+       register processor_t    p,
+       int                                             slot_num)

 {
 {

-       int     i;
+       register int    i;

 
 

-       /* setup run-queues */
-       simple_lock_init(&pr->runq.lock, ETAP_THREAD_PROC_RUNQ);
-       pr->runq.count = 0;
-       for (i = 0; i < NRQBM; i++) {
-           pr->runq.bitmap[i] = 0;
-       }
-       setbit(MAXPRI - IDLEPRI, pr->runq.bitmap); 
-       pr->runq.highq = IDLEPRI;
-       for (i = 0; i < NRQS; i++) {
-           queue_init(&(pr->runq.queues[i]));
-       }
+       /* setup run queue */
+       p->runq.highq = IDLEPRI;
+       for (i = 0; i < NRQBM; i++)
+           p->runq.bitmap[i] = 0;
+       setbit(MAXPRI - IDLEPRI, p->runq.bitmap); 
+       p->runq.urgency = p->runq.count = 0;
+       for (i = 0; i < NRQS; i++)
+           queue_init(&p->runq.queues[i]);
+
+       p->state = PROCESSOR_OFF_LINE;
+       p->active_thread = p->next_thread = p->idle_thread = THREAD_NULL;
+       p->processor_set = PROCESSOR_SET_NULL;
+       p->current_pri = MINPRI;
+       p->deadline = UINT64_MAX;
+       timer_call_setup(&p->quantum_timer, thread_quantum_expire, p);
+       p->timeslice = 0;
+       simple_lock_init(&p->lock, 0);
+       p->processor_self = IP_NULL;
+       processor_data_init(p);
+       PROCESSOR_DATA(p, slot_num) = slot_num;
+
+       simple_lock(&processor_list_lock);
+       if (processor_list == NULL)
+               processor_list = p;
+       else
+               processor_list_tail->processor_list = p;
+       processor_list_tail = p;
+       processor_count++;
+       p->processor_list = NULL;
+       simple_unlock(&processor_list_lock);
+}
+
+/*
+ *     pset_deallocate:
+ *
+ *     Remove one reference to the processor set.  Destroy processor_set
+ *     if this was the last reference.
+ */
+void
+pset_deallocate(
+       processor_set_t pset)
+{
+       if (pset == PROCESSOR_SET_NULL)
+               return;
+
+       assert(pset == &default_pset);
+       return;
+}
+
+/*
+ *     pset_reference:
+ *
+ *     Add one reference to the processor set.
+ */
+void
+pset_reference(
+       processor_set_t pset)
+{
+       if (pset == PROCESSOR_SET_NULL)
+               return;

 
 

-       queue_init(&pr->processor_queue);
-       pr->state = PROCESSOR_OFF_LINE;
-       pr->next_thread = THREAD_NULL;
-       pr->idle_thread = THREAD_NULL;
-       pr->quantum = 0;
-       pr->first_quantum = FALSE;
-       pr->last_quantum = 0;
-       pr->processor_set = PROCESSOR_SET_NULL;
-       pr->processor_set_next = PROCESSOR_SET_NULL;
-       queue_init(&pr->processors);
-       simple_lock_init(&pr->lock, ETAP_THREAD_PROC);
-       pr->processor_self = IP_NULL;
-       pr->slot_num = slot_num;
+       assert(pset == &default_pset);

 }
 
 }
 

+#define pset_reference_locked(pset) assert(pset == &default_pset)
+

 /*
  *     pset_remove_processor() removes a processor from a processor_set.
  *     It can only be called on the current processor.  Caller must
 /*
  *     pset_remove_processor() removes a processor from a processor_set.
  *     It can only be called on the current processor.  Caller must


@@ -260,7 +253,7 @@ pset_remove_processor(
        queue_remove(&pset->processors, processor, processor_t, processors);
        processor->processor_set = PROCESSOR_SET_NULL;
        pset->processor_count--;
        queue_remove(&pset->processors, processor, processor_t, processors);
        processor->processor_set = PROCESSOR_SET_NULL;
        pset->processor_count--;

-       quantum_set(pset);
+       timeshare_quanta_update(pset);

 }
 
 /*
 }
 
 /*


@@ -277,13 +270,15 @@ pset_add_processor(
        queue_enter(&pset->processors, processor, processor_t, processors);
        processor->processor_set = pset;
        pset->processor_count++;
        queue_enter(&pset->processors, processor, processor_t, processors);
        processor->processor_set = pset;
        pset->processor_count++;

-       quantum_set(pset);
+       timeshare_quanta_update(pset);

 }
 
 /*
  *     pset_remove_task() removes a task from a processor_set.
 }
 
 /*
  *     pset_remove_task() removes a task from a processor_set.

- *     Caller must hold locks on pset and task.  Pset reference count
- *     is not decremented; caller must explicitly pset_deallocate.
+ *     Caller must hold locks on pset and task (unless task has
+ *     no references left, in which case just the pset lock is
+ *     needed).  Pset reference count is not decremented;
+ *     caller must explicitly pset_deallocate.

  */
 void
 pset_remove_task(
  */
 void
 pset_remove_task(


@@ -294,7 +289,6 @@ pset_remove_task(
                return;
 
        queue_remove(&pset->tasks, task, task_t, pset_tasks);
                return;
 
        queue_remove(&pset->tasks, task, task_t, pset_tasks);

-       task->processor_set = PROCESSOR_SET_NULL;

        pset->task_count--;
 }
 
        pset->task_count--;
 }
 


@@ -311,13 +305,15 @@ pset_add_task(
        queue_enter(&pset->tasks, task, task_t, pset_tasks);
        task->processor_set = pset;
        pset->task_count++;
        queue_enter(&pset->tasks, task, task_t, pset_tasks);
        task->processor_set = pset;
        pset->task_count++;

-       pset->ref_count++;
+       pset_reference_locked(pset);

 }
 
 /*
  *     pset_remove_thread() removes a thread from a processor_set.
 }
 
 /*
  *     pset_remove_thread() removes a thread from a processor_set.

- *     Caller must hold locks on pset and thread.  Pset reference count
- *     is not decremented; caller must explicitly pset_deallocate.
+ *     Caller must hold locks on pset and thread (but only if thread
+ *  has outstanding references that could be used to lookup the pset).
+ *  The pset reference count is not decremented; caller must explicitly
+ *  pset_deallocate.

  */
 void
 pset_remove_thread(
  */
 void
 pset_remove_thread(


@@ -325,7 +321,6 @@ pset_remove_thread(
        thread_t        thread)
 {
        queue_remove(&pset->threads, thread, thread_t, pset_threads);
        thread_t        thread)
 {
        queue_remove(&pset->threads, thread, thread_t, pset_threads);

-       thread->processor_set = PROCESSOR_SET_NULL;

        pset->thread_count--;
 }
 
        pset->thread_count--;
 }
 


@@ -342,7 +337,7 @@ pset_add_thread(
        queue_enter(&pset->threads, thread, thread_t, pset_threads);
        thread->processor_set = pset;
        pset->thread_count++;
        queue_enter(&pset->threads, thread, thread_t, pset_threads);
        thread->processor_set = pset;
        pset->thread_count++;

-       pset->ref_count++;
+       pset_reference_locked(pset);

 }
 
 /*
 }
 
 /*


@@ -361,130 +356,103 @@ thread_change_psets(
        queue_enter(&new_pset->threads, thread, thread_t, pset_threads);
        thread->processor_set = new_pset;
        new_pset->thread_count++;
        queue_enter(&new_pset->threads, thread, thread_t, pset_threads);
        thread->processor_set = new_pset;
        new_pset->thread_count++;

-       new_pset->ref_count++;
+       pset_reference_locked(new_pset);

 }      
 
 }      
 

-/*
- *     pset_deallocate:
- *
- *     Remove one reference to the processor set.  Destroy processor_set
- *     if this was the last reference.
- */
-void
-pset_deallocate(
-       processor_set_t pset)
-{
-       if (pset == PROCESSOR_SET_NULL)
-               return;
-
-       pset_lock(pset);
-       if (--pset->ref_count > 0) {
-               pset_unlock(pset);
-               return;
-       }
-
-       panic("pset_deallocate: default_pset destroyed");
-}
-
-/*
- *     pset_reference:
- *
- *     Add one reference to the processor set.
- */
-void
-pset_reference(
-       processor_set_t pset)
-{
-       pset_lock(pset);
-       pset->ref_count++;
-       pset_unlock(pset);
-}
-

 
 kern_return_t
 processor_info_count(
 
 kern_return_t
 processor_info_count(

-       processor_flavor_t      flavor,
+       processor_flavor_t              flavor,

        mach_msg_type_number_t  *count)
 {
        mach_msg_type_number_t  *count)
 {

-       kern_return_t           kr;
-

        switch (flavor) {
        switch (flavor) {

+

        case PROCESSOR_BASIC_INFO:
                *count = PROCESSOR_BASIC_INFO_COUNT;
        case PROCESSOR_BASIC_INFO:
                *count = PROCESSOR_BASIC_INFO_COUNT;

-               return KERN_SUCCESS;
+               break;
+

        case PROCESSOR_CPU_LOAD_INFO:
                *count = PROCESSOR_CPU_LOAD_INFO_COUNT;
        case PROCESSOR_CPU_LOAD_INFO:
                *count = PROCESSOR_CPU_LOAD_INFO_COUNT;

-               return KERN_SUCCESS;
+               break;
+

        default:
        default:

-               kr = cpu_info_count(flavor, count);
-               return kr;
+               return (cpu_info_count(flavor, count));

        }
        }

+
+       return (KERN_SUCCESS);

 }
 
 
 kern_return_t
 processor_info(
        register processor_t    processor,
 }
 
 
 kern_return_t
 processor_info(
        register processor_t    processor,

-       processor_flavor_t      flavor,
-       host_t                  *host,
-       processor_info_t        info,
+       processor_flavor_t              flavor,
+       host_t                                  *host,
+       processor_info_t                info,

        mach_msg_type_number_t  *count)
 {
        register int    i, slot_num, state;
        mach_msg_type_number_t  *count)
 {
        register int    i, slot_num, state;

-       register processor_basic_info_t         basic_info;
-       register processor_cpu_load_info_t      cpu_load_info;
-       kern_return_t   kr;
+       kern_return_t   result;

 
        if (processor == PROCESSOR_NULL)
 
        if (processor == PROCESSOR_NULL)

-               return(KERN_INVALID_ARGUMENT);
+               return (KERN_INVALID_ARGUMENT);

 
 

-       slot_num = processor->slot_num;
+       slot_num = PROCESSOR_DATA(processor, slot_num);

 
        switch (flavor) {
 
        case PROCESSOR_BASIC_INFO:
 
        switch (flavor) {
 
        case PROCESSOR_BASIC_INFO:

-         {
-           if (*count < PROCESSOR_BASIC_INFO_COUNT)
-             return(KERN_FAILURE);
-
-           basic_info = (processor_basic_info_t) info;
-           basic_info->cpu_type = machine_slot[slot_num].cpu_type;
-           basic_info->cpu_subtype = machine_slot[slot_num].cpu_subtype;
-           state = processor->state;
-           if (state == PROCESSOR_OFF_LINE)
-             basic_info->running = FALSE;
-           else
-             basic_info->running = TRUE;
-           basic_info->slot_num = slot_num;
-           if (processor == master_processor) 
-             basic_info->is_master = TRUE;
-           else
-             basic_info->is_master = FALSE;
-
-           *count = PROCESSOR_BASIC_INFO_COUNT;
-           *host = &realhost;
-           return(KERN_SUCCESS);
-         }
+       {
+               register processor_basic_info_t         basic_info;
+
+               if (*count < PROCESSOR_BASIC_INFO_COUNT)
+                       return (KERN_FAILURE);
+
+               basic_info = (processor_basic_info_t) info;
+               basic_info->cpu_type = slot_type(slot_num);
+               basic_info->cpu_subtype = slot_subtype(slot_num);
+               state = processor->state;
+               if (state == PROCESSOR_OFF_LINE)
+                       basic_info->running = FALSE;
+               else
+                       basic_info->running = TRUE;
+               basic_info->slot_num = slot_num;
+               if (processor == master_processor) 
+                       basic_info->is_master = TRUE;
+               else
+                       basic_info->is_master = FALSE;
+
+               *count = PROCESSOR_BASIC_INFO_COUNT;
+               *host = &realhost;
+
+           return (KERN_SUCCESS);
+       }
+

        case PROCESSOR_CPU_LOAD_INFO:
        case PROCESSOR_CPU_LOAD_INFO:

-         {
+       {
+               register processor_cpu_load_info_t      cpu_load_info;
+               register integer_t                                      *cpu_ticks;
+

            if (*count < PROCESSOR_CPU_LOAD_INFO_COUNT)
            if (*count < PROCESSOR_CPU_LOAD_INFO_COUNT)

-             return(KERN_FAILURE);
+                       return (KERN_FAILURE);

 
            cpu_load_info = (processor_cpu_load_info_t) info;
 
            cpu_load_info = (processor_cpu_load_info_t) info;

-           for (i=0;i<CPU_STATE_MAX;i++)
-             cpu_load_info->cpu_ticks[i] = machine_slot[slot_num].cpu_ticks[i];
+               cpu_ticks = PROCESSOR_DATA(processor, cpu_ticks);
+           for (i=0; i < CPU_STATE_MAX; i++)
+                       cpu_load_info->cpu_ticks[i] = cpu_ticks[i];

 
            *count = PROCESSOR_CPU_LOAD_INFO_COUNT;
            *host = &realhost;
 
            *count = PROCESSOR_CPU_LOAD_INFO_COUNT;
            *host = &realhost;

-           return(KERN_SUCCESS);
-         }
+
+           return (KERN_SUCCESS);
+       }
+

        default:
        default:

-         {
-           kr=cpu_info(flavor, slot_num, info, count);
-           if (kr == KERN_SUCCESS)
-               *host = &realhost;                 
-           return(kr);
-         }
+           result = cpu_info(flavor, slot_num, info, count);
+           if (result == KERN_SUCCESS)
+                       *host = &realhost;                 
+
+           return (result);

        }
 }
 
        }
 }
 


@@ -492,57 +460,103 @@ kern_return_t
 processor_start(
        processor_t     processor)
 {
 processor_start(
        processor_t     processor)
 {

-       int     state;
-       spl_t   s;
-       kern_return_t   kr;
+       kern_return_t   result;
+       thread_t                thread;   
+       spl_t                   s;

 
        if (processor == PROCESSOR_NULL)
 
        if (processor == PROCESSOR_NULL)

-               return(KERN_INVALID_ARGUMENT);
+               return (KERN_INVALID_ARGUMENT);

 
 

-       if (processor == master_processor)
-               return(cpu_start(processor->slot_num));
+       if (processor == master_processor) {
+               thread_t                self = current_thread();
+               processor_t             prev;
+
+               prev = thread_bind(self, processor);
+               thread_block(THREAD_CONTINUE_NULL);
+
+               result = cpu_start(PROCESSOR_DATA(processor, slot_num));
+
+               thread_bind(self, prev);
+
+               return (result);
+       }

 
        s = splsched();
        processor_lock(processor);
 
        s = splsched();
        processor_lock(processor);

-
-       state = processor->state;
-       if (state != PROCESSOR_OFF_LINE) {
+       if (processor->state != PROCESSOR_OFF_LINE) {

                processor_unlock(processor);
                splx(s);
                processor_unlock(processor);
                splx(s);

-               return(KERN_FAILURE);
+
+               return (KERN_FAILURE);

        }
        }

+

        processor->state = PROCESSOR_START;
        processor_unlock(processor);
        splx(s);
 
        processor->state = PROCESSOR_START;
        processor_unlock(processor);
        splx(s);
 

-       if (processor->next_thread == THREAD_NULL) {
-               thread_t                thread;   
-               extern void             start_cpu_thread(void);
-       
-               thread = kernel_thread_with_priority(kernel_task, MAXPRI_KERNBAND,
-                                                                               start_cpu_thread, FALSE);   
+       /*
+        *      Create the idle processor thread.
+        */
+       if (processor->idle_thread == THREAD_NULL) {
+               result = idle_thread_create(processor);
+               if (result != KERN_SUCCESS) {
+                       s = splsched();
+                       processor_lock(processor);
+                       processor->state = PROCESSOR_OFF_LINE;
+                       processor_unlock(processor);
+                       splx(s);
+
+                       return (result);
+               }
+       }
+
+       /*
+        *      If there is no active thread, the processor
+        *      has never been started.  Create a dedicated
+        *      start up thread.
+        */
+       if (    processor->active_thread == THREAD_NULL         &&
+                       processor->next_thread == THREAD_NULL           ) {
+               result = kernel_thread_create((thread_continue_t)processor_start_thread, NULL, MAXPRI_KERNEL, &thread);
+               if (result != KERN_SUCCESS) {
+                       s = splsched();
+                       processor_lock(processor);
+                       processor->state = PROCESSOR_OFF_LINE;
+                       processor_unlock(processor);
+                       splx(s);
+
+                       return (result);
+               }

 
                s = splsched();
                thread_lock(thread);
 
                s = splsched();
                thread_lock(thread);

-               thread_bind_locked(thread, processor);
-               thread_go_locked(thread, THREAD_AWAKENED);
-               (void)rem_runq(thread);
+               thread->bound_processor = processor;

                processor->next_thread = thread;
                processor->next_thread = thread;

+               thread->state = TH_RUN;

                thread_unlock(thread);
                splx(s);
                thread_unlock(thread);
                splx(s);

+
+               thread_deallocate(thread);

        }
 
        }
 

-       kr = cpu_start(processor->slot_num);
+       if (processor->processor_self == IP_NULL)
+               ipc_processor_init(processor);

 
 

-       if (kr != KERN_SUCCESS) {
+       result = cpu_start(PROCESSOR_DATA(processor, slot_num));
+       if (result != KERN_SUCCESS) {

                s = splsched();
                processor_lock(processor);
                processor->state = PROCESSOR_OFF_LINE;
                s = splsched();
                processor_lock(processor);
                processor->state = PROCESSOR_OFF_LINE;

+               timer_call_shutdown(processor);

                processor_unlock(processor);
                splx(s);
                processor_unlock(processor);
                splx(s);

+
+               return (result);

        }
 
        }
 

-       return(kr);
+       ipc_processor_enable(processor);
+
+       return (KERN_SUCCESS);

 }
 
 kern_return_t
 }
 
 kern_return_t


@@ -564,56 +578,44 @@ processor_control(
        if (processor == PROCESSOR_NULL)
                return(KERN_INVALID_ARGUMENT);
 
        if (processor == PROCESSOR_NULL)
                return(KERN_INVALID_ARGUMENT);
 

-       return(cpu_control(processor->slot_num, info, count));
+       return(cpu_control(PROCESSOR_DATA(processor, slot_num), info, count));

 }
 
 /*
 }
 
 /*

- *     Precalculate the appropriate system quanta based on load.  The
- *     index into machine_quantum is the number of threads on the
- *     processor set queue.  It is limited to the number of processors in
- *     the set.
+ *     Calculate the appropriate timesharing quanta based on set load.

  */
 
 void
  */
 
 void

-quantum_set(
+timeshare_quanta_update(

        processor_set_t         pset)
 {
        processor_set_t         pset)
 {

-#if NCPUS > 1
-       register int    i, ncpus;
-
-       ncpus = pset->processor_count;
-
-       for (i=1; i <= ncpus; i++)
-               pset->machine_quantum[i] = ((min_quantum * ncpus) + (i / 2)) / i ;
-
-       pset->machine_quantum[0] = pset->machine_quantum[1];
-
-       i = (pset->runq.count > ncpus) ? ncpus : pset->runq.count;
-       pset->set_quantum = pset->machine_quantum[i];
-#else   /* NCPUS > 1 */
-       default_pset.set_quantum = min_quantum;
-#endif  /* NCPUS > 1 */
+       int             pcount = pset->processor_count;
+       int             i = pset->runq.count;
+
+       if (i >= pcount)
+               i = 1;
+       else
+       if (i <= 1)
+               i = pcount;
+       else
+               i = (pcount + (i / 2)) / i;
+
+       pset->timeshare_quanta = i;

 }
            
 kern_return_t
 processor_set_create(
 }
            
 kern_return_t
 processor_set_create(

-       host_t  host,
-       processor_set_t *new_set,
-       processor_set_t *new_name)
+       __unused host_t         host,
+       __unused processor_set_t        *new_set,
+       __unused processor_set_t        *new_name)

 {
 {

-#ifdef lint
-       host++; new_set++; new_name++;
-#endif /* lint */

        return(KERN_FAILURE);
 }
 
 kern_return_t
 processor_set_destroy(
        return(KERN_FAILURE);
 }
 
 kern_return_t
 processor_set_destroy(

-       processor_set_t pset)
+       __unused processor_set_t        pset)

 {
 {

-#ifdef lint
-       pset++;
-#endif /* lint */

        return(KERN_FAILURE);
 }
 
        return(KERN_FAILURE);
 }
 


@@ -651,13 +653,8 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                basic_info = (processor_set_basic_info_t) info;
                        return(KERN_FAILURE);
 
                basic_info = (processor_set_basic_info_t) info;

-
-               pset_lock(pset);
-               simple_lock(&pset->processors_lock);

                basic_info->processor_count = pset->processor_count;
                basic_info->processor_count = pset->processor_count;

-               simple_unlock(&pset->processors_lock);
-               basic_info->default_policy = pset->policy_default;
-               pset_unlock(pset);
+               basic_info->default_policy = POLICY_TIMESHARE;

 
                *count = PROCESSOR_SET_BASIC_INFO_COUNT;
                *host = &realhost;
 
                *count = PROCESSOR_SET_BASIC_INFO_COUNT;
                *host = &realhost;


@@ -670,10 +667,7 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                ts_base = (policy_timeshare_base_t) info;
                        return(KERN_FAILURE);
 
                ts_base = (policy_timeshare_base_t) info;

-
-               pset_lock(pset);
-               *ts_base = pset->policy_base.ts;
-               pset_unlock(pset);
+               ts_base->base_priority = BASEPRI_DEFAULT;

 
                *count = POLICY_TIMESHARE_BASE_COUNT;
                *host = &realhost;
 
                *count = POLICY_TIMESHARE_BASE_COUNT;
                *host = &realhost;


@@ -686,10 +680,7 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                fifo_base = (policy_fifo_base_t) info;
                        return(KERN_FAILURE);
 
                fifo_base = (policy_fifo_base_t) info;

-
-               pset_lock(pset);
-               *fifo_base = pset->policy_base.fifo;
-               pset_unlock(pset);
+               fifo_base->base_priority = BASEPRI_DEFAULT;

 
                *count = POLICY_FIFO_BASE_COUNT;
                *host = &realhost;
 
                *count = POLICY_FIFO_BASE_COUNT;
                *host = &realhost;


@@ -702,10 +693,8 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                rr_base = (policy_rr_base_t) info;
                        return(KERN_FAILURE);
 
                rr_base = (policy_rr_base_t) info;

-
-               pset_lock(pset);
-               *rr_base = pset->policy_base.rr;
-               pset_unlock(pset);
+               rr_base->base_priority = BASEPRI_DEFAULT;
+               rr_base->quantum = 1;

 
                *count = POLICY_RR_BASE_COUNT;
                *host = &realhost;
 
                *count = POLICY_RR_BASE_COUNT;
                *host = &realhost;


@@ -718,10 +707,7 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                ts_limit = (policy_timeshare_limit_t) info;
                        return(KERN_FAILURE);
 
                ts_limit = (policy_timeshare_limit_t) info;

-
-               pset_lock(pset);
-               *ts_limit = pset->policy_limit.ts;
-               pset_unlock(pset);
+               ts_limit->max_priority = MAXPRI_KERNEL;

 
                *count = POLICY_TIMESHARE_LIMIT_COUNT;
                *host = &realhost;
 
                *count = POLICY_TIMESHARE_LIMIT_COUNT;
                *host = &realhost;


@@ -734,10 +720,7 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                fifo_limit = (policy_fifo_limit_t) info;
                        return(KERN_FAILURE);
 
                fifo_limit = (policy_fifo_limit_t) info;

-
-               pset_lock(pset);
-               *fifo_limit = pset->policy_limit.fifo;
-               pset_unlock(pset);
+               fifo_limit->max_priority = MAXPRI_KERNEL;

 
                *count = POLICY_FIFO_LIMIT_COUNT;
                *host = &realhost;
 
                *count = POLICY_FIFO_LIMIT_COUNT;
                *host = &realhost;


@@ -750,10 +733,7 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                rr_limit = (policy_rr_limit_t) info;
                        return(KERN_FAILURE);
 
                rr_limit = (policy_rr_limit_t) info;

-
-               pset_lock(pset);
-               *rr_limit = pset->policy_limit.rr;
-               pset_unlock(pset);
+               rr_limit->max_priority = MAXPRI_KERNEL;

 
                *count = POLICY_RR_LIMIT_COUNT;
                *host = &realhost;
 
                *count = POLICY_RR_LIMIT_COUNT;
                *host = &realhost;


@@ -766,10 +746,7 @@ processor_set_info(
                        return(KERN_FAILURE);
 
                enabled = (int *) info;
                        return(KERN_FAILURE);
 
                enabled = (int *) info;

-
-               pset_lock(pset);
-               *enabled = pset->policies;
-               pset_unlock(pset);
+               *enabled = POLICY_TIMESHARE | POLICY_RR | POLICY_FIFO;

 
                *count = sizeof(*enabled)/sizeof(int);
                *host = &realhost;
 
                *count = sizeof(*enabled)/sizeof(int);
                *host = &realhost;


@@ -807,10 +784,8 @@ processor_set_statistics(
                 pset_lock(pset);
                 load_info->task_count = pset->task_count;
                 load_info->thread_count = pset->thread_count;
                 pset_lock(pset);
                 load_info->task_count = pset->task_count;
                 load_info->thread_count = pset->thread_count;

-                               simple_lock(&pset->processors_lock);

                 load_info->mach_factor = pset->mach_factor;
                 load_info->load_average = pset->load_average;
                 load_info->mach_factor = pset->mach_factor;
                 load_info->load_average = pset->load_average;

-                               simple_unlock(&pset->processors_lock);

                 pset_unlock(pset);
 
                 *count = PROCESSOR_SET_LOAD_INFO_COUNT;
                 pset_unlock(pset);
 
                 *count = PROCESSOR_SET_LOAD_INFO_COUNT;


@@ -829,9 +804,9 @@ processor_set_statistics(
  */
 kern_return_t
 processor_set_max_priority(
  */
 kern_return_t
 processor_set_max_priority(

-       processor_set_t pset,
-       int             max_priority,
-       boolean_t       change_threads)
+       __unused processor_set_t        pset,
+       __unused int                    max_priority,
+       __unused boolean_t              change_threads)

 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }


@@ -844,8 +819,8 @@ processor_set_max_priority(
 
 kern_return_t
 processor_set_policy_enable(
 
 kern_return_t
 processor_set_policy_enable(

-       processor_set_t pset,
-       int             policy)
+       __unused processor_set_t        pset,
+       __unused int                    policy)

 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }


@@ -858,9 +833,9 @@ processor_set_policy_enable(
  */
 kern_return_t
 processor_set_policy_disable(
  */
 kern_return_t
 processor_set_policy_disable(

-       processor_set_t pset,
-       int             policy,
-       boolean_t       change_threads)
+       __unused processor_set_t        pset,
+       __unused int                    policy,
+       __unused boolean_t              change_threads)

 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }


@@ -875,19 +850,20 @@ processor_set_policy_disable(
  */
 kern_return_t
 processor_set_things(
  */
 kern_return_t
 processor_set_things(

-       processor_set_t         pset,
-       mach_port_t             **thing_list,
+       processor_set_t                 pset,
+       mach_port_t                             **thing_list,

        mach_msg_type_number_t  *count,
        mach_msg_type_number_t  *count,

-       int                     type)
+       int                                             type)

 {
        unsigned int actual;    /* this many things */
 {
        unsigned int actual;    /* this many things */

-       int i;
+       unsigned int maxthings;
+       unsigned int i;

 
        vm_size_t size, size_needed;
 
        vm_size_t size, size_needed;

-       vm_offset_t addr;
+       void  *addr;

 
        if (pset == PROCESSOR_SET_NULL)
 
        if (pset == PROCESSOR_SET_NULL)

-               return KERN_INVALID_ARGUMENT;
+               return (KERN_INVALID_ARGUMENT);

 
        size = 0; addr = 0;
 
 
        size = 0; addr = 0;
 


@@ -895,17 +871,18 @@ processor_set_things(
                pset_lock(pset);
                if (!pset->active) {
                        pset_unlock(pset);
                pset_lock(pset);
                if (!pset->active) {
                        pset_unlock(pset);

-                       return KERN_FAILURE;
+
+                       return (KERN_FAILURE);

                }
 
                if (type == THING_TASK)
                }
 
                if (type == THING_TASK)

-                       actual = pset->task_count;
+                       maxthings = pset->task_count;

                else
                else

-                       actual = pset->thread_count;
+                       maxthings = pset->thread_count;

 
                /* do we have the memory we need? */
 
 
                /* do we have the memory we need? */
 

-               size_needed = actual * sizeof(mach_port_t);
+               size_needed = maxthings * sizeof (mach_port_t);

                if (size_needed <= size)
                        break;
 
                if (size_needed <= size)
                        break;
 


@@ -920,58 +897,48 @@ processor_set_things(
 
                addr = kalloc(size);
                if (addr == 0)
 
                addr = kalloc(size);
                if (addr == 0)

-                       return KERN_RESOURCE_SHORTAGE;
+                       return (KERN_RESOURCE_SHORTAGE);

        }
 
        /* OK, have memory and the processor_set is locked & active */
 
        }
 
        /* OK, have memory and the processor_set is locked & active */
 

+       actual = 0;

        switch (type) {
        switch (type) {

-           case THING_TASK: {
-               task_t *tasks = (task_t *) addr;
-               task_t task;
-
-               for (i = 0, task = (task_t) queue_first(&pset->tasks);
-                    i < actual;
-                    i++, task = (task_t) queue_next(&task->pset_tasks)) {
-                       /* take ref for convert_task_to_port */
-                       task_reference(task);
-                       tasks[i] = task;
+
+       case THING_TASK:
+       {
+               task_t          task, *tasks = (task_t *)addr;
+
+               for (task = (task_t)queue_first(&pset->tasks);
+                               !queue_end(&pset->tasks, (queue_entry_t)task);
+                                       task = (task_t)queue_next(&task->pset_tasks)) {
+                       task_reference_internal(task);
+                       tasks[actual++] = task;

                }
                }

-               assert(queue_end(&pset->tasks, (queue_entry_t) task));
+

                break;
                break;

-           }
-
-           case THING_THREAD: {
-               thread_act_t *thr_acts = (thread_act_t *) addr;
-               thread_t thread;
-               thread_act_t thr_act;
-               queue_head_t *list;
-
-               list = &pset->threads;
-               thread = (thread_t) queue_first(list);
-               i = 0;
-               while (i < actual && !queue_end(list, (queue_entry_t)thread)) {
-                       thr_act = thread_lock_act(thread);
-                       if (thr_act && thr_act->ref_count > 0) {
-                               /* take ref for convert_act_to_port */
-                               act_locked_act_reference(thr_act);
-                               thr_acts[i] = thr_act;
-                               i++;
-                       }
-                       thread_unlock_act(thread);
-                       thread = (thread_t) queue_next(&thread->pset_threads);
-               }
-               if (i < actual) {
-                       actual = i;
-                       size_needed = actual * sizeof(mach_port_t);
+       }
+
+       case THING_THREAD:
+       {
+               thread_t        thread, *threads = (thread_t *)addr;
+
+               for (i = 0, thread = (thread_t)queue_first(&pset->threads);
+                               !queue_end(&pset->threads, (queue_entry_t)thread);
+                                       thread = (thread_t)queue_next(&thread->pset_threads)) {
+                       thread_reference_internal(thread);
+                       threads[actual++] = thread;

                }
                }

+

                break;
                break;

-           }

        }
        }

-
-       /* can unlock processor set now that we have the task/thread refs */
+       }
+               

        pset_unlock(pset);
 
        pset_unlock(pset);
 

+       if (actual < maxthings)
+               size_needed = actual * sizeof (mach_port_t);
+

        if (actual == 0) {
                /* no things, so return null pointer and deallocate memory */
                *thing_list = 0;
        if (actual == 0) {
                /* no things, so return null pointer and deallocate memory */
                *thing_list = 0;


@@ -979,65 +946,73 @@ processor_set_things(
 
                if (size != 0)
                        kfree(addr, size);
 
                if (size != 0)
                        kfree(addr, size);

-       } else {
+       }
+       else {

                /* if we allocated too much, must copy */
 
                if (size_needed < size) {
                /* if we allocated too much, must copy */
 
                if (size_needed < size) {

-                       vm_offset_t newaddr;
+                       void *newaddr;

 
                        newaddr = kalloc(size_needed);
                        if (newaddr == 0) {
                                switch (type) {
 
                        newaddr = kalloc(size_needed);
                        if (newaddr == 0) {
                                switch (type) {

-                                   case THING_TASK: {
-                                       task_t *tasks = (task_t *) addr;
+
+                               case THING_TASK:
+                               {
+                                       task_t          *tasks = (task_t *)addr;

 
                                        for (i = 0; i < actual; i++)
                                                task_deallocate(tasks[i]);
                                        break;
 
                                        for (i = 0; i < actual; i++)
                                                task_deallocate(tasks[i]);
                                        break;

-                                   }
+                               }

 
 

-                                   case THING_THREAD: {
-                                       thread_t *threads = (thread_t *) addr;
+                               case THING_THREAD:
+                               {
+                                       thread_t        *threads = (thread_t *)addr;

 
                                        for (i = 0; i < actual; i++)
                                                thread_deallocate(threads[i]);
                                        break;
 
                                        for (i = 0; i < actual; i++)
                                                thread_deallocate(threads[i]);
                                        break;

-                                   }

                                }
                                }

+                               }
+

                                kfree(addr, size);
                                kfree(addr, size);

-                               return KERN_RESOURCE_SHORTAGE;
+                               return (KERN_RESOURCE_SHORTAGE);

                        }
 
                        }
 

-                       bcopy((char *) addr, (char *) newaddr, size_needed);
+                       bcopy((void *) addr, (void *) newaddr, size_needed);

                        kfree(addr, size);
                        addr = newaddr;
                }
 
                        kfree(addr, size);
                        addr = newaddr;
                }
 

-               *thing_list = (mach_port_t *) addr;
+               *thing_list = (mach_port_t *)addr;

                *count = actual;
 
                /* do the conversion that Mig should handle */
 
                switch (type) {
                *count = actual;
 
                /* do the conversion that Mig should handle */
 
                switch (type) {

-                   case THING_TASK: {
-                       task_t *tasks = (task_t *) addr;
+
+               case THING_TASK:
+               {
+                       task_t          *tasks = (task_t *)addr;

 
                        for (i = 0; i < actual; i++)
                                (*thing_list)[i] = convert_task_to_port(tasks[i]);
                        break;
 
                        for (i = 0; i < actual; i++)
                                (*thing_list)[i] = convert_task_to_port(tasks[i]);
                        break;

-                   }
+               }

 
 

-                   case THING_THREAD: {
-                       thread_act_t *thr_acts = (thread_act_t *) addr;
+               case THING_THREAD:
+               {
+                       thread_t        *threads = (thread_t *)addr;

 
                        for (i = 0; i < actual; i++)
 
                        for (i = 0; i < actual; i++)

-                               (*thing_list)[i] = convert_act_to_port(thr_acts[i]);
+                               (*thing_list)[i] = convert_thread_to_port(threads[i]);

                        break;
                        break;

-                   }
+               }

                }
        }
 
                }
        }
 

-       return(KERN_SUCCESS);
+       return (KERN_SUCCESS);

 }
 
 
 }
 
 


@@ -1078,10 +1053,10 @@ processor_set_threads(
  */
 kern_return_t
 processor_set_base(
  */
 kern_return_t
 processor_set_base(

-       processor_set_t         pset,
-       policy_t                policy,
-        policy_base_t           base,
-       boolean_t               change)
+       __unused processor_set_t        pset,
+       __unused policy_t               policy,
+       __unused policy_base_t  base,
+       __unused boolean_t              change)

 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }


@@ -1095,10 +1070,10 @@ processor_set_base(
  */
 kern_return_t
 processor_set_limit(
  */
 kern_return_t
 processor_set_limit(

-       processor_set_t         pset,
-       policy_t                policy,
-        policy_limit_t         limit,
-       boolean_t               change)
+       __unused processor_set_t        pset,
+       __unused policy_t               policy,
+       __unused policy_limit_t         limit,
+       __unused boolean_t              change)

 {
        return (KERN_POLICY_LIMIT);
 }
 {
        return (KERN_POLICY_LIMIT);
 }


@@ -1112,11 +1087,11 @@ processor_set_limit(
  */
 kern_return_t
 processor_set_policy_control(
  */
 kern_return_t
 processor_set_policy_control(

-       processor_set_t         pset,
-       int                     flavor,
-       processor_set_info_t    policy_info,
-       mach_msg_type_number_t  count,
-       boolean_t               change)
+       __unused processor_set_t                pset,
+       __unused int                            flavor,
+       __unused processor_set_info_t   policy_info,
+       __unused mach_msg_type_number_t count,
+       __unused boolean_t                      change)

 {
        return (KERN_INVALID_ARGUMENT);
 }
 {
        return (KERN_INVALID_ARGUMENT);
 }