httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Thu, 27 Dec 2001 17:06:41 GMT
aaron       01/12/27 09:06:40

  Modified:    server/mpm/worker worker.c
  Log:
  Take advantage of the new usable apr_thread_exit().
  
  Revision  Changes    Path
  1.55      +2 -6      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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- worker.c	2001/12/25 12:24:14	1.54
  +++ worker.c	2001/12/27 17:06:40	1.55
  @@ -750,9 +750,7 @@
       ap_scoreboard_image->parent[process_slot].quiescing = 1;
       kill(ap_my_pid, SIGTERM);
   
  -/* Unsure if this can be safely uncommented. -aaron
       apr_thread_exit(thd, APR_SUCCESS);
  -*/
       return NULL;
   }
   
  @@ -789,8 +787,7 @@
       worker_thread_count--;
       apr_thread_mutex_unlock(worker_thread_count_mutex);
   
  -    rv = APR_SUCCESS;
  -    apr_thread_exit(thd, &rv);
  +    apr_thread_exit(thd, APR_SUCCESS);
       return NULL;
   }
   
  @@ -879,8 +876,7 @@
        *  "life_status" is almost right, but it's in the worker's structure, and 
        *  the name could be clearer.   gla
        */
  -    rv = APR_SUCCESS;
  -    apr_thread_exit(thd, &rv);
  +    apr_thread_exit(thd, APR_SUCCESS);
       return NULL;
   }
   
  
  
  

Mime
View raw message