X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Name.xs;h=6a4dc320a81a997e0efb20d7c134e89172527964;hb=bbd0130659727a45e7f214cb8086cddbaecd5dec;hp=a338c3cdf7be73ff50a315cddc81a6b78cc89ae1;hpb=d73d8321f16899e7adbd8faf9d9c6db8b84fca12;p=p5sagit%2FSub-Name.git

diff --git a/Name.xs b/Name.xs
index a338c3c..6a4dc32 100644
--- a/Name.xs
+++ b/Name.xs
@@ -8,9 +8,7 @@
 #include "perl.h"
 #include "XSUB.h"
 
-#ifdef USE_5005THREADS
-#error "Not compatible with 5.005 threads"
-#endif
+static MGVTBL subname_vtbl;
 
 MODULE = Sub::Name  PACKAGE = Sub::Name
 
@@ -58,6 +56,24 @@ subname(name, sub)
 	}
 	gv = (GV *) newSV(0);
 	gv_init(gv, stash, name, s - name, TRUE);
-	av_store((AV *) AvARRAY(CvPADLIST(cv))[0], 0, (SV *) gv);
+#ifndef USE_5005THREADS
+	if (CvPADLIST(cv)) {
+		/* cheap way to refcount the gv */
+		av_store((AV *) AvARRAY(CvPADLIST(cv))[0], 0, (SV *) gv);
+	}
+#endif
+	else {
+		/* expensive way to refcount the gv */
+		MAGIC *mg = SvMAGIC(cv);
+		while (mg && mg->mg_virtual != &subname_vtbl)
+			mg = mg->mg_moremagic;
+		if (!mg)
+			mg = sv_magicext((SV *) cv, NULL, PERL_MAGIC_ext,
+					&subname_vtbl, NULL, 0);
+		if (mg->mg_flags & MGf_REFCOUNTED)
+			SvREFCNT_dec(mg->mg_obj);
+		mg->mg_flags |= MGf_REFCOUNTED;
+		mg->mg_obj = (SV *) gv;
+	}
 	CvGV(cv) = gv;
 	PUSHs(sub);