Changeset 1627

Timestamp:

Nov 8, 2004, 10:57:37 AM (21 years ago)

Author:

bird

Message:

Having a go at waitid (and waitpid()/wait()).

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/backend.h (modified) (2 diffs, 1 prop)
• include/InnoTekLIBC/sharedpm.h (modified) (1 diff, 1 prop)
• include/InnoTekLIBC/thread.h (modified) (1 diff, 1 prop)
• include/sys/wait.h (modified) (1 diff, 1 prop)
• src/lib/process/beginthr.c (modified) (3 diffs, 1 prop)
• src/lib/process/waitid.c (added)
• src/lib/sys/b_processWait.c (added)
• src/lib/sys/sharedpm.c (modified) (1 diff, 1 prop)

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

@@ -30 +30 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
+#include <sys/_timeval.h>
+#include <sys/resource.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <emx/io.h>
@@ -657 +660 @@
 /** @} */
 
+
+
+/** @defgroup grp_Back_process  LIBC Backend - Process Management
+ * @{ */
+
+/**
+ * Waits/polls for on one or more processes to change it's running status.
+ *
+ * @returns 0 on success, pSigInfo containing status info.
+ * @returns -1 and errno on failure.
+ * @param   enmIdType   What kind of process specification Id contains.
+ * @param   Id          Process specification of the enmIdType sort.
+ * @param   pSigInfo    Where to store the result.
+ * @param   fOptions    The WEXITED, WUNTRACED, WSTOPPED and WCONTINUED flags are used to
+ *                      select the events to report. WNOHANG is used for preventing the api
+ *                      from blocking. And WNOWAIT is used for peeking.
+ * @param   pResUsage   Where to store the reported resources usage for the child.
+ *                      Optional and not implemented on OS/2.
+ */
+int __libc_Back_processWait(idtype_t enmIdType, id_t Id, siginfo_t *pSigInfo, unsigned fOptions, struct rusage *pUsage);
+
+/** @} */
+
 __END_DECLS
 

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

@@ -550 +550 @@
 
 /**
+ * Gets the exit code and reason of death for a specific child process
+ * which is believed to have died.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pid                 Process id.
+ * @param   pendDeathReason     Where to store the death reason.
+ * @param   piExitCode          Where to store the exit code.
+ */
+int __libc_spmReapChild(pid_t pid, __LIBC_EXIT_REASON *penmDeathReason, int *piExitCode);
+
+/**
  * Locks the LIBC shared memory for short exclusive access.
  * The call must call __libc_spmUnlock() as fast as possible and make

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

@@ -545 +545 @@
 void (*__libc_TLSGetDestructor(int iTLSIndex, unsigned *pfFlags))(void *, int, unsigned);
 
+/* fix later */
+int __libc_back_threadCreate(void (*pfnStart)(void *), unsigned cbStack, void *pvArg, int fInternal);
+
 /** @} */
 

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

@@ -1 @@
-/* sys/wait.h (emx+gcc) */
+/*-
+ * Copyright (c) 1982, 1986, 1989, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)wait.h      8.2 (Berkeley) 7/10/94
+ * $FreeBSD: src/sys/sys/wait.h,v 1.20 2004/04/09 13:14:32 bde Exp $
+ */
 
-#ifndef _SYS_WAIT_H
-#define _SYS_WAIT_H
+#ifndef _SYS_WAIT_H_
+#define _SYS_WAIT_H_
 
-#if defined (__cplusplus)
-extern "C" {
+#include <sys/cdefs.h>
+
+/*
+ * This file holds definitions relevant to the wait4 system call and the
+ * alternate interfaces that use it (wait, wait3, waitpid).
+ */
+
+/*
+ * Macros to test the exit status returned by wait and extract the relevant
+ * values.
+ */
+#if __BSD_VISIBLE
+#define _W_INT(w)       (*(int *)&(w))  /* Convert union wait to int. */
+#define WCOREFLAG       0200
+#else
+#define _W_INT(i)       (i)
 #endif
 
-#define WNOHANG         1
-#define WUNTRACED       2
+#define _WSTATUS(x)     (_W_INT(x) & 0177)
+#define _WSTOPPED       0177            /* _WSTATUS if process is stopped */
+#define WIFSTOPPED(x)   (_WSTATUS(x) == _WSTOPPED)
+#define WSTOPSIG(x)     (_W_INT(x) >> 8)
+#define WIFSIGNALED(x)  (_WSTATUS(x) != _WSTOPPED && _WSTATUS(x) != 0)
+#define WTERMSIG(x)     (_WSTATUS(x))
+#define WIFEXITED(x)    (_WSTATUS(x) == 0)
+#define WEXITSTATUS(x)  (_W_INT(x) >> 8)
+#define WIFCONTINUED(x) (x == 0x13)     /* 0x13 == SIGCONT */
+#if __BSD_VISIBLE
+#define WCOREDUMP(x)    (_W_INT(x) & WCOREFLAG)
 
-#define WIFEXITED(st)   (((st) & 0x7f) == 0)
-#define WIFSIGNALED(st) (((st) & 0x7f) != 0x7f && ((st) & 0x7f) != 0)
-#define WIFSTOPPED(st)  (((st) & 0x7f) == 0x7f)
-
-#define WEXITSTATUS(st) ((st) >> 8)
-#define WTERMSIG(st)    ((st) & 0x7f)
-#define WSTOPSIG(st)    ((st) >> 8)
-
-int wait (int *);
-int waitpid (int, int *, int);
-
-#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE) || defined(__USE_EMX)
-
-int _wait (int *);
-int _waitpid (int, int *, int);
-
+#define W_EXITCODE(ret, sig)    ((ret) << 8 | (sig))
+#define W_STOPCODE(sig)         ((sig) << 8 | _WSTOPPED)
 #endif
 
-#if defined (__cplusplus)
-}
+/*
+ * Option bits for the third argument of wait4.  WNOHANG causes the
+ * wait to not hang if there are no stopped or terminated processes, rather
+ * returning an error indication in this case (pid==0).  WUNTRACED
+ * indicates that the caller should receive status about untraced children
+ * which stop due to signals.  If children are stopped and a wait without
+ * this option is done, it is as though they were still running... nothing
+ * about them is returned.
+ */
+#define WNOHANG         1       /* Don't hang in wait. */
+#define WUNTRACED       2       /* Tell about stopped, untraced children. */
+#define WCONTINUED      4       /* Report a job control continued process. */
+
+#if 0 /* bird: old __BSD_VISIBLE */
+#define WLINUXCLONE 0x80000000  /* Wait for kthread spawned from linux_clone. */
 #endif
 
-#endif /* not SYS_WAIT_H */
+/*
+ * Tokens for special values of the "pid" parameter to wait4.
+ */
+#if __BSD_VISIBLE
+#define WAIT_ANY        (-1)    /* any process */
+#define WAIT_MYPGRP     0       /* any process in my process group */
+#endif /* __BSD_VISIBLE */
+
+#ifdef _KERNEL
+struct rusage;
+int     kern_wait(struct thread *td, pid_t pid, int *status, int options,
+            struct rusage *rup);
+#else /* !_KERNEL */
+#include <sys/types.h>
+
+__BEGIN_DECLS
+pid_t   wait(int *);
+pid_t   waitpid(pid_t, int *, int);
+#if 0 /* bird: old __BSD_VISIBLE */
+struct rusage;
+pid_t   wait3(int *, int, struct rusage *);
+pid_t   wait4(pid_t, int *, int, struct rusage *);
+#endif
+
+
+/*
+ * bird: LIBC additions - start.
+ */
+#if __XSI_VISIBLE
+#include <signal.h>
+
+/** Wait for processes that have exited. */
+#define WEXITED         8
+/** Wait for processes that have stopped. */
+#define WSTOPPED       16
+/** Keep the wait state around for later wait calls, i.e. just peek at the stuff. */
+#define WNOWAIT        32
+
+/* The following values are used by the `waitid' function.  */
+typedef enum
+{
+    /** Wait for any child process. */
+    P_ALL,
+    /** Wait for a specific process. */
+    P_PID,
+    /** Wait for processes of a process group. */
+    P_PGID
+} idtype_t;
+
+int     waitid(idtype_t, id_t, siginfo_t *, int);
+#endif /* __XSI_VISIBLE */
+
+/*
+ * bird: LIBC additions - end.
+ */
+
+__END_DECLS
+#endif /* _KERNEL */
+
+#endif /* !_SYS_WAIT_H_ */

trunk/src/emx/src/lib/process/beginthr.c

@@ -47 +47 @@
 
 
-int _beginthread(void (*pfnStart)(void *), void *pvStack, unsigned cbStack, void *pvArg)
+/* move me !! */
+int __libc_back_threadCreate(void (*pfnStart)(void *), unsigned cbStack, void *pvArg, int fInternal)
 {
-    LIBCLOG_ENTER("pfnStart=%p pvStart=%p cbStack=%d pvArg=%p\n", (void *)pfnStart, pvStack, cbStack, pvArg);
+    LIBCLOG_ENTER("pfnStart=%p cbStack=%d pvArg=%p fInternal=%d\n", (void *)pfnStart, cbStack, pvArg, fInternal);
     int             rc;
     TID             tid;
@@ -68 +69 @@
      * Set the startup thread info and create a new thread.
      */
+    pThrd->fInternalThread    = fInternal;
     pThrd->u.startup.pfnStart = pfnStart;
     pThrd->u.startup.pvArg    = pvArg;
@@ -94 +96 @@
 }
 
+int _beginthread(void (*pfnStart)(void *), void *pvStack, unsigned cbStack, void *pvArg)
+{
+    LIBCLOG_ENTER("pfnStart=%p pvStack=%p cbStack=%d pvArg=%p\n", (void *)pfnStart, pvStack, cbStack, pvArg);
+    int rc = __libc_back_threadCreate(pfnStart, cbStack, pvArg, 0);
+    if (rc >= 0)
+        LIBCLOG_RETURN_INT(-1);
+    errno = -rc;
+    LIBCLOG_RETURN_INT(-1);
+}
+
 
 void _endthread(void)

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

@@ -188 +188 @@
     LIBCLOG_RETURN_VOID();
 }
+
+
+/**
+ * Gets the exit code and reason of death for a specific child process
+ * which is believed to have died.
+ *
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
+ * @param   pid                 Process id.
+ * @param   pendDeathReason     Where to store the death reason.
+ * @param   piExitCode          Where to store the exit code.
+ */
+int __libc_spmReapChild(pid_t pid, __LIBC_EXIT_REASON *penmDeathReason, int *piExitCode)
+{
+    LIBCLOG_ENTER("pid=%#x (%d) penmDeathReason=%p piExitCode=%p\n", pid, pid, (void *)penmDeathReason, (void *)piExitCode);
+    __LIBC_SPMXCPTREGREC    RegRec;
+    int                     iExitCode = 0;
+    __LIBC_EXIT_REASON      enmDeathReason = 0;
+
+    /*
+     * Set return code and reason.
+     */
+    int rc = spmRequestMutexErrno(&RegRec);
+    if (!rc)
+    {
+        /*
+         * Try find the process, it gotta be a zombie.
+         */
+        __LIBC_PSPMPROCESS pProcess = spmQueryProcessInState(pid, __LIBC_PROCSTATE_ZOMBIE);
+        if (pProcess)
+        {
+            iExitCode = pProcess->iExitCode;
+            enmDeathReason = pProcess->enmDeathReason;
+
+            /* reap it */
+            if (pProcess->cReferences > 0)
+                pProcess->cReferences--;
+            if (pProcess->cReferences <= 0)
+                spmFreeProcess(pProcess);
+        }
+        else
+            rc = -ESRCH;
+
+        /*
+         * We're done, free the mutex and store the results.
+         */
+        spmReleaseMutex(&RegRec);
+        *penmDeathReason = enmDeathReason;
+        *piExitCode = iExitCode;
+    }
+
+    LIBCLOG_RETURN_INT(rc);
+}
+
 
 #ifdef TIMEBOMB