Changeset 1910

Timestamp:

Apr 25, 2005, 5:58:57 AM (20 years ago)

Author:

bird

Message:

Implemented (not tested) process priority manangement.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/sharedpm.h (modified) (6 diffs, 1 prop)
• include/sys/resource.h (modified) (2 diffs, 1 prop)
• include/unistd.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/process/getpriority.c (added)
• src/lib/process/nice.c (added)
• src/lib/process/setpriority.c (added)
• src/lib/sys/b_processGetPriority.c (added)
• src/lib/sys/b_processSetPriority.c (added)
• src/lib/sys/priority.c (added)
• src/lib/sys/priority.h (added)
• src/lib/sys/sharedpm.c (modified) (5 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -1 +1 @@
 /* $Id$ */
+
+2005-04-24: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libc:
+        o Fixed bug in getfsstate(). (df from coreutils works now!)
+        o Implemented process priority management. Added nice(), setpriority()
+          and getpriority() in the process.
+        o Added process enumeration and access function to sharedpm.
 
 2005-04-23: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -789 +789 @@
 int __libc_Back_processSetGidAll(gid_t rgid, gid_t egid, gid_t svgid);
 
+/**
+ * Gets the most favourable priority of a process, group of processes
+ * or all processed owned by a user.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   iWhich      PRIO_PROCESS, PRIO_PGRP, or PRIO_USER.
+ * @param   idWho       Id of the type specified by iWhich. 0 means the current process/pgrp/user.
+ * @param   piPrio      Where to store the priority.
+ */
+int __libc_Back_processGetPriority(int iWhich, id_t idWho, int *piPrio);
+
+/**
+ * Sets the priority of a process, a group of processes
+ * or all processed owned by a user.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   iWhich      PRIO_PROCESS, PRIO_PGRP, or PRIO_USER.
+ * @param   idWho       Id of the type specified by iWhich. 0 means the current process/pgrp/user.
+ * @param   iPrio       The new priority.
+ */
+int __libc_Back_processSetPriority(int iWhich, id_t idWho, int iPrio);
+
 
 /** @} */

trunk/src/emx/include/InnoTekLIBC/sharedpm.h

@@ -316 +316 @@
     /** User & Group
      * @{ */
-    /** 28 - User id. */
+    /** 28 - User id (also called Real User id). */
     uid_t                       uid;
     /** 32 - Effective user id. */
@@ -322 +322 @@
     /** 36 - Saved user id. */
     uid_t                       svuid;
-    /** 40 - Group id. */
+    /** 40 - Group id (also called Real Group id). */
     gid_t                       gid;
     /** 44 - Effecive group id. */
@@ -392 +392 @@
     /** @} */
 
-    /** 180 - Per Process Sockets Reference Counters. */
+    /** 180 - Per Process Sockets Reference Counters. (Data is process local.) */
     uint16_t                   *pacTcpipRefs;
-
-    /** 184 - Reserved pool pointer field with default value 0. */
-    unsigned                    auReserved[56 - 46];
-
-
-    /** 224 - Number of possible pointers to shared memory starting at pvInherit.
+    /** 184 - The Process priority (unix). */
+    int                         iNice;
+    /** 188 - Reserved fields with default value 0. */
+    unsigned                    auReserved[56 - 47];
+
+
+    /** 224 - Number of possible pointers to shared memory starting at pInherit.
      * This means we can extend the structure with pointers for as long as we
      * want and still have older LIBC versions cleanup the mess. */
@@ -645 +646 @@
 
 /**
+ * Process enumeration callback function.
+ *
+ * @returns 0 to continue the enumeration.
+ * @returns Non-zero to stop the enumeration. The enumeration
+ *          api will return this same value.
+ *
+ * @param   pProcess    The current process.
+ * @param   pvUser      The user argument.
+ * @remark  It is *not* allowed to terminate the thread or process, do long jumps
+ *          or anything else which causes the enumeration function not to release
+ *          the lock.
+ *          It is not allowed to do expensive stuff either as it will harm other
+ *          processes in the system which want to access the shared process facility!
+ */
+typedef int __LIBC_FNSPNENUM(__LIBC_PSPMPROCESS pProcess, void *pvUser);
+/** Pointer to an process enumeration callback function. */
+typedef __LIBC_FNSPNENUM *__LIBC_PFNSPNENUM;
+
+/**
+ * Enumerates all alive processes in a group.
+ *
+ * @returns 0 on success.
+ * @returns -ESRCH if the process group wasn't found.
+ * @returns -EINVAL if pgrp is negative.
+ * @returns Whatever non-zero value the pfnCallback function returns to stop the enumeration.
+ *
+ * @param   pgrp            The process group id. 0 is an alias for the process group the caller belongs to.
+ * @param   pfnCallback     Callback function.
+ * @param   pvUser          User argument to the callback.
+ */
+int __libc_spmEnumProcessesByPGrp(pid_t pgrp, __LIBC_PFNSPNENUM pfnCallback, void *pvUser);
+
+/**
+ * Enumerates all alive processes owned by a user.
+ *
+ * @returns 0 on success.
+ * @returns -ESRCH if the process group wasn't found.
+ * @returns -EINVAL if uid is negative.
+ * @returns Whatever non-zero value the pfnCallback function returns to stop the enumeration.
+ *
+ * @param   uid             The process user id.
+ * @param   pfnCallback     Callback function.
+ * @param   pvUser          User argument to the callback.
+ */
+int __libc_spmEnumProcessesByUser(uid_t uid, __LIBC_PFNSPNENUM pfnCallback, void *pvUser);
+
+/**
  * Release reference to the given process.
  *
@@ -652 +700 @@
  */
 int __libc_spmRelease(__LIBC_PSPMPROCESS pProcess);
+
+/**
+ * Checks if the calling process can see the specfied one.
+ *
+ * @returns 0 if it can see it.
+ * @returns -ESRCH (or other approriate error code) if it cannot.
+ *
+ * @param   pProcess    The process in question.
+ */
+int __libc_spmCanSee(__LIBC_PSPMPROCESS pProcess);
+
+/**
+ * Checks if we are a system-wide super user.
+ *
+ * @returns 0 if we are.
+ * @returns -EPERM if we aren't.
+ */
+int __libc_spmIsSuperUser(void);
+
+/**
+ * Checks if the caller can modify the specified process.
+ *
+ * @returns 0 if we can modify it.
+ * @returns -EPERM if we cannot modify it.
+ * @param   pProcess    The process in question.
+ */
+int __libc_spmCanModify(__LIBC_PSPMPROCESS pProcess);
 
 /**
@@ -691 +766 @@
  * Identificators which can be obtained using __libc_spmGetId().
  */
-typedef enum __LIBC_SPMId
+typedef enum __LIBC_SPMID
 {
     __LIBC_SPMID_PID = 0,

trunk/src/emx/include/sys/resource.h

@@ -37 +37 @@
 /** @file
  * FreeBSD 5.1
+ * @changed bird: get/setpriority takes id_t not int according to SuS.
  */
 
@@ -156 +157 @@
 
 __BEGIN_DECLS
-int     getpriority(int, int);
+int     getpriority(int, /*int*/ id_t);         /* bird: SuS uses id_t */
 int     getrlimit(int, struct rlimit *);
 int     getrusage(int, struct rusage *);
-int     setpriority(int, int, int);
+int     setpriority(int, /*int*/ id_t, int);    /* bird: SuS uses id_t */
 int     setrlimit(int, const struct rlimit *);
 __END_DECLS

trunk/src/emx/include/unistd.h

@@ -448 +448 @@
 int      lchown(const char *, uid_t, gid_t);
 int      lockf(int, int, off_t);
-/** @todo int    nice(int); */
+int      nice(int);
 ssize_t  pread(int, void *, size_t, off_t);
 ssize_t  pwrite(int, const void *, size_t, off_t);

trunk/src/emx/src/lib/libc.def

@@ -1495 +1495 @@
     "__nl_explode_name" @1501
     "__nl_normalize_codeset" @1502
+    ; april coding continues...
     "___fbufsize" @1503
     "___fpending" @1504
+    "___libc_Back_processGetPriority" @1505
+    "___libc_Back_processSetPriority" @1506
+    "__std_getpriority" @1507
+    "__std_setpriority" @1508
+    "__std_nice" @1509

trunk/src/emx/src/lib/sys/sharedpm.c

@@ -612 +612 @@
      * Validate input.
      */
-    if (pid <= 0)
+    if (pid < 0)
     {
         errno = EINVAL;
         LIBCLOG_RETURN_P(NULL);
     }
+
+    /*
+     * Fast path for our selves.
+     */
+    if (!pid || gpSPMSelf->pid == pid)
+        LIBCLOG_RETURN_P(gpSPMSelf);
 
     /*
@@ -665 +671 @@
      * Validate input.
      */
-    if (enmState >= __LIBC_PROCSTATE_MAX || pid <= 0)
+    if (enmState >= __LIBC_PROCSTATE_MAX || pid < 0)
     {
         errno = EINVAL;
@@ -672 +678 @@
 
     /*
+     * Fast path for our selves.
+     */
+    if (!pid || gpSPMSelf->pid == pid)
+        LIBCLOG_RETURN_P(gpSPMSelf->enmState == enmState ? gpSPMSelf : NULL);
+
+    /*
      * Request mutex.
      */
@@ -694 +706 @@
     spmReleaseMutex(&RegRec);
     LIBCLOG_RETURN_P(pProcess);
+}
+
+
+/**
+ * Enumerates all alive processes in a group.
+ *
+ * @returns 0 on success.
+ * @returns -ESRCH if the process group wasn't found.
+ * @returns -EINVAL if pgrp is negative.
+ * @returns Whatever non-zero value the pfnCallback function returns to stop the enumeration.
+ *
+ * @param   pgrp            The process group id. 0 is an alias for the process group the caller belongs to.
+ * @param   pfnCallback     Callback function.
+ * @param   pvUser          User argument to the callback.
+ */
+int __libc_spmEnumProcessesByPGrp(pid_t pgrp, __LIBC_PFNSPNENUM pfnCallback, void *pvUser)
+{
+    LIBCLOG_ENTER("pgrp=%d pfnCallback=%p pvUser=%p\n", pgrp, (void *)pfnCallback, pvUser);
+    __LIBC_SPMXCPTREGREC    RegRec;
+    __LIBC_PSPMPROCESS      pProcess;
+    int                     rc;
+
+    /*
+     * Validate input.
+     */
+    if (pgrp < 0)
+        LIBCLOG_RETURN_P(-EINVAL);
+
+    /*
+     * Request mutex.
+     */
+    rc = spmRequestMutex(&RegRec);
+    if (rc)
+        LIBCLOG_RETURN_P(rc);
+
+    /* resolve self reference. */
+    if (!pgrp)
+        pgrp = gpSPMSelf->pgrp;
+
+    /*
+     * Enumerate the processes.
+     */
+    rc = -ESRCH;
+    for (pProcess = gpSPMHdr->apHeads[__LIBC_PROCSTATE_ALIVE]; pProcess ; pProcess = pProcess->pNext)
+    {
+        if (    pProcess->pgrp == pgrp
+            &&  pProcess->enmState == __LIBC_PROCSTATE_ALIVE)
+        {
+            pProcess->cReferences++;
+            rc = pfnCallback(pProcess, pvUser);
+            pProcess->cReferences--;
+            if (rc)
+                break;
+        }
+    }
+
+    /*
+     * Release mutex and return.
+     */
+    spmReleaseMutex(&RegRec);
+    LIBCLOG_RETURN_P(rc);
+}
+
+
+/**
+ * Enumerates all alive processes owned by a user.
+ *
+ * @returns 0 on success.
+ * @returns -ESRCH if the process group wasn't found.
+ * @returns -EINVAL if uid is negative.
+ * @returns Whatever non-zero value the pfnCallback function returns to stop the enumeration.
+ *
+ * @param   uid             The process user id.
+ * @param   pfnCallback     Callback function.
+ * @param   pvUser          User argument to the callback.
+ */
+int __libc_spmEnumProcessesByUser(uid_t uid, __LIBC_PFNSPNENUM pfnCallback, void *pvUser)
+{
+    LIBCLOG_ENTER("uid=%d pfnCallback=%p pvUser=%p\n", uid, (void *)pfnCallback, pvUser);
+    __LIBC_SPMXCPTREGREC    RegRec;
+    __LIBC_PSPMPROCESS      pProcess;
+    int                     rc;
+
+    /*
+     * Validate input.
+     */
+    if (uid < 0)
+        LIBCLOG_RETURN_P(-EINVAL);
+
+    /*
+     * Request mutex.
+     */
+    rc = spmRequestMutex(&RegRec);
+    if (rc)
+        LIBCLOG_RETURN_P(rc);
+
+    /*
+     * Enumerate the processes.
+     */
+    rc = -ESRCH;
+    for (pProcess = gpSPMHdr->apHeads[__LIBC_PROCSTATE_ALIVE]; pProcess ; pProcess = pProcess->pNext)
+    {
+        if (    pProcess->euid == uid
+            &&  pProcess->enmState == __LIBC_PROCSTATE_ALIVE)
+        {
+            pProcess->cReferences++;
+            rc = pfnCallback(pProcess, pvUser);
+            pProcess->cReferences--;
+            if (rc)
+                break;
+        }
+    }
+
+    /*
+     * Release mutex and return.
+     */
+    spmReleaseMutex(&RegRec);
+    LIBCLOG_RETURN_P(rc);
 }
 
@@ -742 +872 @@
     spmReleaseMutex(&RegRec);
     LIBCLOG_RETURN_INT(0);
+}
+
+
+/**
+ * Checks if the calling process can see the specfied one.
+ *
+ * @returns 0 if it can see it.
+ * @returns -ESRCH (or other approriate error code) if it cannot.
+ *
+ * @param   pProcess    The process in question.
+ */
+int __libc_spmCanSee(__LIBC_PSPMPROCESS pProcess)
+{
+    return 0;
+}
+
+
+/**
+ * Checks if we are a system-wide super user.
+ *
+ * @returns 0 if we are.
+ * @returns -EPERM if we aren't.
+ */
+int __libc_spmIsSuperUser(void)
+{
+    if (gpSPMSelf->euid == 0)
+        return 0;
+    return -EPERM;
+}
+
+
+/**
+ * Checks if the caller can modify the specified process.
+ *
+ * @returns 0 if we can modify it.
+ * @returns -EPERM if we cannot modify it.
+ * @param   pProcess    The process in question.
+ */
+int __libc_spmCanModify(__LIBC_PSPMPROCESS pProcess)
+{
+    if (!gpSPMSelf->euid)
+        return 0;
+    uid_t euid = pProcess->euid;
+    if (    euid == gpSPMSelf->euid
+        ||  euid == gpSPMSelf->uid)
+        return 0;
+    return -EPERM;
 }