Remove the rest of the pthreads functions from the threaded MPM

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88256 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 2c4fdcf0be2b7436c59bb302b76462d3acb57c7c..5cc1e4ea5dc31e85ed34e613f0e102d8a83a1073 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.12-dev
 
+  *) Remove the rest of the pthreads functions from the threaded MPM.
+     This requires the APR support for a signal thread that was just
+     added.  [Ryan Bloom]
+
   *) Make mod_dir use a fixup for sending a redirect to the browser.
      Before this, we were using a handler, which doesn't make much
      sense, because the handler wasn't generating any data, it would

diff --git a/include/ap_config.h b/include/ap_config.h
index 6f4b389cb06efc28fd965b7014db79bd46cc331a..eac7483cee0377d4429276f0656a0fe90092a4cc 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -223,12 +223,6 @@
 #endif
 
 
-#ifdef SIGWAIT_TAKES_ONE_ARG
-#define ap_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
-#else
-#define ap_sigwait(a,b) sigwait((a),(b))
-#endif
-
 /* TODO - We need to put OS detection back to make all the following work */
 
 #if defined(SUNOS4) || defined(IRIX) || defined(NEXT) || defined(AUX3) \

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index d4327a0ece6fcbbe4d28c32d804585daa6e9ca65..7fbb40361fc2a828ee65ca06b41c0b39367e8480 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -93,7 +93,6 @@
 #endif
 
 #include <signal.h>
-#include <pthread.h>
 
 /*
  * Actual definitions of config globals
@@ -581,11 +580,19 @@ static void * worker_thread(void * dummy)
     return NULL;
 }
 
+static int check_signal(int signum)
+{
+    switch (signum) {
+        case SIGTERM:
+        case SIGINT:
+            just_die(signum);
+            return 1;
+    }                                                                           
+    return 0;
+}
 
 static void child_main(int child_num_arg)
 {
-    sigset_t sig_mask;
-    int signal_received;
     apr_thread_t *thread;
     apr_threadattr_t *thread_attr;
     int i;
@@ -617,21 +624,7 @@ static void child_main(int child_num_arg)
 
     /*done with init critical section */
 
-    /* All threads should mask signals out, accoring to sigwait(2) man page */
-    sigfillset(&sig_mask);
-
-#ifdef SIGPROCMASK_SETS_THREAD_MASK
-    if (sigprocmask(SIG_SETMASK, &sig_mask, NULL) != 0) {
-        ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf, "sigprocmask");
-    }
-#else
-    if ((rv = pthread_sigmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, "pthread_sigmask");
-    }
-#endif
+    apr_setup_signal_thread();
 
     requests_this_child = ap_max_requests_per_child;
     
@@ -654,7 +647,9 @@ static void child_main(int child_num_arg)
     apr_threadattr_create(&thread_attr, pchild);
     apr_threadattr_detach_set(thread_attr);
 
-    for (i=0; i < ap_threads_per_child; i++) {
+    apr_create_signal_thread(&thread, thread_attr, check_signal, pchild);
+
+    for (i=0; i < ap_threads_per_child - 1; i++) {
 
        my_info = (proc_info *)malloc(sizeof(proc_info));
         if (my_info == NULL) {
@@ -683,22 +678,17 @@ static void child_main(int child_num_arg)
         * because it let's us deal with tid better.
         */
     }
-
-    /* This thread will be the one responsible for handling signals */
-    sigemptyset(&sig_mask);
-    sigaddset(&sig_mask, SIGTERM);
-    sigaddset(&sig_mask, SIGINT);
-    ap_sigwait(&sig_mask, &signal_received);
-    switch (signal_received) {
-        case SIGTERM:
-        case SIGINT:
-            just_die(signal_received);
-            break;
-        default:
-            ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf,
-            "received impossible signal: %d", signal_received);
-            just_die(SIGTERM);
+    apr_pool_create(&my_info->tpool, pchild);
+    my_info = (proc_info *)malloc(sizeof(proc_info));
+    if (my_info == NULL) {
+        ap_log_error(APLOG_MARK, APLOG_ALERT, errno, ap_server_conf,
+                    "malloc: out of memory");
+        clean_child_exit(APEXIT_CHILDFATAL);
     }
+    my_info->pid = my_child_num;
+    my_info->tid = i;
+    my_info->sd = 0;
+    worker_thread(my_info);
 }
 
 static int make_child(server_rec *s, int slot)