xnu-6153.121.1.tar.gz

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

diff --git a/bsd/sys/resourcevar.h b/bsd/sys/resourcevar.h
index 8593ed6ef2d5e07bef1d01675caadbe0b1f26b7c..6d9244314052977d70c6d49dacc4ccb768d079b3 100644 (file)
--- a/bsd/sys/resourcevar.h
+++ b/bsd/sys/resourcevar.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
 /*
  */
 /* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
 /*


@@ -55,45 +61,41 @@
  *     @(#)resourcevar.h       8.4 (Berkeley) 1/9/95
  */
 
  *     @(#)resourcevar.h       8.4 (Berkeley) 1/9/95
  */
 

-#ifndef        _SYS_RESOURCEVAR_H_
-#define        _SYS_RESOURCEVAR_H_
+#ifndef _SYS_RESOURCEVAR_H_
+#define _SYS_RESOURCEVAR_H_

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

+#include <sys/resource.h>

 
 

-#ifdef __APPLE_API_PRIVATE

 /*
  * Kernel per-process accounting / statistics
  * (not necessarily resident except when running).
  */
 struct pstats {
 /*
  * Kernel per-process accounting / statistics
  * (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;           /* 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 {                  /* profile arguments */

                struct uprof *pr_next;  /* multiple prof buffers allowed */
                struct uprof *pr_next;  /* multiple prof buffers allowed */

-               caddr_t pr_base;        /* buffer base */
-               u_long  pr_size;        /* buffer size */
-               u_long  pr_off;         /* pc offset */
-               u_long  pr_scale;       /* pc scaling */
-               u_long  pr_addr;        /* temp storage for addr until AST */
-               u_long  pr_ticks;       /* temp storage for ticks until AST */
+               caddr_t pr_base;        /* buffer base */
+               u_int32_t       pr_size;        /* buffer size */
+               u_int32_t       pr_off;         /* pc offset */
+               u_int32_t       pr_scale;       /* pc scaling */
+               u_int32_t       pr_addr;        /* temp storage for addr until AST */
+               u_int32_t       pr_ticks;       /* temp storage for ticks until AST */

        } p_prof;
        } p_prof;

-#define        pstat_endzero   pstat_startcopy

 
 

-#define        pstat_startcopy p_timer
-       struct  itimerval p_timer[3];   /* virtual-time timers */
-#define        pstat_endcopy   p_start
-       struct  timeval p_start;        /* starting time */
+       uint64_t ps_start;              /* starting time ; compat only */

 #ifdef KERNEL
 #ifdef KERNEL

-       struct user_uprof {                         /* profile arguments */
+       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 */
                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_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
 };
        } user_p_prof;
 #endif // KERNEL
 };


@@ -106,30 +108,28 @@ struct pstats {
  * and a copy must be made for the child of a new fork that isn't
  * sharing modifications to the limits.
  */
  * 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 plimit {

-       struct  rlimit pl_rlimit[RLIM_NLIMITS];
-#define        PL_SHAREMOD     0x01            /* modifications are shared */
-       int     p_lflags;
-       int     p_refcnt;               /* number of references */
+       struct  rlimit pl_rlimit[RLIM_NLIMITS];
+       int     pl_refcnt;              /* number of references */

 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

-/* add user profiling from AST */
-#define        ADDUPROF(p)                                                     \
-    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))
-
-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);
+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);
+int proc_limitreplace(proc_t p);
+void proc_limitblock(proc_t);
+void proc_limitunblock(proc_t);

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

-#endif /* __APPLE_API_PRIVATE */

 
 

-#endif /* !_SYS_RESOURCEVAR_H_ */
+#endif  /* !_SYS_RESOURCEVAR_H_ */