Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3435 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/client.c b/scheduler/client.c
index da91453ebbaf718e876a088d983dc242b2995006..2ca918703fe1d6853330bd1abc70de6763014b80 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c,v 1.91.2.44 2003/02/11 18:23:34 mike Exp $"
+ * "$Id: client.c,v 1.91.2.45 2003/03/07 19:25:48 mike Exp $"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -2783,14 +2783,14 @@ pipe_command(client_t *con,             /* I - Client connection */
 
 #ifdef HAVE_SIGSET
   sighold(SIGTERM);
-  sighold(SIGCHLD);
 #elif defined(HAVE_SIGACTION)
   sigemptyset(&newmask);
   sigaddset(&newmask, SIGTERM);
-  sigaddset(&newmask, SIGCHLD);
   sigprocmask(SIG_BLOCK, &newmask, &oldmask);
 #endif /* HAVE_SIGSET */
 
+  IgnoreChildSignals();
+
  /*
   * Then execute the command...
   */
@@ -2857,10 +2857,8 @@ pipe_command(client_t *con,              /* I - Client connection */
 
 #ifdef HAVE_SIGSET
     sigset(SIGTERM, SIG_DFL);
-    sigset(SIGCHLD, SIG_DFL);
 
     sigrelse(SIGTERM);
-    sigrelse(SIGCHLD);
 #elif defined(HAVE_SIGACTION)
     memset(&action, 0, sizeof(action));
 
@@ -2868,15 +2866,12 @@ pipe_command(client_t *con,             /* I - Client connection */
     action.sa_handler = SIG_DFL;
 
     sigaction(SIGTERM, &action, NULL);
-    sigaction(SIGCHLD, &action, NULL);
 
     sigprocmask(SIG_SETMASK, &oldmask, NULL);
 #else
     signal(SIGTERM, SIG_DFL);
-    signal(SIGCHLD, SIG_DFL);
 #endif /* HAVE_SIGSET */
 
-
    /*
     * Execute the pipe program; if an error occurs, exit with status 1...
     */
@@ -2914,11 +2909,12 @@ pipe_command(client_t *con,             /* I - Client connection */
 
 #ifdef HAVE_SIGSET
   sigrelse(SIGTERM);
-  sigrelse(SIGCHLD);
 #elif defined(HAVE_SIGACTION)
   sigprocmask(SIG_SETMASK, &oldmask, NULL);
 #endif /* HAVE_SIGSET */
 
+  CatchChildSignals();
+
   return (pid);
 }
 
@@ -2972,5 +2968,5 @@ CDSAWriteFunc(SSLConnectionRef connection,        /* I  - SSL/TLS connection */
 
 
 /*
- * End of "$Id: client.c,v 1.91.2.44 2003/02/11 18:23:34 mike Exp $".
+ * End of "$Id: client.c,v 1.91.2.45 2003/03/07 19:25:48 mike Exp $".
  */

diff --git a/scheduler/job.c b/scheduler/job.c
index c5165a4ecac92e4f383ae9dedb5962263d017e0c..cfeca2f3ab624de1ecf33824db0be1a76002acff 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c,v 1.124.2.49 2003/02/28 20:18:26 mike Exp $"
+ * "$Id: job.c,v 1.124.2.50 2003/03/07 19:25:49 mike Exp $"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -2497,14 +2497,14 @@ start_process(const char *command,      /* I - Full path to command */
 
 #ifdef HAVE_SIGSET
   sighold(SIGTERM);
-  sighold(SIGCHLD);
 #elif defined(HAVE_SIGACTION)
   sigemptyset(&newmask);
   sigaddset(&newmask, SIGTERM);
-  sigaddset(&newmask, SIGCHLD);
   sigprocmask(SIG_BLOCK, &newmask, &oldmask);
 #endif /* HAVE_SIGSET */
 
+  IgnoreChildSignals();
+
   if ((*pid = fork()) == 0)
   {
    /*
@@ -2582,7 +2582,6 @@ start_process(const char *command,        /* I - Full path to command */
     sigset(SIGCHLD, SIG_DFL);
 
     sigrelse(SIGTERM);
-    sigrelse(SIGCHLD);
 #elif defined(HAVE_SIGACTION)
     memset(&action, 0, sizeof(action));
 
@@ -2590,12 +2589,10 @@ start_process(const char *command,      /* I - Full path to command */
     action.sa_handler = SIG_DFL;
 
     sigaction(SIGTERM, &action, NULL);
-    sigaction(SIGCHLD, &action, NULL);
 
     sigprocmask(SIG_SETMASK, &oldmask, NULL);
 #else
     signal(SIGTERM, SIG_DFL);
-    signal(SIGCHLD, SIG_DFL);
 #endif /* HAVE_SIGSET */
 
    /*
@@ -2622,15 +2619,16 @@ start_process(const char *command,      /* I - Full path to command */
 
 #ifdef HAVE_SIGSET
   sigrelse(SIGTERM);
-  sigrelse(SIGCHLD);
 #elif defined(HAVE_SIGACTION)
   sigprocmask(SIG_SETMASK, &oldmask, NULL);
 #endif /* HAVE_SIGSET */
 
+  CatchChildSignals();
+
   return (*pid);
 }
 
 
 /*
- * End of "$Id: job.c,v 1.124.2.49 2003/02/28 20:18:26 mike Exp $".
+ * End of "$Id: job.c,v 1.124.2.50 2003/03/07 19:25:49 mike Exp $".
  */

diff --git a/scheduler/main.c b/scheduler/main.c
index c9fa808e066e7e5a29910da22608a694f01d545f..c3522800aae60be7ab2754376d34806e76e4ef70 100644 (file)
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c,v 1.57.2.34 2003/02/13 03:33:33 mike Exp $"
+ * "$Id: main.c,v 1.57.2.35 2003/03/07 19:25:50 mike Exp $"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -688,6 +688,10 @@ CatchChildSignals(void)
 #else
   signal(SIGCLD, sigchld_handler);     /* No, SIGCLD isn't a typo... */
 #endif /* HAVE_SIGSET */
+
+#if defined(HAVE_WAITPID) || defined(HAVE_WAIT3)
+  sigchld_handler(SIGCHLD);
+#endif /* HAVE_WAITPID || HAVE_WAIT3 */
 }
 
 
@@ -1026,5 +1030,5 @@ usage(void)
 
 
 /*
- * End of "$Id: main.c,v 1.57.2.34 2003/02/13 03:33:33 mike Exp $".
+ * End of "$Id: main.c,v 1.57.2.35 2003/03/07 19:25:50 mike Exp $".
  */

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 13a924d2f393e249c8cbd8e347682f692ebe83b1..86cf920591a27e973cf2a719fdf6581ef68a3ef1 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: run-stp-tests.sh,v 1.4.2.11 2003/01/03 18:50:18 mike Exp $"
+# "$Id: run-stp-tests.sh,v 1.4.2.12 2003/03/07 19:25:51 mike Exp $"
 #
 #   Perform the complete set of IPP compliance tests specified in the
 #   CUPS Software Test Plan.
@@ -50,6 +50,7 @@ echo ""
 echo "1 - Basic conformance test with no load testing (all systems)"
 echo "2 - Basic conformance test with some load testing (minimum 256MB VM)"
 echo "3 - Basic conformance test with extreme load testing (minimum 1024MB VM)"
+echo "4 - Basic conformance test with torture load testing (minimum 2048MB VM)"
 echo ""
 echo "Please enter the number of the test you wish to perform:"
 
@@ -68,6 +69,12 @@ case "$testtype" in
                nprinters2=1000
                pjobs=100
                ;;
+       4)
+               echo "Running the torture tests (4)"
+               nprinters1=10000
+               nprinters2=20000
+               pjobs=200
+               ;;
        *)
                echo "Running the timid tests (1)"
                nprinters1=0
@@ -435,5 +442,5 @@ echo "    $pdffile"
 echo ""
 
 #
-# End of "$Id: run-stp-tests.sh,v 1.4.2.11 2003/01/03 18:50:18 mike Exp $"
+# End of "$Id: run-stp-tests.sh,v 1.4.2.12 2003/03/07 19:25:51 mike Exp $"
 #