xnu-792.6.76.tar.gz

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

diff --git a/bsd/sys/resourcevar.h b/bsd/sys/resourcevar.h
index 77b30d6fd86bcbcee285e5ecac9ad152d82ee8c5..8593ed6ef2d5e07bef1d01675caadbe0b1f26b7c 100644 (file)
--- a/bsd/sys/resourcevar.h
+++ b/bsd/sys/resourcevar.h
@@ -85,6 +85,17 @@ struct pstats {
        struct  itimerval p_timer[3];   /* virtual-time timers */
 #define        pstat_endcopy   p_start
        struct  timeval p_start;        /* starting time */
        struct  itimerval p_timer[3];   /* virtual-time timers */
 #define        pstat_endcopy   p_start
        struct  timeval p_start;        /* starting time */

+#ifdef KERNEL
+       struct user_uprof {                         /* profile arguments */
+               struct user_uprof *pr_next;  /* multiple prof buffers allowed */
+               user_addr_t         pr_base;    /* buffer base */
+               user_size_t         pr_size;    /* buffer size */
+               user_ulong_t    pr_off;         /* pc offset */
+               user_ulong_t    pr_scale;       /* pc scaling */
+               user_ulong_t    pr_addr;        /* temp storage for addr until AST */
+               user_ulong_t    pr_ticks;       /* temp storage for ticks until AST */
+       } user_p_prof;
+#endif // KERNEL

 };
 
 /*
 };
 
 /*


@@ -102,18 +113,21 @@ struct plimit {
        int     p_refcnt;               /* number of references */
 };
 
        int     p_refcnt;               /* number of references */
 };
 

+#ifdef KERNEL

 /* add user profiling from AST */
 #define        ADDUPROF(p)                                                     \
 /* add user profiling from AST */
 #define        ADDUPROF(p)                                                     \

-       addupc_task(p,                                                  \
-           (p)->p_stats->p_prof.pr_addr, (p)->p_stats->p_prof.pr_ticks)
+    addupc_task(p,                                                     \
+                (proc_is64bit((p)) ? (p)->p_stats->user_p_prof.pr_addr \
+                                   : CAST_USER_ADDR_T((p)->p_stats->p_prof.pr_addr)), \
+                (proc_is64bit((p)) ? (p)->p_stats->user_p_prof.pr_ticks \
+                                   : (p)->p_stats->p_prof.pr_ticks))

 
 

-#ifdef KERNEL
-void    addupc_intr __P((struct proc *p, u_long pc, u_int ticks));
-void    addupc_task __P((struct proc *p, u_long pc, u_int ticks));
-void    calcru __P((struct proc *p, struct timeval *up, struct timeval *sp,
-           struct timeval *ip));
-void    ruadd __P((struct rusage *ru, struct rusage *ru2));
-struct plimit *limcopy __P((struct plimit *lim));
+void    addupc_intr(struct proc *p, u_long pc, u_int ticks);
+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);
+struct plimit *limcopy(struct plimit *lim);

 #endif /* KERNEL */
 
 #endif /* __APPLE_API_PRIVATE */
 #endif /* KERNEL */
 
 #endif /* __APPLE_API_PRIVATE */