httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread scoreboard.c
Date Wed, 22 Mar 2000 11:36:52 GMT
trawick     00/03/22 03:36:52

  Modified:    src/os/win32 os.h
               src/modules/mpm/mpmt_pthread scoreboard.c
  Log:
  axe some deprecated MULTITHREAD code
  
  Revision  Changes    Path
  1.17      +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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- os.h	2000/03/10 00:07:32	1.16
  +++ os.h	2000/03/22 11:36:51	1.17
  @@ -101,7 +101,6 @@
   #define USE_LONGJMP
   #define HAVE_MMAP
   #define USE_MMAP_SCOREBOARD
  -#define MULTITHREAD
   #define HAVE_CANONICAL_FILENAME
   #define HAVE_DRIVE_LETTERS
   #define HAVE_SENDFILE
  
  
  
  1.17      +0 -34     apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- scoreboard.c	2000/03/18 10:38:45	1.16
  +++ scoreboard.c	2000/03/22 11:36:52	1.17
  @@ -22,38 +22,6 @@
    * We begin with routines which deal with the file itself... 
    */
   
  -#ifdef MULTITHREAD
  -/*
  - * In the multithreaded mode, have multiple threads - not multiple
  - * processes that need to talk to each other. Just use a simple
  - * malloc. But let the routines that follow, think that you have
  - * shared memory (so they use memcpy etc.)
  - */
  -
  -void reinit_scoreboard(ap_context_t *p)
  -{
  -    ap_assert(!ap_scoreboard_image);
  -    ap_scoreboard_image = (scoreboard *) malloc(SCOREBOARD_SIZE);
  -    if (ap_scoreboard_image == NULL) {
  -        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  -                     "Ouch! Out of memory reiniting scoreboard!");
  -    }
  -    memset(ap_scoreboard_image, 0, SCOREBOARD_SIZE);
  -}
  -
  -void cleanup_scoreboard(void)
  -{
  -    ap_assert(ap_scoreboard_image);
  -    free(ap_scoreboard_image);
  -    ap_scoreboard_image = NULL;
  -}
  -
  -API_EXPORT(void) ap_sync_scoreboard_image(void)
  -{
  -}
  -
  -
  -#else /* MULTITHREAD */
   #if APR_HAS_SHARED_MEMORY
   #include "apr_shmem.h"
   
  @@ -122,8 +90,6 @@
   ap_inline void ap_sync_scoreboard_image(void)
   {
   }
  -
  -#endif /* MULTITHREAD */
   
   API_EXPORT(int) ap_exists_scoreboard_image(void)
   {
  
  
  

Mime
View raw message