Commit01d83ff

committed

Improve efficiency of recent changes to plperl's sv2cstr().

Along the way, add a missing dependency in the GNUmakefile.Alex Hunsaker, with a slight adjustment by me.

1 parentb2b4af5 commit01d83ffCopy full SHA for 01d83ff

File tree

+23

-9

lines changed

+23

-9

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ perlchunks.h: $(PERLCHUNKS)`
`72`	`72`
`73`	`73`	`all: all-lib`
`74`	`74`
`75`		`-SPI.c: SPI.xs`
	`75`	`+SPI.c: SPI.xs plperl_helpers.h`
`76`	`76`	`@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi`
`77`	`77`	`$(PERL)$(XSUBPPDIR)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@`
`78`	`78`
`79`		`-Util.c: Util.xs`
	`79`	`+Util.c: Util.xs plperl_helpers.h`
`80`	`80`	`@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi`
`81`	`81`	`$(PERL)$(XSUBPPDIR)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@`
`82`	`82`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,3 +58,7 @@ select uses_global();`
`58`	`58`	`uses_global worked`
`59`	`59`	`(1 row)`
`60`	`60`
	`61`	`+-- make sure we don't choke on readonly values`
	`62`	`+do language plperl $$ elog(NOTICE, ${^TAINT}); $$;`
	`63`	`+NOTICE: 0`
	`64`	`+CONTEXT: PL/Perl anonymous code block`

Lines changed: 14 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,28 +47,35 @@ sv2cstr(SV *sv)`
`47`	`47`	`{`
`48`	`48`	`charval,res;`
`49`	`49`	`STRLENlen;`
`50`		`-SV*nsv;`
`51`	`50`
`52`	`51`	`/*`
`53`	`52`	`* get a utf8 encoded char * out of perl. note it may not be valid utf8!`
`54`	`53`	`*`
`55`	`54`	`* SvPVutf8() croaks nastily on certain things, like typeglobs and`
`56`	`55`	`* readonly objects such as $^V. That's a perl bug - it's not supposed to`
`57`		`- * happen. To avoid crashing the backend, we make a copy of the`
`58`		`- *sv beforepassing it to SvPVutf8(). The copy is garbage collected`
	`56`	`+ * happen. To avoid crashing the backend, we make a copy of the sv before`
	`57`	`+ * passing it to SvPVutf8(). The copy is garbage collected`
`59`	`58`	`* when we're done with it.`
`60`	`59`	`*/`
`61`		`-nsv=newSVsv(sv);`
`62`		`-val=SvPVutf8(nsv,len);`
	`60`	`+if (SvREADONLY(sv)\|\|`
	`61`	`+isGV_with_GP(sv)\|\|`
	`62`	`+(SvTYPE(sv)>SVt_PVLV&&SvTYPE(sv)!=SVt_PVFM))`
	`63`	`+sv=newSVsv(sv);`
	`64`	`+else`
	`65`	`+/* increase the reference count so we cant just SvREFCNT_dec() it when`
	`66`	`+ * we are done */`
	`67`	`+SvREFCNT_inc(sv);`
	`68`	`+`
	`69`	`+val=SvPVutf8(sv,len);`
`63`	`70`
`64`	`71`	`/*`
`65`	`72`	`* we use perl's length in the event we had an embedded null byte to ensure`
`66`	`73`	`* we error out properly`
`67`	`74`	`*/`
`68`		`-res=utf_u2e(val,len);`
	`75`	`+res=utf_u2e(val,len);`
`69`	`76`
`70`	`77`	`/* safe now to garbage collect the new SV */`
`71`		`-SvREFCNT_dec(nsv);`
	`78`	`+SvREFCNT_dec(sv);`
`72`	`79`
`73`	`80`	`returnres;`
`74`	`81`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,3 +43,6 @@ create or replace function uses_global() returns text language plperl as $$`
`43`	`43`	`$$;`
`44`	`44`
`45`	`45`	`select uses_global();`
	`46`	`+`
	`47`	`+-- make sure we don't choke on readonly values`
	`48`	`+do language plperl $$ elog(NOTICE, ${^TAINT}); $$;`

Comments

(0)