<sys/resource.h>

Change-Id: I5858e1b56e65fc9cf480120d96c68770d3a11dd2

diff --git a/lib/libc/sys-minix/priority.c b/lib/libc/sys-minix/priority.c
index c6e6a5d9423f3b49c9a3d1300bf50f6e4b718dea..5e6ea7f8d6a5f3d0f709f0a8f2ac1afeeae1742a 100644 (file)
--- a/lib/libc/sys-minix/priority.c
+++ b/lib/libc/sys-minix/priority.c
@@ -13,7 +13,7 @@ priority.c
 #include <stddef.h>
 
 
-int getpriority(int which, int who)
+int getpriority(int which, id_t who)
 {
        int v;
        message m;
@@ -36,7 +36,7 @@ int getpriority(int which, int who)
        return v + PRIO_MIN;
 }
 
-int setpriority(int which, int who, int prio)
+int setpriority(int which, id_t who, int prio)
 {
        message m;
 

diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 97b31185fa7821e0d0fe9e31bdf432390ca7a5d2..26baf15594b925e82d1bdc1deb3e52612e486c2c 100644 (file)
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -78,36 +78,65 @@ struct      rusage {
 /*
  * Resource limits
  */
-#define RLIMIT_CORE    1
-#define RLIMIT_CPU     2
-#define RLIMIT_DATA    3
-#define RLIMIT_FSIZE   4
-#define RLIMIT_NOFILE  5
-#define RLIMIT_STACK   6
-#define RLIMIT_AS      7
+#define        RLIMIT_CPU      0               /* cpu time in milliseconds */
+#define        RLIMIT_FSIZE    1               /* maximum file size */
+#define        RLIMIT_DATA     2               /* data size */
+#define        RLIMIT_STACK    3               /* stack size */
+#define        RLIMIT_CORE     4               /* core file size */
+#define        RLIMIT_RSS      5               /* resident set size */
+#define        RLIMIT_MEMLOCK  6               /* locked-in-memory address space */
+#define        RLIMIT_NPROC    7               /* number of processes */
+#define        RLIMIT_NOFILE   8               /* number of open files */
+#define        RLIMIT_SBSIZE   9               /* maximum size of all socket buffers */
+#define        RLIMIT_AS       10              /* virtual process size (inclusive of mmap) */
 #define        RLIMIT_VMEM     RLIMIT_AS       /* common alias */
+#define        RLIMIT_NTHR     11              /* number of threads */
 
 #if defined(_NETBSD_SOURCE)
-#define        RLIM_NLIMITS    8               /* number of resource limits */
+#define        RLIM_NLIMITS    12              /* number of resource limits */
 #endif
 
-#define RLIM_INFINITY ((rlim_t) -1)
-#define RLIM_SAVED_CUR RLIM_INFINITY
-#define RLIM_SAVED_MAX RLIM_INFINITY
+#define        RLIM_INFINITY   (~((u_quad_t)1 << 63))  /* no limit */
+#define        RLIM_SAVED_MAX  RLIM_INFINITY   /* unrepresentable hard limit */
+#define        RLIM_SAVED_CUR  RLIM_INFINITY   /* unrepresentable soft limit */
 
-struct rlimit
-{
-       rlim_t rlim_cur;
-       rlim_t rlim_max;
+#if defined(_KERNEL)
+/* 4.3BSD compatibility rlimit argument structure. */
+struct orlimit {
+       int32_t rlim_cur;               /* current (soft) limit */
+       int32_t rlim_max;               /* maximum value for rlim_cur */
 };
+#endif
+
+struct rlimit {
+       rlim_t  rlim_cur;               /* current (soft) limit */
+       rlim_t  rlim_max;               /* maximum value for rlim_cur */
+};
+
+#if defined(_NETBSD_SOURCE)
+/* Load average structure. */
+struct loadavg {
+       fixpt_t ldavg[3];
+       long    fscale;
+};
+#endif
 
+#ifdef _KERNEL
+extern struct loadavg averunnable;
+struct pcred;
+int    dosetrlimit(struct lwp *, struct proc *, int, struct rlimit *);
+#else
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int    getpriority(int, int);
+int    getpriority(int, id_t);
 int    getrlimit(int, struct rlimit *);
-int    getrusage(int, struct rusage *);
-int    setpriority(int, int, int);
+#ifndef __LIBC12_SOURCE__
+int    getrusage(int, struct rusage *) __RENAME(__getrusage50);
+#endif
+int    setpriority(int, id_t, int);
+int    setrlimit(int, const struct rlimit *);
 __END_DECLS
 
+#endif /* _KERNEL */
 #endif /* !_SYS_RESOURCE_H_ */