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/threaded mpm.h threaded.c
Date Fri, 02 Mar 2001 18:52:41 GMT
trawick     01/03/02 10:52:36

  Modified:    server/mpm/prefork mpm.h prefork.c
               server/mpm/threaded mpm.h threaded.c
  Log:
  fix the type of ap_my_pid and make it static since it is used
  in only one file per build (prefork.c or threaded.c)
  PR:		6980
  
  Revision  Changes    Path
  1.9       +0 -1      httpd-2.0/server/mpm/prefork/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/mpm.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mpm.h	2001/02/16 04:26:51	1.8
  +++ mpm.h	2001/03/02 18:51:56	1.9
  @@ -74,6 +74,5 @@
   extern int ap_threads_per_child;
   extern int ap_max_daemons_limit;
   extern server_rec *ap_server_conf;
  -extern int ap_my_pid;
   extern char ap_coredump_dir[MAX_STRING_LEN];
   #endif /* APACHE_MPM_PREFORK_H */
  
  
  
  1.169     +1 -1      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.168
  retrieving revision 1.169
  diff -u -r1.168 -r1.169
  --- prefork.c	2001/02/23 18:17:18	1.168
  +++ prefork.c	2001/03/02 18:52:00	1.169
  @@ -172,7 +172,7 @@
   static apr_pool_t *pconf;		/* Pool for config stuff */
   static apr_pool_t *pchild;		/* Pool for httpd child stuff */
   
  -int ap_my_pid;	/* it seems silly to call getpid all the time */
  +static pid_t ap_my_pid;	/* it seems silly to call getpid all the time */
   #ifndef MULTITHREAD
   static int my_child_num;
   #endif
  
  
  
  1.2       +0 -1      httpd-2.0/server/mpm/threaded/mpm.h
  
  Index: mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/mpm.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mpm.h	2001/02/16 19:00:24	1.1
  +++ mpm.h	2001/03/02 18:52:19	1.2
  @@ -71,7 +71,6 @@
   extern int ap_threads_per_child;
   extern int ap_max_requests_per_child;
   extern int ap_max_daemons_limit;
  -extern unsigned int ap_my_pid;
   extern server_rec *ap_server_conf;
   extern char ap_coredump_dir[MAX_STRING_LEN];
   
  
  
  
  1.10      +1 -1      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- threaded.c	2001/02/27 18:46:05	1.9
  +++ threaded.c	2001/03/02 18:52:23	1.10
  @@ -155,7 +155,7 @@
   static apr_pool_t *pconf;		/* Pool for config stuff */
   static apr_pool_t *pchild;		/* Pool for httpd child stuff */
   
  -unsigned int ap_my_pid; /* Linux getpid() doesn't work except in main 
  +static pid_t ap_my_pid; /* Linux getpid() doesn't work except in main 
                              thread. Use this instead */
   /* Keep track of the number of worker threads currently active */
   static int worker_thread_count;
  
  
  

Mime
View raw message