cvs commit: apache-2.0/src/modules/mpm/dexter acceptlock.c dexter.c

[manoj]

manoj       99/08/31 14:34:07

  Modified:    src/modules/mpm/dexter acceptlock.c dexter.c
  Log:
  Fix dexter to work after Ryan's context patches.
  
  Revision  Changes    Path
  1.5       +2 -1      apache-2.0/src/modules/mpm/dexter/acceptlock.c
  
  Index: acceptlock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/acceptlock.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -d -u -r1.4 -r1.5
  --- acceptlock.c      1999/08/31 05:33:19     1.4
  +++ acceptlock.c      1999/08/31 21:34:05     1.5
  @@ -95,13 +95,14 @@
   /* Intraprocess locking used by other serialization techniques */
   static pthread_mutex_t *intra_mutex = NULL;
   
  -static void intra_mutex_cleanup(void *foo)
  +static ap_status_t intra_mutex_cleanup(void *foo)
   {
       int i;
   
       for (i = 0; i < intra_lock_count; i++) {
           (void) pthread_mutex_destroy(&intra_mutex[i]);
       }
  +    return APR_SUCCESS;
   }
   
   void intra_mutex_init(ap_context_t *p, int number_of_locks)
  
  
  
  1.35      +4 -4      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -d -u -r1.34 -r1.35
  --- dexter.c  1999/08/31 05:33:21     1.34
  +++ dexter.c  1999/08/31 21:34:05     1.35
  @@ -857,9 +857,9 @@
       long conn_id = child_num * HARD_THREAD_LIMIT + thread_num;
   
       pthread_mutex_lock(&thread_pool_create_mutex);
  -    tpool = ap_make_sub_pool(thread_pool_parent);
  +    ap_create_context(thread_pool_parent, NULL, &tpool);
       pthread_mutex_unlock(&thread_pool_create_mutex);
  -    ptrans = ap_make_sub_pool(tpool);
  +    ap_create_context(tpool, NULL, &ptrans);
   
       while (!workers_may_exit) {
           workers_may_exit |= (max_requests_per_child != 0) && 
(requests_this_child <= 0);
  @@ -979,7 +979,7 @@
   
       my_pid = getpid();
       child_num = child_num_arg;
  -    pchild = ap_make_sub_pool(pconf);
  +    ap_create_context(pconf, NULL, &pchild);
   
       /*stuff to do before we switch id's, so we have permissions.*/
   
  @@ -1024,7 +1024,7 @@
       for (i = 0; i < max_threads; i++) {
           worker_thread_free_ids[i] = i;
       }
  -    thread_pool_parent = ap_make_sub_pool(pchild);
  +    ap_create_context(pchild, NULL, &thread_pool_parent);
       pthread_mutex_init(&thread_pool_create_mutex, NULL);
       pthread_mutex_init(&idle_thread_count_mutex, NULL);
       pthread_mutex_init(&worker_thread_count_mutex, NULL);