cvs commit: modperl-2.0/src/modules/perl mod_perl.c modperl_perl_global.c modperl_perl_global.h

[dougm]

dougm       01/10/07 12:04:20

  Modified:    src/modules/perl mod_perl.c modperl_perl_global.c
                        modperl_perl_global.h
  Log:
  add modperl_perl_global_request_{restore,save} functions for future use of 
request_rec to manage globals
  
  Revision  Changes    Path
  1.87      +2 -2      modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- mod_perl.c        2001/10/06 19:43:40     1.86
  +++ mod_perl.c        2001/10/07 19:04:20     1.87
  @@ -529,7 +529,7 @@
           rcfg->wbucket.header_parse = 1;
       }
   
  -    modperl_perl_global_save(aTHX_ &rcfg->perl_globals);
  +    modperl_perl_global_request_save(aTHX_ r);
   
       h_stdout = modperl_io_tie_stdout(aTHX_ r);
       h_stdin  = modperl_io_tie_stdin(aTHX_ r);
  @@ -550,7 +550,7 @@
       modperl_env_request_untie(aTHX_ r);
   #endif
   
  -    modperl_perl_global_restore(aTHX_ &rcfg->perl_globals);
  +    modperl_perl_global_request_restore(aTHX_ r);
   
   #ifdef USE_ITHREADS
       if (MpInterpPUTBACK(interp)) {
  
  
  
  1.5       +14 -2     modperl-2.0/src/modules/perl/modperl_perl_global.c
  
  Index: modperl_perl_global.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_global.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- modperl_perl_global.c     2001/10/06 23:27:47     1.4
  +++ modperl_perl_global.c     2001/10/07 19:04:20     1.5
  @@ -128,7 +128,7 @@
       apr_uint64_t **ptr = (apr_uint64_t **) \
           ((char *)globals + (int)(long)modperl_perl_global_entries[i].offset)
   
  -void modperl_perl_global_save(pTHX_ modperl_perl_globals_t *globals)
  +static void modperl_perl_global_save(pTHX_ modperl_perl_globals_t *globals)
   {
       int i;
   
  @@ -154,7 +154,7 @@
       }
   }
   
  -void modperl_perl_global_restore(pTHX_ modperl_perl_globals_t *globals)
  +static void modperl_perl_global_restore(pTHX_ modperl_perl_globals_t *globals)
   {
       int i;
   
  @@ -176,4 +176,16 @@
               break;
           }
       }
  +}
  +
  +void modperl_perl_global_request_save(pTHX_ request_rec *r)
  +{
  +    MP_dRCFG;
  +    modperl_perl_global_save(aTHX_ &rcfg->perl_globals);
  +}
  +
  +void modperl_perl_global_request_restore(pTHX_ request_rec *r)
  +{
  +    MP_dRCFG;
  +    modperl_perl_global_restore(aTHX_ &rcfg->perl_globals);
   }
  
  
  
  1.4       +2 -2      modperl-2.0/src/modules/perl/modperl_perl_global.h
  
  Index: modperl_perl_global.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_global.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- modperl_perl_global.h     2001/09/28 19:53:22     1.3
  +++ modperl_perl_global.h     2001/10/07 19:04:20     1.4
  @@ -31,8 +31,8 @@
       modperl_perl_global_svpv_t rs;
   } modperl_perl_globals_t;
   
  -void modperl_perl_global_save(pTHX_ modperl_perl_globals_t *globals);
  +void modperl_perl_global_request_save(pTHX_ request_rec *r);
   
  -void modperl_perl_global_restore(pTHX_ modperl_perl_globals_t *globals);
  +void modperl_perl_global_request_restore(pTHX_ request_rec *r);
   
   #endif