xnu-3789.31.2.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 ea5f9e13912bee4c7fcb7c081cb1bc0484bb2354..ac79a2345df76e61352f1c47b1d5b3f5badfd3ab 100644 (file)
--- a/osfmk/kern/bsd_kern.c
+++ b/osfmk/kern/bsd_kern.c
@@ -27,13 +27,14 @@
  */
 #include <mach/mach_types.h>
 #include <mach/machine/vm_param.h>
  */
 #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>


@@ -41,13 +42,14 @@
 #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
 
 /* BSD KERN COMPONENT INTERFACE */
 
 task_t bsd_init_task = TASK_NULL;
 
 #undef thread_should_halt
 
 /* BSD KERN COMPONENT INTERFACE */
 
 task_t bsd_init_task = TASK_NULL;

-char   init_task_failure_data[1024];

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


@@ -56,9 +58,18 @@ int get_thread_userstop(thread_t);
 boolean_t current_thread_aborted(void);
 void task_act_iterate_wth_args(task_t, void(*)(thread_t, void *), void *);
 kern_return_t get_signalact(task_t , thread_t *, int);
 boolean_t current_thread_aborted(void);
 void task_act_iterate_wth_args(task_t, void(*)(thread_t, void *), void *);
 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);

 
 

+extern uint64_t get_dispatchqueue_serialno_offset_from_proc(void *p);
+extern uint64_t proc_uniqueid(void *p);
+
+#if MACH_BSD
+extern void psignal(void *, int);
+#endif

 
 /*
  *
 
 /*
  *


@@ -68,6 +79,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);
+       }
+}

 /*
  *
  */
 /*
  *
  */


@@ -109,7 +127,7 @@ int get_thread_lock_count(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;


@@ -137,7 +155,7 @@ 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 &&


@@ -147,7 +165,7 @@ get_signalact(
                }
                thread_mtx_unlock(inc);
 
                }
                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) 


@@ -185,7 +203,7 @@ 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);
                        !queue_end(&task->threads, (queue_entry_t)inc); ) {
                if (inc == thread) {
                        thread_mtx_lock(inc);


@@ -200,7 +218,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) {


@@ -222,9 +240,9 @@ ledger_t  get_task_ledger(task_t t)
 
 /*
  * 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)
 {


@@ -263,8 +281,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++;


@@ -281,29 +299,33 @@ 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);

 }
 
 /*
  * Swap in a new map for the task/thread pair; the old map reference is
 }
 
 /*
  * Swap in a new map for the task/thread pair; the old map reference is

- * returned.
+ * returned. Also does a pmap switch if thread provided is current thread.

  */
 vm_map_t
  */
 vm_map_t

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

 {
        vm_map_t old_map;
 {
        vm_map_t old_map;

+       boolean_t doswitch = (thread == current_thread()) ? TRUE : FALSE;

 
        if (task != thread->task)
                panic("swap_task_map");
 
        task_lock(task);
        mp_disable_preemption();
 
        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;

+       vm_commit_pagezero_status(map);
+

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


@@ -319,6 +341,10 @@ swap_task_map(task_t task, thread_t thread, vm_map_t map, boolean_t doswitch)
 
 /*
  *
 
 /*
  *

+ * 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)
 {


@@ -336,13 +362,210 @@ uint64_t get_task_resident_size(task_t task)
        return((uint64_t)pmap_resident_count(map->pmap) * PAGE_SIZE_64);
 }
 
        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) 
+{
+       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;
+}
+

 /*
  *
  */
 /*
  *
  */

-pmap_t  get_map_pmap(vm_map_t map)
+uint64_t get_task_phys_footprint_limit(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t max;
+
+       ret = ledger_get_limit(task->ledger, task_ledgers.phys_footprint, &max);
+       if (KERN_SUCCESS == ret) {
+               return max;
+       }
+
+       return 0;
+}
+
+uint64_t get_task_internal(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.internal, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+
+uint64_t get_task_internal_compressed(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.internal_compressed, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+
+uint64_t get_task_purgeable_nonvolatile(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_nonvolatile, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+
+uint64_t get_task_purgeable_nonvolatile_compressed(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.purgeable_nonvolatile_compressed, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+
+uint64_t get_task_alternate_accounting(task_t task)

 {
 {

-       return(map->pmap);
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.alternate_accounting, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;

 }
 }

+
+uint64_t get_task_alternate_accounting_compressed(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.alternate_accounting_compressed, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+
+uint64_t get_task_page_table(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.page_table, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       return 0;
+}
+
+uint64_t get_task_iokit_mapped(task_t task)
+{
+       kern_return_t ret;
+       ledger_amount_t credit, debit;
+
+       ret = ledger_get_entries(task->ledger, task_ledgers.iokit_mapped, &credit, &debit);
+       if (KERN_SUCCESS == ret) {
+               return (credit - debit);
+       }
+
+       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;
+}
+

 /*
  *
  */
 /*
  *
  */


@@ -377,7 +600,9 @@ get_vmmap_size(
        return(map->size);
 }
 
        return(map->size);
 }
 

-int
+#if CONFIG_COREDUMP
+
+static int

 get_vmsubmap_entries(
        vm_map_t        map,
        vm_object_offset_t      start,
 get_vmsubmap_entries(
        vm_map_t        map,
        vm_object_offset_t      start,


@@ -396,10 +621,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;
                }


@@ -424,10 +650,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;
                }


@@ -437,6 +664,7 @@ get_vmmap_entries(
          vm_map_unlock(map);
        return(total_entries);
 }
          vm_map_unlock(map);
        return(total_entries);
 }

+#endif /* CONFIG_COREDUMP */

 
 /*
  *
 
 /*
  *


@@ -533,27 +761,16 @@ 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
-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>
 
 void
 #include <sys/bsdtask_info.h>
 
 void


@@ -565,7 +782,9 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
        uint32_t cswitch = 0, numrunning = 0;
        uint32_t syscalls_unix = 0;
        uint32_t syscalls_mach = 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;


@@ -573,8 +792,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);
 


@@ -586,6 +803,9 @@ fill_taskprocinfo(task_t task, struct proc_taskinfo_internal * ptinfo)
                uint64_t    tval;
                spl_t x;
 
                uint64_t    tval;
                spl_t x;
 

+               if (thread->options & TH_OPT_IDLE_THREAD)
+                       continue;
+

                x = splsched();
                thread_lock(thread);
 
                x = splsched();
                thread_lock(thread);
 


@@ -646,7 +866,7 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_th
 
        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); ) {
                addr = (thuniqueid==0)?thact->machine.cthread_self: thact->thread_id;
                if (addr == thaddr)
                        !queue_end(&task->threads, (queue_entry_t)thact); ) {
                addr = (thuniqueid==0)?thact->machine.cthread_self: thact->thread_id;
                if (addr == thaddr)


@@ -657,8 +877,8 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_th
                                err = 1;
                                goto out;       
                        }
                                err = 1;
                                goto out;       
                        }

-                       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));

 
                        ptinfo->pth_cpu_usage = basic_info.cpu_usage;
                        ptinfo->pth_policy = basic_info.policy;
 
                        ptinfo->pth_cpu_usage = basic_info.cpu_usage;
                        ptinfo->pth_policy = basic_info.policy;


@@ -666,7 +886,7 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_th
                        ptinfo->pth_flags = basic_info.flags;
                        ptinfo->pth_sleep_time = basic_info.sleep_time;
                        ptinfo->pth_curpri = thact->sched_pri;
                        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)) 
                        ptinfo->pth_maxpriority = thact->max_priority;
                        
                        if ((vpp != NULL) && (thact->uthread != NULL)) 


@@ -675,7 +895,7 @@ fill_taskthreadinfo(task_t task, uint64_t thaddr, int thuniqueid, struct proc_th
                        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;
 


@@ -696,14 +916,14 @@ 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); ) {
                thaddr = thact->machine.cthread_self;
                *uptr++ = thaddr;
                numthr++;
                if (numthr >= thcount)
                        goto out;
                        !queue_end(&task->threads, (queue_entry_t)thact); ) {
                thaddr = thact->machine.cthread_self;
                *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:
        }
 
 out:


@@ -718,13 +938,126 @@ 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)

 {
 {

-        thread_t thread;
+       struct task_power_info powerinfo;

 
 

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

 
 

-        if (thread->funnel_lock)
-               panic("syscall exit with funnel held\n");
+       task_power_info_locked(task, &powerinfo, NULL, 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_safe(task);
+       ri->ri_serviced_system_time = bank_serviced_time_safe(task);
+#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;
+
+       assert(task != TASK_NULL);
+       task_lock(task);
+
+       /* 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_update_qos_cpu_time(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);
+}
+
+uint64_t
+get_task_dispatchqueue_serialno_offset(task_t task)
+{
+       uint64_t dq_serialno_offset = 0;
+
+       if (task->bsd_info) {
+               dq_serialno_offset = get_dispatchqueue_serialno_offset_from_proc(task->bsd_info);
+       }
+
+       return dq_serialno_offset;
+}
+
+uint64_t
+get_task_uniqueid(task_t task)
+{
+       if (task->bsd_info) {
+               return proc_uniqueid(task->bsd_info);
+       } else {
+               return UINT64_MAX;
+       }
+}
+
+#if CONFIG_MACF
+struct label *
+get_task_crash_label(task_t task)
+{
+       return task->crash_label;
+}
+
+void
+set_task_crash_label(task_t task, struct label *label)
+{
+       task->crash_label = label;
+}
+#endif