httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 os.h
Date Sat, 10 Jun 2000 16:15:10 GMT
rbb         00/06/10 09:15:08

  Modified:    src/include ap_config.h
               src/main http_main.c
               src/modules/mpm config.m4
               src/modules/mpm/dexter scoreboard.h
               src/modules/mpm/mpmt_pthread scoreboard.h
               src/modules/mpm/prefork scoreboard.h
               src/modules/mpm/spmt_os2 scoreboard.h
               src/os/win32 os.h
  Log:
  Cleanup more of the Apache configuration.  This removes all of the shared
  memory checks, because Apache relies completely on APR for shared memory
  support.  In doing this, we also need to know how APR/MM are providing
  our shared memory (ie file or memory) that requires the change made to
  APR's configure script that was just committed.
  
  Revision  Changes    Path
  1.33      +6 -0      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ap_config.h	2000/06/10 12:02:29	1.32
  +++ ap_config.h	2000/06/10 16:14:55	1.33
  @@ -249,6 +249,12 @@
   #undef USE_MMAP_FILES
   #endif
   
  +#if APR_FILE_BASED_SHM
  +#define USE_FILE_BASED_SCOREBOARD
  +#else
  +#define USE_MEM_BASED_SCOREBOARD
  +#endif
  +
   #if defined(CHARSET_EBCDIC) && !defined(APACHE_XLATE)
   #define APACHE_XLATE
   #endif
  
  
  
  1.58      +4 -10     apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- http_main.c	2000/06/10 11:46:37	1.57
  +++ http_main.c	2000/06/10 16:14:56	1.58
  @@ -93,17 +93,11 @@
   #ifdef HAVE_SHMGET
       printf(" -D HAVE_SHMGET\n");
   #endif
  -#ifdef USE_MMAP_SCOREBOARD
  -    printf(" -D USE_MMAP_SCOREBOARD\n");
  +#ifdef USE_FILE_BASED_SCOREBOARD
  +    printf(" -D USE_FILE_BASED_SCOREBOARD\n");
   #endif
  -#ifdef USE_SHMGET_SCOREBOARD
  -    printf(" -D USE_SHMGET_SCOREBOARD\n");
  -#endif
  -#ifdef USE_OS2_SCOREBOARD
  -    printf(" -D USE_OS2_SCOREBOARD\n");
  -#endif
  -#ifdef USE_POSIX_SCOREBOARD
  -    printf(" -D USE_POSIX_SCOREBOARD\n");
  +#ifdef USE_MEM_BASED_SCOREBOARD
  +    printf(" -D USE_MEM_BASED_SCOREBOARD\n");
   #endif
   #ifdef USE_MMAP_FILES
       printf(" -D USE_MMAP_FILES\n");
  
  
  
  1.16      +0 -18     apache-2.0/src/modules/mpm/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- config.m4	2000/06/07 12:36:51	1.15
  +++ config.m4	2000/06/10 16:14:58	1.16
  @@ -40,24 +40,6 @@
   APACHE_SUBST(MPM_NAME)
   MODLIST="$MODLIST mpm_${MPM_NAME}"
   
  -dnl All the unix MPMs use shared memory; save a little duplication
  -AC_DEFUN(APACHE_MPM_CHECK_SHMEM, [
  -    AC_CHECK_FUNCS(shmget mmap)
  -    
  -    AC_MSG_CHECKING(which shared memory mechanism to use)
  -    if test "$ac_cv_func_shmget" = "yes" ; then
  -        AC_DEFINE(USE_SHMGET_SCOREBOARD,,
  -            [Define if MPMs should use shmget to implement their shared memory])
  -        AC_MSG_RESULT(shmget)
  -    elif test "$ac_cv_func_mmap" = "yes" ; then
  -        AC_DEFINE(USE_MMAP_SCOREBOARD,,
  -            [Define if MPMs should use mmap to implement their shared memory])
  -        AC_MSG_RESULT(mmap)
  -    else
  -        AC_MSG_ERROR(No known shared memory system)
  -    fi
  -])
  -
   dnl Check for pthreads and attempt to support it
   AC_DEFUN(APACHE_MPM_PTHREAD, [
     if test "$pthreads_working" != "yes"; then
  
  
  
  1.8       +0 -4      apache-2.0/src/modules/mpm/dexter/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- scoreboard.h	2000/04/14 15:59:00	1.7
  +++ scoreboard.h	2000/06/10 16:15:01	1.8
  @@ -73,10 +73,6 @@
   
   /* The generic shared memory chunk code */
   void reinit_scoreboard(ap_pool_t *p);
  -#if defined(USE_OS2_SCOREBOARD)
  -caddr_t create_shared_heap(const char *name, size_t size);
  -caddr_t get_shared_heap(const char *Name);
  -#endif
   
   API_EXPORT(void) reopen_scoreboard(ap_pool_t *p);
   
  
  
  
  1.18      +2 -12     apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- scoreboard.h	2000/06/08 00:28:32	1.17
  +++ scoreboard.h	2000/06/10 16:15:03	1.18
  @@ -72,9 +72,8 @@
   
   #include "mpm_default.h"	/* For HARD_.*_LIMIT */
   
  -/* The optimized timeout code only works if we're not using a scoreboard file
  - */
  -#if (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
  +/*The optimized timeout code only works if we're not using a scoreboard file*/
  +#if defined(USE_MEM_BASED_SCOREBOARD)
   #define OPTIMIZE_TIMEOUTS
   #endif
   
  @@ -216,14 +215,6 @@
   API_EXPORT(void) ap_sync_scoreboard_image(void);
   void ap_mpmt_pthread_force_reset_connection_status(long conn_id);
   
  -
  -#if defined(USE_OS2_SCOREBOARD)
  -caddr_t create_shared_heap(const char *name, size_t size);
  -caddr_t get_shared_heap(const char *Name);
  -#elif defined(USE_POSIX_SCOREBOARD)
  -static void cleanup_shared_mem(void *d);
  -#endif
  -
   API_EXPORT(void) reopen_scoreboard(ap_pool_t *p);
   
   ap_inline void ap_sync_scoreboard_image(void);
  @@ -232,7 +223,6 @@
   API_EXPORT(int) find_child_by_pid(ap_proc_t *pid);
   int ap_update_child_status(int child_num, int thread_num, int status, request_rec *r);
   void ap_time_process_request(int child_num, int thread_num, int status);
  -
   
   
   API_VAR_EXPORT extern scoreboard *ap_scoreboard_image;
  
  
  
  1.12      +1 -1      apache-2.0/src/modules/mpm/prefork/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/scoreboard.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- scoreboard.h	2000/06/08 00:28:33	1.11
  +++ scoreboard.h	2000/06/10 16:15:04	1.12
  @@ -75,7 +75,7 @@
   
   /* The optimized timeout code only works if we're not using a scoreboard file
    */
  -#if (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
  +#if defined(USE_MEM_BASED_SCOREBOARD)
   #define OPTIMIZE_TIMEOUTS
   #endif
   
  
  
  
  1.11      +1 -1      apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/scoreboard.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- scoreboard.h	2000/06/08 00:28:34	1.10
  +++ scoreboard.h	2000/06/10 16:15:07	1.11
  @@ -69,7 +69,7 @@
   
   /* The optimized timeout code only works if we're not using a scoreboard file
    */
  -#if (defined (USE_MMAP_SCOREBOARD) || defined (USE_SHMGET_SCOREBOARD))
  +#if defined(USE_MEM_BASED_SCOREBOARD)
   #define OPTIMIZE_TIMEOUTS
   #endif
   
  
  
  
  1.35      +0 -1      apache-2.0/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/os.h,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- os.h	2000/06/09 21:19:52	1.34
  +++ os.h	2000/06/10 16:15:08	1.35
  @@ -104,7 +104,6 @@
   #define NO_USE_SIGACTION
   /* #undef HAVE_TIMES */
   #define USE_LONGJMP
  -#define USE_MMAP_SCOREBOARD
   #define HAVE_CANONICAL_FILENAME
   #define HAVE_DRIVE_LETTERS
   #define HAVE_SENDFILE
  
  
  

Mime
View raw message