httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Thu, 18 Apr 2002 17:46:20 GMT
trawick     02/04/18 10:46:20

  Modified:    server/mpm/worker worker.c
  Log:
  back out ill-conceived attempt to fix a segfault during
  graceless termination
  
  Revision  Changes    Path
  1.117     +3 -11     httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- worker.c	17 Apr 2002 15:45:27 -0000	1.116
  +++ worker.c	18 Apr 2002 17:46:20 -0000	1.117
  @@ -228,10 +228,6 @@
   
   static apr_pool_t *pconf;                 /* Pool for config stuff */
   static apr_pool_t *pchild;                /* Pool for httpd child stuff */
  -static apr_pool_t *thread_pool;           /* pool for APR to use for our
  -                                           * threads (shouldn't call it
  -                                           * pthreads :) )
  -                                           */
   
   static pid_t ap_my_pid; /* Linux getpid() doesn't work except in main 
                              thread. Use this instead */
  @@ -920,7 +916,7 @@
       my_info->tid = -1; /* listener thread doesn't have a thread slot */
       my_info->sd = 0;
       rv = apr_thread_create(&ts->listener, thread_attr, listener_thread,
  -                           my_info, thread_pool);
  +                           my_info, pchild);
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf,
                        "apr_thread_create: unable to create listener thread");
  @@ -992,7 +988,7 @@
                * done because it lets us deal with tid better.
                */
               rv = apr_thread_create(&threads[i], thread_attr, 
  -                                   worker_thread, my_info, thread_pool);
  +                                   worker_thread, my_info, pchild);
               if (rv != APR_SUCCESS) {
                   ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf,
                       "apr_thread_create: unable to create worker thread");
  @@ -1122,10 +1118,6 @@
   
       ap_my_pid = getpid();
       apr_pool_create(&pchild, pconf);
  -    /* pool passed to apr_thread_create() can't be cleaned up with pchild
  -     * since that causes segfaults with graceless termination
  -     */
  -    apr_pool_create(&thread_pool, NULL);
   
       /*stuff to do before we switch id's, so we have permissions.*/
       ap_reopen_scoreboard(pchild, NULL, 0);
  @@ -1190,7 +1182,7 @@
       ts->threadattr = thread_attr;
   
       rv = apr_thread_create(&start_thread_id, thread_attr, start_threads,
  -                           ts, thread_pool);
  +                           ts, pchild);
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf,
                        "apr_thread_create: unable to create worker thread");
  
  
  

Mime
View raw message