Changeset 2748

Timestamp:

Jul 26, 2006, 10:57:05 PM (19 years ago)

Author:

bird

Message:

ulimit, getrlimit and setrlimit.

Location:

trunk/libc

Files:

• include/emx/syscalls.h (modified) (1 diff)
• include/sys/resource.h (modified) (1 diff)
• src/kNIX/Makefile.kmk (modified) (2 diffs)
• src/kNIX/b_processGetResourceLimit.c (added)
• src/kNIX/b_processSetResourceLimit.c (added)
• src/kNIX/kNIX.h (modified) (1 diff)
• src/kNIX/os2/__ulimit.c (deleted)
• src/kNIX/os2/resource.c (modified) (8 diffs)
• src/libc/misc/Makefile.kmk (modified) (1 diff)
• src/libc/misc/ulimit.c (deleted)
• src/libc/process/Makefile.kmk (modified) (3 diffs)
• src/libc/process/getrlimit.c (added)
• src/libc/process/setrlimit.c (added)
• src/libc/process/ulimit.c (added)

trunk/libc/include/emx/syscalls.h

@@ -209 +209 @@
 int __swchar (int flag, int new_char);
 int __uflags (int mask, int new_flags);
-long __ulimit (int cmd, long new_limit);
+//long __ulimit (int cmd, long new_limit);
 //dead int __umask (int pmode);
 void __unwind2 (void *xcpt_reg_ptr);

trunk/libc/include/sys/resource.h

@@ -97 +97 @@
 #define RLIMIT_VMEM     10              /* virtual process size (inclusive of mmap) */
 #define RLIMIT_AS       RLIMIT_VMEM     /* standard name for RLIMIT_VMEM */
+#define RLIMIT_OBJREST  11              /* bird: size left in the top heap object. kLIBC specific. */
 
-#define RLIM_NLIMITS    11              /* number of resource limits */
+#define RLIM_NLIMITS    12              /* number of resource limits */ /* bird: was 11 */
 
 #define RLIM_INFINITY   ((rlim_t)(((u_quad_t)1 << 63) - 1))

trunk/libc/src/kNIX/Makefile.kmk

@@ -43 +43 @@
     $(PATH_LIBC_SRC)/kNIX/b_mmanSBrkGetModel.c \
     $(PATH_LIBC_SRC)/kNIX/b_mmanSBrkSetModel.c \
+    $(PATH_LIBC_SRC)/kNIX/b_processGetResourceLimit.c \
+    $(PATH_LIBC_SRC)/kNIX/b_processSetResourceLimit.c \
     $(PATH_LIBC_SRC)/kNIX/b_signalSendPid.c \
     $(PATH_LIBC_SRC)/kNIX/filehandles.c \
@@ -187 +189 @@
     $(PATH_LIBC_SRC)/kNIX/os2/__swchar.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__ttyname.c \
-    $(PATH_LIBC_SRC)/kNIX/os2/__ulimit.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__wait.c \
     $(PATH_LIBC_SRC)/kNIX/os2/__waitpid.c \

trunk/libc/src/kNIX/kNIX.h

@@ -86 +86 @@
 
 
+/** @name ??
+ * @{
+ */
+int __libc_back_sys_processGetResourceLimit(int iResId, struct rlimit *pLimit);
+/** @} */
+
 __END_DECLS
 

trunk/libc/src/kNIX/os2/resource.c

@@ -30 +30 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "libc-alias.h"
+#include "../kNIX.h"
 #define INCL_FSMACROS
 #define INCL_DOSFILEMGR
@@ -37 +37 @@
 #define INCL_DOSERRORS
 #include <os2.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include "syscalls.h"
 
 
-/* getrlimit: Get resource limits *
- * for documentation see:
- * http://www.opengroup.org/onlinepubs/009695399/functions/getrlimit.html
+
+/**
+ * The Platform dependent part of the __libc_Back_processGetResourceLimit() API.
+ *
+ * @returns 0 on success and pLimit filled in.
+ * @returns negated errno on failure.
+ * @param   iResId      The resource id.
+ * @param   pLimit      Where to put the limit.
  */
-
-int     _STD(getrlimit)(int iResId, struct rlimit * pLimit)
+int __libc_back_sys_processGetResourceLimit(int iResId, struct rlimit *pLimit)
 {
-    int rcRet = 0;
-
     switch (iResId)
     {
@@ -76 +77 @@
         case RLIMIT_NOFILE:
         {
-            ULONG     ulCurMax = 0;
-            LONG      lReqCount = 0;
-            APIRET    rc;
-            FS_VAR();
-
-            FS_SAVE_LOAD();
-            rc = DosSetRelMaxFH(&lReqCount, &ulCurMax);
+            ULONG   ulCurMax = 0;
+            LONG    lReqCount = 0;
+            FS_VAR_SAVE_LOAD();
+            if (    DosSetRelMaxFH(&lReqCount, &ulCurMax)
+                ||  ulCurMax < CFG_KNIX_MAX_FHS)
+                ulCurMax = CFG_KNIX_MAX_FHS;
             FS_RESTORE();
-            if (rc == NO_ERROR)
-            {
-                if (ulCurMax < 10000)
-                    ulCurMax = 10000;
-                pLimit->rlim_cur = ulCurMax;
-                pLimit->rlim_max = ulCurMax;
-            }
-            else
-            {
-                _sys_set_errno(rc);
-                rcRet = -1;
-            }
+            pLimit->rlim_cur = ulCurMax;
+            pLimit->rlim_max = ulCurMax;
             break;
         }
 
+        /*
+         * Not supported.
+         */
         case RLIMIT_CPU:
         case RLIMIT_SBSIZE:
         case RLIMIT_MEMLOCK:
-            errno = ENOSYS;
-            rcRet = -1;
-            break;
+            return -EINVAL;
 
         /*
@@ -111 +102 @@
         case RLIMIT_STACK:
         {
-            PTIB pTib;
-            PPIB pPib;
+            PTIB    pTib;
+            PPIB    pPib;
+            FS_VAR_SAVE_LOAD();
             DosGetInfoBlocks(&pTib, &pPib);
+            FS_RESTORE();
             pLimit->rlim_cur = (uintptr_t)pTib->tib_pstacklimit - (uintptr_t)pTib->tib_pstack;
             pLimit->rlim_max = (uintptr_t)pTib->tib_pstacklimit - (uintptr_t)pTib->tib_pstack;
@@ -119 +112 @@
         }
 
-        /*
-         * Limit of the data segment.
-         * In OS/2 limit of private memory.
-         */
         case RLIMIT_DATA:
-        {
-            ULONG   cbPrivateLow;
-            ULONG   cbPrivateHigh;
-            if (DosQuerySysInfo(QSV_MAXPRMEM, QSV_MAXPRMEM, &cbPrivateLow, sizeof(cbPrivateLow)))
-                cbPrivateLow = 64*1024*1024; /* 64MB is always secured by OS/2. */
-            if (DosQuerySysInfo(QSV_MAXPRMEM, QSV_MAXPRMEM, &cbPrivateHigh, sizeof(cbPrivateHigh)))
-                cbPrivateHigh = 0;
-            pLimit->rlim_cur = cbPrivateLow + cbPrivateHigh;
-            pLimit->rlim_max = pLimit->rlim_cur;
-            break;
-        }
+            LIBC
 
         /*
@@ -142 +121 @@
         {
             ULONG   cMaxProcesses;
+            FS_VAR_SAVE_LOAD();
             if (DosQuerySysInfo(QSV_MAXPROCESSES, QSV_MAXPROCESSES, &cMaxProcesses, sizeof(cMaxProcesses)))
                 cMaxProcesses = 256;
+            FS_RESTORE();
             pLimit->rlim_cur = cMaxProcesses;
             pLimit->rlim_max = cMaxProcesses;
@@ -155 +136 @@
         {
             ULONG   cMBUserVirtualMem = 0;
+            FS_VAR_SAVE_LOAD();
             if (DosQuerySysInfo(QSV_VIRTUALADDRESSLIMIT, QSV_VIRTUALADDRESSLIMIT, &cMBUserVirtualMem, sizeof(cMBUserVirtualMem)))
                 cMBUserVirtualMem = 512;
+            FS_RESTORE();
             pLimit->rlim_cur = cMBUserVirtualMem * (1 << 20);
             pLimit->rlim_max = pLimit->rlim_cur;
@@ -163 +146 @@
 
         default:
-            errno = EINVAL;
-            rcRet = -1;
-            break;
+            return -EINVAL;
     };
 
-    return rcRet;
+    return 0;
 }
 
-int     _STD(setrlimit)(int iResId, const struct rlimit *pLimit)
-{
-    errno = ENOSYS;
-    return -1;
-}

trunk/libc/src/libc/misc/Makefile.kmk

@@ -137 +137 @@
     $(PATH_LIBC_SRC)/libc/misc/sysctl_mib.c \
     $(PATH_LIBC_SRC)/libc/misc/syserr.c \
-    $(PATH_LIBC_SRC)/libc/misc/ulimit.c \
     $(PATH_LIBC_SRC)/libc/misc/uname.c \
     $(PATH_LIBC_SRC)/libc/misc/wildcard.c \

trunk/libc/src/libc/process/Makefile.kmk

@@ -46 +46 @@
     $(PATH_LIBC_SRC)/libc/process/fork.c \
     $(PATH_LIBC_SRC)/libc/process/getitimer.c \
+    $(PATH_LIBC_SRC)/libc/process/getrlimit.c \
     $(PATH_LIBC_SRC)/libc/process/getpid.c \
     $(PATH_LIBC_SRC)/libc/process/getpriority.c \
@@ -59 +60 @@
     $(PATH_LIBC_SRC)/libc/process/semop.c \
     $(PATH_LIBC_SRC)/libc/process/setitimer.c \
+    $(PATH_LIBC_SRC)/libc/process/setrlimit.c \
     $(PATH_LIBC_SRC)/libc/process/setpriority.c \
     $(PATH_LIBC_SRC)/libc/process/shmat.c \
@@ -103 +105 @@
     $(PATH_LIBC_SRC)/libc/process/thread_internals.c \
     $(PATH_LIBC_SRC)/libc/process/tls.c \
+    $(PATH_LIBC_SRC)/libc/process/ulimit.c \
     $(PATH_LIBC_SRC)/libc/process/wait.c \
     $(PATH_LIBC_SRC)/libc/process/wait3.c \