httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: httpd-2.0/server/mpm/mpmt_os2 mpmt_os2_child.c mpmt_os2.c
Date Thu, 10 Jan 2002 15:09:19 GMT
bjh         02/01/10 07:09:19

  Modified:    server/mpm/mpmt_os2 mpmt_os2_child.c mpmt_os2.c
  Log:
  Get OS/2 MPM working again after last scoreboard changes.
  
  Revision  Changes    Path
  1.12      +5 -1      httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c
  
  Index: mpmt_os2_child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2_child.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mpmt_os2_child.c	10 Jan 2002 00:27:59 -0000	1.11
  +++ mpmt_os2_child.c	10 Jan 2002 15:09:18 -0000	1.12
  @@ -144,6 +144,7 @@
       apr_pollfd_t *pollset;
       int num_listeners;
       TID server_maint_tid;
  +    void *sb_mem;
   
       /* Stop Ctrl-C/Ctrl-Break signals going to child processes */
       DosSetSignalExceptionFocus(0, &ulTimes);
  @@ -164,7 +165,7 @@
       }
   
       /* Gain access to the scoreboard. */
  -    rc = DosGetNamedSharedMem((PPVOID)&ap_scoreboard_image, ap_scoreboard_fname,
  +    rc = DosGetNamedSharedMem(&sb_mem, ap_scoreboard_fname,
                                 PAG_READ|PAG_WRITE);
   
       if (rc) {
  @@ -172,6 +173,9 @@
                        "scoreboard not readable in child, exiting");
           clean_child_exit(APEXIT_CHILDFATAL);
       }
  +
  +    ap_calc_scoreboard_size();
  +    ap_init_scoreboard(sb_mem);
   
       /* Gain access to the accpet mutex */
       rc = DosOpenMutexSem(NULL, &ap_mpm_accept_mutex);
  
  
  
  1.13      +1 -1      httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c
  
  Index: mpmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mpmt_os2.c	10 Jan 2002 00:27:59 -0000	1.12
  +++ mpmt_os2.c	10 Jan 2002 15:09:18 -0000	1.13
  @@ -298,7 +298,7 @@
       /* Allocate shared memory for scoreboard */
       if (ap_scoreboard_image == NULL) {
           void *sb_mem;
  -        rc = DosAllocSharedMem((PPVOID)&sbmem, ap_scoreboard_fname,
  +        rc = DosAllocSharedMem(&sb_mem, ap_scoreboard_fname,
                                  ap_calc_scoreboard_size(),
                                  PAG_COMMIT|PAG_READ|PAG_WRITE);
   
  
  
  

Mime
View raw message