httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/netware mpm_netware.c
Date Tue, 23 Oct 2001 23:33:46 GMT
bnicholes    01/10/23 16:33:46

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Updated to the new locking API's
  
  Revision  Changes    Path
  1.3       +6 -5      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mpm_netware.c	2001/10/22 15:20:22	1.2
  +++ mpm_netware.c	2001/10/23 23:33:46	1.3
  @@ -91,6 +91,7 @@
   #include "apr_signal.h"
   #include "apr_tables.h"
   #include "apr_getopt.h"
  +#include "apr_thread_mutex.h"
   
   #define APR_WANT_STDIO
   #define APR_WANT_STRFUNC
  @@ -133,7 +134,7 @@
   
   int ap_threads_per_child=0;         /* Worker threads per child */
   int ap_thread_stack_size=65536;
  -static apr_lock_t *accept_lock;
  +static apr_thread_mutex_t *accept_lock;
   static int ap_threads_to_start=0;
   static int ap_threads_min_free=0;
   static int ap_threads_max_free=0;
  @@ -176,11 +177,11 @@
   #endif
   
   static int die_now = 0;
  -static apr_lock_t *accept_mutex = NULL;
  +static apr_thread_mutex_t *accept_mutex = NULL;
   
   /* Keep track of the number of worker threads currently active */
   static int worker_thread_count;
  -static apr_lock_t *worker_thread_count_mutex;
  +static apr_thread_mutex_t *worker_thread_count_mutex;
   
   
   #ifdef GPROF
  @@ -860,8 +861,8 @@
       ap_log_pid(pconf, ap_pid_fname);
   
       worker_thread_count = 0;
  -    apr_thread_mutex_create(&worker_thread_count_mutex, pconf);
  -    apr_thread_mutex_create(&accept_mutex, pconf);
  +    apr_thread_mutex_create(&worker_thread_count_mutex, APR_THREAD_MUTEX_DEFAULT, pconf);
  +    apr_thread_mutex_create(&accept_mutex, APR_THREAD_MUTEX_DEFAULT, pconf);
       if (!is_graceful) {
           ap_run_pre_mpm(pconf, SB_NOT_SHARED);
       }
  
  
  

Mime
View raw message