Changeset 1722

Timestamp:

Dec 9, 2004, 9:16:59 AM (21 years ago)

Author:

bird

Message:

Bugfixing.

File:

• trunk/src/emx/testcase/misc/waitpid-1.c (modified) (5 diffs, 1 prop)

trunk/src/emx/testcase/misc/waitpid-1.c

@@ -65 +65 @@
         else if (pid == g_pid128)
             rcWanted = W_EXITCODE(128, 0);
-        else if (pid == g_pid1)
+        else if (pid == g_pidKill)
             rcWanted = W_EXITCODE(0, SIGKILL);
         else
@@ -87 +87 @@
     if (argc == 2)
     {
-        if (strcmp(argv[1], "child-1"))
+        usleep(1000);
+        if (!strcmp(argv[1], "child-1"))
             return 1;
-        if (strcmp(argv[1], "child-64"))
+        if (!strcmp(argv[1], "child-64"))
             return 64;
-        if (strcmp(argv[1], "child-128"))
+        if (!strcmp(argv[1], "child-128"))
             return 128;
-        if (strcmp(argv[1], "child-kill"))
+        if (!strcmp(argv[1], "child-kill"))
             sleep(24*60*60);
         return 0;
@@ -111 +112 @@
      * spawn children.
      */
+    sighold(SIGCHLD);
     g_pid0 = spawnl(P_NOWAIT, argv[0], argv[0], "child", NULL);
     g_pid1 = spawnl(P_NOWAIT, argv[0], argv[0], "child-1", NULL);
@@ -116 +118 @@
     g_pid128 = spawnl(P_NOWAIT, argv[0], argv[0], "child-128", NULL);
     g_pidKill = spawnl(P_NOWAIT, argv[0], argv[0], "child-kill", NULL);
-
     int cSpawned = (g_pid0 > 0)
                  + (g_pid1 > 0)
@@ -122 +123 @@
                  + (g_pid128 > 0)
                  + (g_pidKill > 0);
+    printf("waitpid-1: info - pid0=%#x pid1=%#x pid64=%#x pid128=%#x pidKill=%#x\n", g_pid0, g_pid1, g_pid64, g_pid128, g_pidKill);
+    if (cSpawned != 5)
+    {
+        printf("waitpid-1: ERROR - one or more spawns failed. cSpawned=%d should be 5!\n", cSpawned);
+        g_cErrors++;
+    }
+    sigrelse(SIGCHLD);
+
     int cWaits = 0;
     while (g_cReaped < cSpawned && cWaits++ < 30)
-        sleep(1);
+    {
+        if (cWaits == 1 && g_cReaped + 1 == cSpawned)
+            kill(g_pidKill, SIGKILL);
+        else
+        {
+            sleep(1);
+            kill(g_pidKill, SIGKILL);
+        }
+    }
 
     if (g_cReaped != cSpawned)