cvs commit: modperl-2.0/src/modules/perl modperl_callback.c modperl_filter.c modperl_interp.c

[dougm]

dougm       01/03/13 15:55:21

  Modified:    src/modules/perl modperl_callback.c modperl_filter.c
                        modperl_interp.c
  Log:
  modperl_interp_select() will PERL_SET_CONTEXT for the given thread, so the caller 
does not need to
  
  Revision  Changes    Path
  1.22      +1 -1      modperl-2.0/src/modules/perl/modperl_callback.c
  
  Index: modperl_callback.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- modperl_callback.c        2001/03/09 23:46:35     1.21
  +++ modperl_callback.c        2001/03/13 23:55:18     1.22
  @@ -191,8 +191,8 @@
       else {
           /* Child{Init,Exit}, OpenLogs */
           aTHX = scfg->mip->parent->perl;
  +        PERL_SET_CONTEXT(aTHX);
       }
  -    PERL_SET_CONTEXT(aTHX);
   #endif
   
       MP_TRACE_h(MP_FUNC, "running %d %s handlers\n",
  
  
  
  1.6       +0 -1      modperl-2.0/src/modules/perl/modperl_filter.c
  
  Index: modperl_filter.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- modperl_filter.c  2001/03/09 23:46:35     1.5
  +++ modperl_filter.c  2001/03/13 23:55:19     1.6
  @@ -96,7 +96,6 @@
       modperl_interp_t *interp = NULL;
       interp = modperl_interp_select(r, c, s);
       aTHX = interp->perl;
  -    PERL_SET_CONTEXT(aTHX);
   #endif
   
       args = newAV();
  
  
  
  1.19      +3 -0      modperl-2.0/src/modules/perl/modperl_interp.c
  
  Index: modperl_interp.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- modperl_interp.c  2001/03/09 23:46:35     1.18
  +++ modperl_interp.c  2001/03/13 23:55:20     1.19
  @@ -261,6 +261,9 @@
                                   modperl_interp_unselect,
                                   p);
   
  +    /* set context (THX) for this thread */
  +    PERL_SET_CONTEXT(interp->perl);
  +
       MP_TRACE_i(MP_FUNC, "set interp 0x%lx in %s 0x%lx\n",
                  (unsigned long)interp, desc, (unsigned long)p);