xnu-1228.12.14.tar.gz

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

diff --git a/bsd/sys/resourcevar.h b/bsd/sys/resourcevar.h
index 3ece85372ad44088789808e525014da96dca0de2..588847dc88bd5578fa78cea40bb681518a795c88 100644 (file)
--- a/bsd/sys/resourcevar.h
+++ b/bsd/sys/resourcevar.h
@@ -66,7 +66,6 @@
 
 #include <sys/appleapiopts.h>
 
-#ifdef __APPLE_API_PRIVATE
 /*
  * Kernel per-process accounting / statistics
  * (not necessarily resident except when running).
@@ -74,7 +73,7 @@
 struct pstats {
 #define        pstat_startzero p_ru
        struct  rusage p_ru;            /* stats for this proc */
-       struct  rusage p_cru;           /* sum of stats for reaped children */
+       struct  rusage p_cru;           /* (PL) sum of stats for reaped children */
 
        struct uprof {                  /* profile arguments */
                struct uprof *pr_next;  /* multiple prof buffers allowed */
@@ -85,12 +84,9 @@ struct pstats {
                u_long  pr_addr;        /* temp storage for addr until AST */
                u_long  pr_ticks;       /* temp storage for ticks until AST */
        } p_prof;
-#define        pstat_endzero   pstat_startcopy
+#define        pstat_endzero   p_start
 
-#define        pstat_startcopy p_timer
-       struct  itimerval p_timer[3];   /* virtual-time timers */
-#define        pstat_endcopy   p_start
-       struct  timeval p_start;        /* starting time */
+       struct  timeval p_start;        /* starting time ; compat only */
 #ifdef KERNEL
        struct user_uprof {                         /* profile arguments */
                struct user_uprof *pr_next;  /* multiple prof buffers allowed */
@@ -112,11 +108,14 @@ struct pstats {
  * and a copy must be made for the child of a new fork that isn't
  * sharing modifications to the limits.
  */
+/* 
+ * Modifications are done with the list lock held (p_limit as well)and access indv 
+ * limits can be done without limit as we keep the old copy in p_olimit. Which is 
+ * dropped in proc_exit. This way all access will have a valid kernel address
+ */
 struct plimit {
        struct  rlimit pl_rlimit[RLIM_NLIMITS];
-#define        PL_SHAREMOD     0x01            /* modifications are shared */
-       int     p_lflags;
-       int     p_refcnt;               /* number of references */
+       int     pl_refcnt;              /* number of references */
 };
 
 #ifdef KERNEL
@@ -133,9 +132,13 @@ 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);
+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);
+int proc_limitreplace(proc_t p);
+void proc_limitblock(proc_t);
+void proc_limitunblock(proc_t);
 #endif /* KERNEL */
 
-#endif /* __APPLE_API_PRIVATE */
 
 #endif /* !_SYS_RESOURCEVAR_H_ */