perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: modperl/src/modules/perl Apache.xs
Date Thu, 31 Aug 2000 20:54:24 GMT
dougm       00/08/31 13:54:23

  Modified:    .        Changes
               src/modules/perl Apache.xs
  Log:
  avoid duplicate buffer copy in {read,get}_client_block by reading
  directly into Perl's SV buffer
  
  Revision  Changes    Path
  1.511     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.510
  retrieving revision 1.511
  diff -u -r1.510 -r1.511
  --- Changes	2000/08/31 05:54:10	1.510
  +++ Changes	2000/08/31 20:54:22	1.511
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +avoid duplicate buffer copy in {read,get}_client_block by reading
  +directly into Perl's SV buffer
  +
   modules/request test fix
   [Ken Williams <ken@forum.swarthmore.edu>]
   
  
  
  
  1.107     +23 -18    modperl/src/modules/perl/Apache.xs
  
  Index: Apache.xs
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/Apache.xs,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- Apache.xs	2000/08/31 05:49:06	1.106
  +++ Apache.xs	2000/08/31 20:54:23	1.107
  @@ -940,7 +940,7 @@
   void
   read_client_block(r, buffer, bufsiz)
       Apache	r
  -    char    *buffer
  +    SV    *buffer
       int      bufsiz
   
       PREINIT:
  @@ -948,29 +948,31 @@
       int rc;
   
       PPCODE:
  -    buffer = (char*)safemalloc(bufsiz);
       if ((rc = setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK) {
   	aplog_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, r->server, 
   		    "mod_perl: setup_client_block failed: %d", rc);
   	XSRETURN_UNDEF;
       }
   
  -    if(should_client_block(r)) {
  -	nrd = get_client_block(r, buffer, bufsiz);
  -	r->read_length = 0;
  +    if (should_client_block(r)) {
  +        SvUPGRADE(buffer, SVt_PV);
  +        SvGROW(buffer, bufsiz+1);
  +        nrd = get_client_block(r, SvPVX(buffer), bufsiz);
  +        r->read_length = 0;
       } 
   
       if (nrd > 0) {
  -	XPUSHs(sv_2mortal(newSViv((long)nrd)));
  -	sv_setpvn((SV*)ST(1), buffer, nrd);
  +        XPUSHs(sv_2mortal(newSViv((long)nrd)));
   #ifdef PERL_STASH_POST_DATA
  -        table_set(r->subprocess_env, "POST_DATA", buffer);
  +        table_set(r->subprocess_env, "POST_DATA", SvPVX(buffer));
   #endif
  -        safefree(buffer);
  -	SvTAINTED_on((SV*)ST(1));
  +        SvCUR_set(buffer, nrd);
  +        *SvEND(buffer) = '\0';
  +        SvPOK_on(buffer);
  +        SvTAINTED_on(buffer);
       } 
       else {
  -	ST(1) = &sv_undef;
  +        sv_setsv(buffer, &sv_undef);
       }
   
   int
  @@ -985,22 +987,25 @@
   void
   get_client_block(r, buffer, bufsiz)
       Apache	r
  -    char    *buffer
  +    SV    *buffer
       int      bufsiz
   
       PREINIT:
       long nrd = 0;
   
       PPCODE:
  -    buffer = (char*)palloc(r->pool, bufsiz);
  -    nrd = get_client_block(r, buffer, bufsiz);
  +    SvUPGRADE(buffer, SVt_PV);
  +    SvGROW(buffer, bufsiz+1);
  +    nrd = get_client_block(r, SvPVX(buffer), bufsiz);
       if ( nrd > 0 ) {
  -	XPUSHs(sv_2mortal(newSViv((long)nrd)));
  -	sv_setpvn((SV*)ST(1), buffer, nrd);
  -	SvTAINTED_on((SV*)ST(1));
  +        XPUSHs(sv_2mortal(newSViv((long)nrd)));
  +        SvCUR_set(buffer, nrd);
  +        *SvEND(buffer) = '\0';
  +        SvPOK_on(buffer);
  +        SvTAINTED_on(buffer);
       } 
       else {
  -	ST(1) = &sv_undef;
  +	sv_setsv(ST(1), &sv_undef);
       }
   
   int
  
  
  

Mime
View raw message