httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/threaded threaded.c
Date Tue, 24 Jul 2001 05:19:47 GMT
wrowe       01/07/23 22:19:47

  Modified:    server/mpm/perchild perchild.c
               server/mpm/threaded threaded.c
  Log:
    Change the worker_function implementations to accept both parameters,
    the apr private data (apr_thread_t*) and the application private data
    (void*), for the last update to APR.
  
  Submitted by: Aaron Bannert <aaron@ebuilt.com>
  Reviewed by: Will Rowe
  
  Revision  Changes    Path
  1.72      +2 -2      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- perchild.c	2001/07/18 20:45:35	1.71
  +++ perchild.c	2001/07/24 05:19:46	1.72
  @@ -512,7 +512,7 @@
       }
   }
   
  -static void *worker_thread(void *);
  +static void *worker_thread(apr_thread_t *, void *);
   
   /* Starts a thread as long as we're below max_threads */
   static int start_thread(void)
  @@ -579,7 +579,7 @@
   
   /* idle_thread_count should be incremented before starting a worker_thread */
   
  -static void *worker_thread(void *arg)
  +static void *worker_thread(apr_thread_t *thd, void *arg)
   {
       apr_socket_t *csd = NULL;
       apr_pool_t *tpool;		/* Pool for this thread           */
  
  
  
  1.47      +2 -2      httpd-2.0/server/mpm/threaded/threaded.c
  
  Index: threaded.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- threaded.c	2001/07/18 20:45:36	1.46
  +++ threaded.c	2001/07/24 05:19:47	1.47
  @@ -520,7 +520,7 @@
       apr_lock_release(pipe_of_death_mutex);
   }
   
  -static void * worker_thread(void * dummy)
  +static void * worker_thread(apr_thread_t *thd, void * dummy)
   {
       proc_info * ti = dummy;
       int process_slot = ti->pid;
  @@ -671,7 +671,7 @@
       return 0;
   }
   
  -static void *start_threads(void * dummy)
  +static void *start_threads(apr_thread_t *thd, void * dummy)
   {
       thread_starter *ts = dummy;
       apr_thread_t **threads = ts->threads;
  
  
  

Mime
View raw message