xnu-3248.30.4.tar.gz

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

diff --git a/osfmk/kern/bsd_kern.c b/osfmk/kern/bsd_kern.c
index c13e4082616e4673db1af7aa1eeeaa7ef1a151d3..713466a53c35cf766f26ae8970d2e5b0fd9eeef0 100644 (file)
--- a/osfmk/kern/bsd_kern.c
+++ b/osfmk/kern/bsd_kern.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2007 Apple, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.

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


@@ -26,13 +26,15 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <mach/mach_types.h>
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <mach/mach_types.h>

+#include <mach/machine/vm_param.h>
+#include <mach/task.h>

 
 #include <kern/kern_types.h>
 
 #include <kern/kern_types.h>

+#include <kern/ledger.h>

 #include <kern/processor.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/spl.h>
 #include <kern/processor.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/spl.h>

-#include <kern/lock.h>

 #include <kern/ast.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_object.h>
 #include <kern/ast.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_object.h>


@@ -40,27 +42,33 @@
 #include <vm/vm_kern.h>
 #include <vm/pmap.h>
 #include <vm/vm_protos.h> /* last */
 #include <vm/vm_kern.h>
 #include <vm/pmap.h>
 #include <vm/vm_protos.h> /* last */

+#include <sys/resource.h>
+#include <sys/signal.h>

 
 #undef thread_should_halt
 
 #undef thread_should_halt

-#undef ipc_port_release

 
 /* BSD KERN COMPONENT INTERFACE */
 
 task_t bsd_init_task = TASK_NULL;
 
 /* BSD KERN COMPONENT INTERFACE */
 
 task_t bsd_init_task = TASK_NULL;

-char   init_task_failure_data[1024];
+boolean_t init_task_died;

 extern unsigned int not_in_kdp; /* Skip acquiring locks if we're in kdp */
  
 thread_t get_firstthread(task_t);
 int get_task_userstop(task_t);
 int get_thread_userstop(thread_t);
 extern unsigned int not_in_kdp; /* Skip acquiring locks if we're in kdp */
  
 thread_t get_firstthread(task_t);
 int get_task_userstop(task_t);
 int get_thread_userstop(thread_t);

-boolean_t thread_should_abort(thread_t);

 boolean_t current_thread_aborted(void);
 void task_act_iterate_wth_args(task_t, void(*)(thread_t, void *), void *);
 boolean_t current_thread_aborted(void);
 void task_act_iterate_wth_args(task_t, void(*)(thread_t, void *), void *);

-void ipc_port_release(ipc_port_t);

 kern_return_t get_signalact(task_t , thread_t *, int);
 int get_vmsubmap_entries(vm_map_t, vm_object_offset_t, vm_object_offset_t);
 kern_return_t get_signalact(task_t , thread_t *, int);
 int get_vmsubmap_entries(vm_map_t, vm_object_offset_t, vm_object_offset_t);

-void syscall_exit_funnelcheck(void);
-
+int fill_task_rusage(task_t task, rusage_info_current *ri);
+int fill_task_io_rusage(task_t task, rusage_info_current *ri);
+int fill_task_qos_rusage(task_t task, rusage_info_current *ri);
+void fill_task_billed_usage(task_t task, rusage_info_current *ri);
+void task_bsdtask_kill(task_t);
+
+#if MACH_BSD
+extern void psignal(void *, int);
+#endif

 
 /*
  *
 
 /*
  *


@@ -70,6 +78,13 @@ void  *get_bsdtask_info(task_t t)
        return(t->bsd_info);
 }
 
        return(t->bsd_info);
 }
 

+void task_bsdtask_kill(task_t t)
+{
+       void * bsd_info = get_bsdtask_info(t);
+       if (bsd_info != NULL) {
+               psignal(bsd_info, SIGKILL);
+       }
+}

 /*
  *
  */
 /*
  *
  */


@@ -94,6 +109,15 @@ void *get_bsdthread_info(thread_t th)
        return(th->uthread);
 }
 
        return(th->uthread);
 }
 

+/*
+ * XXX
+ */
+int get_thread_lock_count(thread_t th);                /* forced forward */
+int get_thread_lock_count(thread_t th)
+{
+       return(th->mutex_count);
+}
+

 /*
  * XXX: wait for BSD to  fix signal code
  * Until then, we cannot block here.  We know the task
 /*
  * XXX: wait for BSD to  fix signal code
  * Until then, we cannot block here.  We know the task


@@ -102,7 +126,7 @@ void *get_bsdthread_info(thread_t th)
  */
 thread_t get_firstthread(task_t task)
 {
  */
 thread_t get_firstthread(task_t task)
 {

-       thread_t        thread = (thread_t)queue_first(&task->threads);
+       thread_t        thread = (thread_t)(void *)queue_first(&task->threads);

 
        if (queue_end(&task->threads, (queue_entry_t)thread))
                thread = THREAD_NULL;
 
        if (queue_end(&task->threads, (queue_entry_t)thread))
                thread = THREAD_NULL;


@@ -130,17 +154,17 @@ get_signalact(
                return (KERN_FAILURE);
        }
 
                return (KERN_FAILURE);
        }
 

-       for (inc  = (thread_t)queue_first(&task->threads);
+       for (inc  = (thread_t)(void *)queue_first(&task->threads);

                        !queue_end(&task->threads, (queue_entry_t)inc); ) {
                thread_mtx_lock(inc);
                if (inc->active &&
                        !queue_end(&task->threads, (queue_entry_t)inc); ) {
                thread_mtx_lock(inc);
                if (inc->active &&

-                               (inc->sched_mode & TH_MODE_ISABORTED) != TH_MODE_ABORT) {
+                               (inc->sched_flags & TH_SFLAG_ABORTED_MASK) != TH_SFLAG_ABORT) {

                        thread = inc;
                        break;
                }
                thread_mtx_unlock(inc);
 
                        thread = inc;
                        break;
                }
                thread_mtx_unlock(inc);
 

-               inc = (thread_t)queue_next(&inc->task_threads);
+               inc = (thread_t)(void *)queue_next(&inc->task_threads);

        }
 
        if (result_out) 
        }
 
        if (result_out) 


@@ -178,13 +202,13 @@ check_actforsig(
                return (KERN_FAILURE);
        }
 
                return (KERN_FAILURE);
        }
 

-       for (inc  = (thread_t)queue_first(&task->threads);
+       for (inc  = (thread_t)(void *)queue_first(&task->threads);

                        !queue_end(&task->threads, (queue_entry_t)inc); ) {
                if (inc == thread) {
                        thread_mtx_lock(inc);
 
                        if (inc->active  && 
                        !queue_end(&task->threads, (queue_entry_t)inc); ) {
                if (inc == thread) {
                        thread_mtx_lock(inc);
 
                        if (inc->active  && 

-                                       (inc->sched_mode & TH_MODE_ISABORTED) != TH_MODE_ABORT) {
+                                       (inc->sched_flags & TH_SFLAG_ABORTED_MASK) != TH_SFLAG_ABORT) {

                                result = KERN_SUCCESS;
                                break;
                        }
                                result = KERN_SUCCESS;
                                break;
                        }


@@ -193,7 +217,7 @@ check_actforsig(
                        break;
                }
 
                        break;
                }
 

-               inc = (thread_t)queue_next(&inc->task_threads);
+               inc = (thread_t)(void *)queue_next(&inc->task_threads);

        }
 
        if (result == KERN_SUCCESS) {
        }
 
        if (result == KERN_SUCCESS) {


@@ -208,11 +232,16 @@ check_actforsig(
        return (result);
 }
 
        return (result);
 }
 

+ledger_t  get_task_ledger(task_t t)
+{
+       return(t->ledger);
+}
+

 /*
  * This is only safe to call from a thread executing in
 /*
  * This is only safe to call from a thread executing in

- * in the task's context or if the task is locked  Otherwise,
+ * in the task's context or if the task is locked. Otherwise,

  * the map could be switched for the task (and freed) before
  * the map could be switched for the task (and freed) before

- * we to return it here.
+ * we go to return it here.

  */
 vm_map_t  get_task_map(task_t t)
 {
  */
 vm_map_t  get_task_map(task_t t)
 {


@@ -251,8 +280,8 @@ int get_task_numactivethreads(task_t task)
        int num_active_thr=0;
        task_lock(task);
 
        int num_active_thr=0;
        task_lock(task);
 

-       for (inc  = (thread_t)queue_first(&task->threads);
-                       !queue_end(&task->threads, (queue_entry_t)inc); inc = (thread_t)queue_next(&inc->task_threads)) 
+       for (inc  = (thread_t)(void *)queue_first(&task->threads);
+                       !queue_end(&task->threads, (queue_entry_t)inc); inc = (thread_t)(void *)queue_next(&inc->task_threads)) 

        {
                if(inc->active)
                        num_active_thr++;
        {
                if(inc->active)
                        num_active_thr++;


@@ -269,37 +298,48 @@ int  get_task_numacts(task_t t)
 /* does this machine need  64bit register set for signal handler */
 int is_64signalregset(void)
 {
 /* does this machine need  64bit register set for signal handler */
 int is_64signalregset(void)
 {

-       task_t t = current_task();
-       if(t->taskFeatures[0] & tf64BitData)
+       if (task_has_64BitData(current_task())) {

                return(1);
                return(1);

-       else
-               return(0);
+       }
+
+       return(0);

 }
 
 /*
 }
 
 /*

- * The old map reference is returned.
+ * Swap in a new map for the task/thread pair; the old map reference is
+ * returned.

  */
 vm_map_t
  */
 vm_map_t

-swap_task_map(task_t task,vm_map_t map)
+swap_task_map(task_t task, thread_t thread, vm_map_t map, boolean_t doswitch)

 {
 {

-       thread_t thread = current_thread();

        vm_map_t old_map;
 
        if (task != thread->task)
                panic("swap_task_map");
 
        task_lock(task);
        vm_map_t old_map;
 
        if (task != thread->task)
                panic("swap_task_map");
 
        task_lock(task);

+       mp_disable_preemption();

        old_map = task->map;
        thread->map = task->map = map;
        old_map = task->map;
        thread->map = task->map = map;

+       if (doswitch) {
+               pmap_switch(map->pmap);
+       }
+       mp_enable_preemption();

        task_unlock(task);
 
        task_unlock(task);
 

+#if (defined(__i386__) || defined(__x86_64__)) && NCOPY_WINDOWS > 0

        inval_copy_windows(thread);
        inval_copy_windows(thread);

+#endif

 
        return old_map;
 }
 
 /*
  *
 
        return old_map;
 }
 
 /*
  *

+ * This is only safe to call from a thread executing in
+ * in the task's context or if the task is locked. Otherwise,
+ * the map could be switched for the task (and freed) before
+ * we go to return it here.

  */
 pmap_t  get_task_pmap(task_t t)
 {
  */
 pmap_t  get_task_pmap(task_t t)
 {


@@ -309,10 +349,98 @@ pmap_t  get_task_pmap(task_t t)
 /*
  *
  */
 /*
  *
  */

-pmap_t  get_map_pmap(vm_map_t map)
+uint64_t get_task_resident_size(task_t task) 
+{
+       vm_map_t map;
+       
+       map = (task == kernel_task) ? kernel_map: task->map;
+       return((uint64_t)pmap_resident_count(map->pmap) * PAGE_SIZE_64);
+}
+
+uint64_t get_task_compressed(task_t task) 
+{
+       vm_map_t map;
+       
+       map = (task == kernel_task) ? kernel_map: task->map;
+       return((uint64_t)pmap_compressed(map->pmap) * PAGE_SIZE_64);
+}
+
+uint64_t get_task_resident_max(task_t task) 

 {
 {

-       return(map->pmap);
+       vm_map_t map;
+       
+       map = (task == kernel_task) ? kernel_map: task->map;
+       return((uint64_t)pmap_resident_max(map->pmap) * PAGE_SIZE_64);

 }
 }

+
+uint64_t get_task_purgeable_size(task_t task) 
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+       uint64_t volatile_size = 0;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_volatile, &credit, &debit);
+       if (ret != KERN_SUCCESS) {
+               return 0;
+       }
+
+       volatile_size += (credit - debit);
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_volatile_compressed, &credit, &debit);
+       if (ret != KERN_SUCCESS) {
+               return 0;
+       }
+
+       volatile_size += (credit - debit);
+
+       return volatile_size;
+}
+
+/*
+ *
+ */
+uint64_t get_task_phys_footprint(task_t task) 
+{      
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+       
+       ret = ledger_get_entries(task->ledger, task_ledgers.phys_footprint, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+
+/*
+ *
+ */
+uint64_t get_task_phys_footprint_max(task_t task) 
+{      
+       kern_return_t ret;
+       ledger_amount_t max;
+       
+       ret = ledger_get_maximum(task->ledger, task_ledgers.phys_footprint, &max);
+       if (KERN_SUCCESS == ret) {
+               return max;
+       }
+
+       return 0;
+}
+
+uint64_t get_task_cpu_time(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+       
+       ret = ledger_get_entries(task->ledger, task_ledgers.cpu_time, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+

 /*
  *
  */
 /*
  *
  */


@@ -366,10 +494,11 @@ get_vmsubmap_entries(
        while((entry != vm_map_to_entry(map)) && (entry->vme_start < end)) {
                if(entry->is_sub_map) {
                        total_entries +=        
        while((entry != vm_map_to_entry(map)) && (entry->vme_start < end)) {
                if(entry->is_sub_map) {
                        total_entries +=        

-                               get_vmsubmap_entries(entry->object.sub_map, 
-                                       entry->offset, 
-                                       entry->offset + 
-                                       (entry->vme_end - entry->vme_start));
+                               get_vmsubmap_entries(VME_SUBMAP(entry), 
+                                                    VME_OFFSET(entry), 
+                                                    (VME_OFFSET(entry) + 
+                                                     entry->vme_end -
+                                                     entry->vme_start));

                } else {
                        total_entries += 1;
                }
                } else {
                        total_entries += 1;
                }


@@ -394,10 +523,11 @@ get_vmmap_entries(
        while(entry != vm_map_to_entry(map)) {
                if(entry->is_sub_map) {
                        total_entries +=        
        while(entry != vm_map_to_entry(map)) {
                if(entry->is_sub_map) {
                        total_entries +=        

-                               get_vmsubmap_entries(entry->object.sub_map, 
-                                       entry->offset, 
-                                       entry->offset + 
-                                       (entry->vme_end - entry->vme_start));
+                               get_vmsubmap_entries(VME_SUBMAP(entry), 
+                                                    VME_OFFSET(entry),
+                                                    (VME_OFFSET(entry) + 
+                                                     entry->vme_end -
+                                                     entry->vme_start));

                } else {
                        total_entries += 1;
                }
                } else {
                        total_entries += 1;
                }


@@ -431,6 +561,26 @@ get_thread_userstop(
        return(th->user_stop_count);
 }
 
        return(th->user_stop_count);
 }
 

+/*
+ *
+ */
+boolean_t
+get_task_pidsuspended(
+       task_t task)
+{
+    return (task->pidsuspended);
+}
+
+/*
+ *
+ */
+boolean_t 
+get_task_frozen(
+       task_t task)
+{
+    return (task->frozen);   
+}
+

 /*
  *
  */
 /*
  *
  */


@@ -438,7 +588,7 @@ boolean_t
 thread_should_abort(
        thread_t th)
 {
 thread_should_abort(
        thread_t th)
 {

-       return ((th->sched_mode & TH_MODE_ISABORTED) == TH_MODE_ABORT);
+       return ((th->sched_flags & TH_SFLAG_ABORTED_MASK) == TH_SFLAG_ABORT);

 }
 
 /*
 }
 
 /*


@@ -456,14 +606,14 @@ current_thread_aborted (
        thread_t th = current_thread();
        spl_t s;
 
        thread_t th = current_thread();
        spl_t s;
 

-       if ((th->sched_mode & TH_MODE_ISABORTED) == TH_MODE_ABORT &&
+       if ((th->sched_flags & TH_SFLAG_ABORTED_MASK) == TH_SFLAG_ABORT &&

                        (th->options & TH_OPT_INTMASK) != THREAD_UNINT)
                return (TRUE);
                        (th->options & TH_OPT_INTMASK) != THREAD_UNINT)
                return (TRUE);

-       if (th->sched_mode & TH_MODE_ABORTSAFELY) {
+       if (th->sched_flags & TH_SFLAG_ABORTSAFELY) {

                s = splsched();
                thread_lock(th);
                s = splsched();
                thread_lock(th);

-               if (th->sched_mode & TH_MODE_ABORTSAFELY)
-                       th->sched_mode &= ~TH_MODE_ISABORTED;
+               if (th->sched_flags & TH_SFLAG_ABORTSAFELY)
+                       th->sched_flags &= ~TH_SFLAG_ABORTED_MASK;

                thread_unlock(th);
                splx(s);
        }
                thread_unlock(th);
                splx(s);
        }


@@ -483,32 +633,15 @@ task_act_iterate_wth_args(
 
        task_lock(task);
 
 
        task_lock(task);
 

-       for (inc  = (thread_t)queue_first(&task->threads);
+       for (inc  = (thread_t)(void *)queue_first(&task->threads);

                        !queue_end(&task->threads, (queue_entry_t)inc); ) {
                (void) (*func_callback)(inc, func_arg);
                        !queue_end(&task->threads, (queue_entry_t)inc); ) {
                (void) (*func_callback)(inc, func_arg);

-               inc = (thread_t)queue_next(&inc->task_threads);
+               inc = (thread_t)(void *)queue_next(&inc->task_threads);

        }
 
        task_unlock(task);
 }
 
        }
 
        task_unlock(task);
 }
 

-void
-ipc_port_release(
-       ipc_port_t port)
-{
-       ipc_object_release(&(port)->ip_object);
-}
-
-void
-astbsd_on(void)
-{
-       boolean_t       reenable;
-
-       reenable = ml_set_interrupts_enabled(FALSE);
-       ast_on_fast(AST_BSD);
-       (void)ml_set_interrupts_enabled(reenable);
-}
-

 
 #include <sys/bsdtask_info.h>
 
 
 #include <sys/bsdtask_info.h>
 


@@ -518,8 +651,12 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
        vm_map_t map;
        task_absolutetime_info_data_t   tinfo;
        thread_t thread;
        vm_map_t map;
        task_absolutetime_info_data_t   tinfo;
        thread_t thread;

-       int cswitch = 0, numrunning = 0;
-       
+       uint32_t cswitch = 0, numrunning = 0;
+       uint32_t syscalls_unix = 0;
+       uint32_t syscalls_mach = 0;
+
+       task_lock(task);
+

        map = (task == kernel_task)? kernel_map: task->map;
 
        ptinfo->pti_virtual_size  = map->size;
        map = (task == kernel_task)? kernel_map: task->map;
 
        ptinfo->pti_virtual_size  = map->size;


@@ -527,8 +664,6 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
                (mach_vm_size_t)(pmap_resident_count(map->pmap))
                * PAGE_SIZE_64;
 
                (mach_vm_size_t)(pmap_resident_count(map->pmap))
                * PAGE_SIZE_64;
 

-       task_lock(task);
-

        ptinfo->pti_policy = ((task != kernel_task)?
                                           POLICY_TIMESHARE: POLICY_RR);
 
        ptinfo->pti_policy = ((task != kernel_task)?
                                           POLICY_TIMESHARE: POLICY_RR);
 


@@ -538,6 +673,13 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
 
        queue_iterate(&task->threads, thread, thread_t, task_threads) {
                uint64_t    tval;
 
        queue_iterate(&task->threads, thread, thread_t, task_threads) {
                uint64_t    tval;

+               spl_t x;
+
+               if (thread->options & TH_OPT_IDLE_THREAD)
+                       continue;
+
+               x = splsched();
+               thread_lock(thread);

 
                if ((thread->state & TH_RUN) == TH_RUN)
                        numrunning++;
 
                if ((thread->state & TH_RUN) == TH_RUN)
                        numrunning++;


@@ -547,8 +689,21 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
                tinfo.total_user += tval;
 
                tval = timer_grab(&thread->system_timer);
                tinfo.total_user += tval;
 
                tval = timer_grab(&thread->system_timer);

-               tinfo.threads_system += tval;
-               tinfo.total_system += tval;
+
+               if (thread->precise_user_kernel_time) {
+                       tinfo.threads_system += tval;
+                       tinfo.total_system += tval;
+               } else {
+                       /* system_timer may represent either sys or user */
+                       tinfo.threads_user += tval;
+                       tinfo.total_user += tval;
+               }
+
+               syscalls_unix += thread->syscalls_unix;
+               syscalls_mach += thread->syscalls_mach;
+
+               thread_unlock(thread);
+               splx(x);

        }
 
        ptinfo->pti_total_system = tinfo.total_system;
        }
 
        ptinfo->pti_total_system = tinfo.total_system;


@@ -561,8 +716,8 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
        ptinfo->pti_cow_faults = task->cow_faults;
        ptinfo->pti_messages_sent = task->messages_sent;
        ptinfo->pti_messages_received = task->messages_received;
        ptinfo->pti_cow_faults = task->cow_faults;
        ptinfo->pti_messages_sent = task->messages_sent;
        ptinfo->pti_messages_received = task->messages_received;

-       ptinfo->pti_syscalls_mach = task->syscalls_mach;
-       ptinfo->pti_syscalls_unix = task->syscalls_unix;
+       ptinfo->pti_syscalls_mach = task->syscalls_mach + syscalls_mach;
+       ptinfo->pti_syscalls_unix = task->syscalls_unix + syscalls_unix;

        ptinfo->pti_csw = task->c_switch + cswitch;
        ptinfo->pti_threadnum = task->thread_count;
        ptinfo->pti_numrunning = numrunning;
        ptinfo->pti_csw = task->c_switch + cswitch;
        ptinfo->pti_threadnum = task->thread_count;
        ptinfo->pti_numrunning = numrunning;


@@ -572,25 +727,21 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
 }
 
 int 
 }
 
 int 

-fill_taskthreadinfo(task_t task, uint64_t thaddr, struct proc_threadinfo_internal * ptinfo, void * vpp, int *vidp)
+fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_threadinfo_internal * ptinfo, void * vpp, int *vidp)

 {
        thread_t  thact;
        int err=0;
        mach_msg_type_number_t count;
        thread_basic_info_data_t basic_info;
        kern_return_t kret;
 {
        thread_t  thact;
        int err=0;
        mach_msg_type_number_t count;
        thread_basic_info_data_t basic_info;
        kern_return_t kret;

+       uint64_t addr = 0;

 
        task_lock(task);
 
 
        task_lock(task);
 

-       for (thact  = (thread_t)queue_first(&task->threads);
+       for (thact  = (thread_t)(void *)queue_first(&task->threads);

                        !queue_end(&task->threads, (queue_entry_t)thact); ) {
                        !queue_end(&task->threads, (queue_entry_t)thact); ) {

-#if defined(__ppc__) || defined(__arm__)
-               if (thact->machine.cthread_self == thaddr)
-#elif defined (__i386__)
-               if (thact->machine.pcb->cthread_self == thaddr)
-#else
-#error architecture not supported
-#endif
+               addr = (thuniqueid==0)?thact->machine.cthread_self: thact->thread_id;
+               if (addr == thaddr)

                {
                
                        count = THREAD_BASIC_INFO_COUNT;
                {
                
                        count = THREAD_BASIC_INFO_COUNT;


@@ -598,29 +749,25 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, struct proc_threadinfo_interna
                                err = 1;
                                goto out;       
                        }
                                err = 1;
                                goto out;       
                        }

-#if 0
-                       ptinfo->pth_user_time = timer_grab(&basic_info.user_time);
-                       ptinfo->pth_system_time = timer_grab(&basic_info.system_time);
-#else
-                       ptinfo->pth_user_time = ((basic_info.user_time.seconds * NSEC_PER_SEC) + (basic_info.user_time.microseconds * NSEC_PER_USEC));
-                       ptinfo->pth_system_time = ((basic_info.system_time.seconds * NSEC_PER_SEC) + (basic_info.system_time.microseconds * NSEC_PER_USEC));
+                       ptinfo->pth_user_time = ((basic_info.user_time.seconds * (integer_t)NSEC_PER_SEC) + (basic_info.user_time.microseconds * (integer_t)NSEC_PER_USEC));
+                       ptinfo->pth_system_time = ((basic_info.system_time.seconds * (integer_t)NSEC_PER_SEC) + (basic_info.system_time.microseconds * (integer_t)NSEC_PER_USEC));

 
 

-#endif

                        ptinfo->pth_cpu_usage = basic_info.cpu_usage;
                        ptinfo->pth_policy = basic_info.policy;
                        ptinfo->pth_run_state = basic_info.run_state;
                        ptinfo->pth_flags = basic_info.flags;
                        ptinfo->pth_sleep_time = basic_info.sleep_time;
                        ptinfo->pth_curpri = thact->sched_pri;
                        ptinfo->pth_cpu_usage = basic_info.cpu_usage;
                        ptinfo->pth_policy = basic_info.policy;
                        ptinfo->pth_run_state = basic_info.run_state;
                        ptinfo->pth_flags = basic_info.flags;
                        ptinfo->pth_sleep_time = basic_info.sleep_time;
                        ptinfo->pth_curpri = thact->sched_pri;

-                       ptinfo->pth_priority = thact->priority;
+                       ptinfo->pth_priority = thact->base_pri;

                        ptinfo->pth_maxpriority = thact->max_priority;
                        
                        if ((vpp != NULL) && (thact->uthread != NULL)) 
                                bsd_threadcdir(thact->uthread, vpp, vidp);
                        ptinfo->pth_maxpriority = thact->max_priority;
                        
                        if ((vpp != NULL) && (thact->uthread != NULL)) 
                                bsd_threadcdir(thact->uthread, vpp, vidp);

+                       bsd_getthreadname(thact->uthread,ptinfo->pth_name);

                        err = 0;
                        goto out; 
                }
                        err = 0;
                        goto out; 
                }

-               thact = (thread_t)queue_next(&thact->task_threads);
+               thact = (thread_t)(void *)queue_next(&thact->task_threads);

        }
        err = 1;
 
        }
        err = 1;
 


@@ -641,25 +788,19 @@ fill_taskthreadlist(task_t task, void * buffer, int thcount)
 
        task_lock(task);
 
 
        task_lock(task);
 

-       for (thact  = (thread_t)queue_first(&task->threads);
+       for (thact  = (thread_t)(void *)queue_first(&task->threads);

                        !queue_end(&task->threads, (queue_entry_t)thact); ) {
                        !queue_end(&task->threads, (queue_entry_t)thact); ) {

-#if defined(__ppc__) || defined(__arm__)

                thaddr = thact->machine.cthread_self;
                thaddr = thact->machine.cthread_self;

-#elif defined (__i386__)
-               thaddr = thact->machine.pcb->cthread_self;
-#else
-#error architecture not supported
-#endif

                *uptr++ = thaddr;
                numthr++;
                if (numthr >= thcount)
                        goto out;
                *uptr++ = thaddr;
                numthr++;
                if (numthr >= thcount)
                        goto out;

-               thact = (thread_t)queue_next(&thact->task_threads);
+               thact = (thread_t)(void *)queue_next(&thact->task_threads);

        }
 
 out:
        task_unlock(task);
        }
 
 out:
        task_unlock(task);

-       return(numthr * sizeof(uint64_t));
+       return (int)(numthr * sizeof(uint64_t));

        
 }
 
        
 }
 


@@ -669,13 +810,93 @@ get_numthreads(task_t task)
        return(task->thread_count);
 }
 
        return(task->thread_count);
 }
 

-void 
-syscall_exit_funnelcheck(void)
+/*
+ * Gather the various pieces of info about the designated task, 
+ * and collect it all into a single rusage_info.
+ */
+int
+fill_task_rusage(task_t task, rusage_info_current *ri)
+{
+       struct task_power_info powerinfo;
+
+       assert(task != TASK_NULL);
+       task_lock(task);
+
+       task_power_info_locked(task, &powerinfo, NULL);
+       ri->ri_pkg_idle_wkups = powerinfo.task_platform_idle_wakeups;
+       ri->ri_interrupt_wkups = powerinfo.task_interrupt_wakeups;
+       ri->ri_user_time = powerinfo.total_user;
+       ri->ri_system_time = powerinfo.total_system;
+
+       ledger_get_balance(task->ledger, task_ledgers.phys_footprint,
+                          (ledger_amount_t *)&ri->ri_phys_footprint);
+       ledger_get_balance(task->ledger, task_ledgers.phys_mem,
+                          (ledger_amount_t *)&ri->ri_resident_size);
+       ledger_get_balance(task->ledger, task_ledgers.wired_mem,
+                          (ledger_amount_t *)&ri->ri_wired_size);
+
+       ri->ri_pageins = task->pageins;
+
+       task_unlock(task);
+       return (0);
+}
+
+void
+fill_task_billed_usage(task_t task __unused, rusage_info_current *ri)
+{
+#if CONFIG_BANK
+       ri->ri_billed_system_time = bank_billed_time(task->bank_context);
+       ri->ri_serviced_system_time = bank_serviced_time(task->bank_context);
+#else
+       ri->ri_billed_system_time = 0;
+       ri->ri_serviced_system_time = 0;
+#endif
+}
+
+int
+fill_task_io_rusage(task_t task, rusage_info_current *ri)
+{
+       assert(task != TASK_NULL);
+       task_lock(task);
+
+       if (task->task_io_stats) {
+               ri->ri_diskio_bytesread = task->task_io_stats->disk_reads.size;
+               ri->ri_diskio_byteswritten = (task->task_io_stats->total_io.size - task->task_io_stats->disk_reads.size);
+       } else {
+               /* I/O Stats unavailable */
+               ri->ri_diskio_bytesread = 0;
+               ri->ri_diskio_byteswritten = 0;
+       }
+       task_unlock(task);
+       return (0);
+}
+
+int
+fill_task_qos_rusage(task_t task, rusage_info_current *ri)

 {
 {

-        thread_t thread;
+       thread_t thread;

 
 

-       thread = current_thread();
+       assert(task != TASK_NULL);
+       task_lock(task);

 
 

-        if (thread->funnel_lock)
-               panic("syscall exit with funnel held\n");
+       /* Rollup Qos time of all the threads to task */
+       queue_iterate(&task->threads, thread, thread_t, task_threads) {
+               if (thread->options & TH_OPT_IDLE_THREAD)
+                       continue;
+
+               thread_mtx_lock(thread);
+               thread_update_qos_cpu_time(thread, TRUE);
+               thread_mtx_unlock(thread);
+               
+       }
+       ri->ri_cpu_time_qos_default = task->cpu_time_qos_stats.cpu_time_qos_default;
+       ri->ri_cpu_time_qos_maintenance = task->cpu_time_qos_stats.cpu_time_qos_maintenance;
+       ri->ri_cpu_time_qos_background = task->cpu_time_qos_stats.cpu_time_qos_background;
+       ri->ri_cpu_time_qos_utility = task->cpu_time_qos_stats.cpu_time_qos_utility;
+       ri->ri_cpu_time_qos_legacy = task->cpu_time_qos_stats.cpu_time_qos_legacy;
+       ri->ri_cpu_time_qos_user_initiated = task->cpu_time_qos_stats.cpu_time_qos_user_initiated;
+       ri->ri_cpu_time_qos_user_interactive = task->cpu_time_qos_stats.cpu_time_qos_user_interactive;
+
+       task_unlock(task);
+       return (0);

 }
 }