xnu-3789.70.16.tar.gz

[apple/xnu.git] / bsd / sys / resourcevar.h

diff --git a/bsd/sys/resourcevar.h b/bsd/sys/resourcevar.h
index eaf7f148b02281921ca5722efa17d6d36fb2efdd..57ae8eb7c0f51a59887b14668f939f3e1fddd1b0 100644 (file)
--- a/bsd/sys/resourcevar.h
+++ b/bsd/sys/resourcevar.h
@@ -71,9 +71,8 @@
  * (not necessarily resident except when running).
  */
 struct pstats {
  * (not necessarily resident except when running).
  */
 struct pstats {

-#define        pstat_startzero p_ru
-       struct  rusage p_ru;            /* stats for this proc */
-       struct  rusage p_cru;           /* (PL) sum of stats for reaped children */
+       struct  rusage            p_ru;         /* stats for this proc */
+       struct  rusage            p_cru;        /* (PL) sum of stats for reaped children */

 
        struct uprof {                  /* profile arguments */
                struct uprof *pr_next;  /* multiple prof buffers allowed */
 
        struct uprof {                  /* profile arguments */
                struct uprof *pr_next;  /* multiple prof buffers allowed */


@@ -84,10 +83,10 @@ struct pstats {
                u_int32_t       pr_addr;        /* temp storage for addr until AST */
                u_int32_t       pr_ticks;       /* temp storage for ticks until AST */
        } p_prof;
                u_int32_t       pr_addr;        /* temp storage for addr until AST */
                u_int32_t       pr_ticks;       /* temp storage for ticks until AST */
        } p_prof;

-#define        pstat_endzero   p_start
-
-       struct  timeval p_start;        /* starting time ; compat only */
+       
+       uint64_t ps_start;              /* starting time ; compat only */

 #ifdef KERNEL
 #ifdef KERNEL

+       struct  rusage_info_child ri_child;     /* (PL) sum of additional stats for reaped children (proc_pid_rusage) */

        struct user_uprof {                         /* profile arguments */
                struct user_uprof *pr_next;  /* multiple prof buffers allowed */
                user_addr_t         pr_base;    /* buffer base */
        struct user_uprof {                         /* profile arguments */
                struct user_uprof *pr_next;  /* multiple prof buffers allowed */
                user_addr_t         pr_base;    /* buffer base */


@@ -132,6 +131,7 @@ void         addupc_task(struct proc *p, user_addr_t pc, u_int ticks);
 void    calcru(struct proc *p, struct timeval *up, struct timeval *sp,
            struct timeval *ip);
 void    ruadd(struct rusage *ru, struct rusage *ru2);
 void    calcru(struct proc *p, struct timeval *up, struct timeval *sp,
            struct timeval *ip);
 void    ruadd(struct rusage *ru, struct rusage *ru2);

+void    update_rusage_info_child(struct rusage_info_child *ru, rusage_info_current *ru_current);

 void proc_limitget(proc_t p, int whichi, struct rlimit * limp);
 void proc_limitdrop(proc_t p, int exiting);
 void proc_limitfork(proc_t parent, proc_t child);
 void proc_limitget(proc_t p, int whichi, struct rlimit * limp);
 void proc_limitdrop(proc_t p, int exiting);
 void proc_limitfork(proc_t parent, proc_t child);