/* Copyright (C) 2004, 2008 Matthijs van Duin. All rights reserved.
+ * Copyright (C) 2014, cPanel Inc. All rights reserved.
* This program is free software; you can redistribute it and/or modify
* it under the same terms as Perl itself.
*/
#define SvMAGIC_set(sv, val) (SvMAGIC(sv) = (val))
#endif
+#ifndef Newxz
+#define Newxz(ptr, num, type) Newz(0, ptr, num, type)
+#endif
MODULE = Sub::Name PACKAGE = Sub::Name
CV *cv = NULL;
GV *gv;
HV *stash = CopSTASH(PL_curcop);
- char *s, *end = NULL, saved;
+ char *s, *end = NULL;
+ MAGIC *mg;
PPCODE:
if (!SvROK(sub) && SvGMAGICAL(sub))
mg_get(sub);
end = s;
}
s--;
- if (end) {
- saved = *end;
- *end = 0;
- stash = GvHV(gv_fetchpv(name, TRUE, SVt_PVHV));
- *end = saved;
- name = end;
+ if (end) {
+ char *namepv = savepvn(name, end - name);
+ stash = GvHV(gv_fetchpv(namepv, TRUE, SVt_PVHV));
+ Safefree(namepv);
+ name = end;
+ }
+
+ /* under debugger, provide information about sub location */
+ if (PL_DBsub && CvGV(cv)) {
+ HV *hv = GvHV(PL_DBsub);
+
+ char* new_pkg = HvNAME(stash);
+
+ char* old_name = GvNAME( CvGV(cv) );
+ char* old_pkg = HvNAME( GvSTASH(CvGV(cv)) );
+
+ int old_len = strlen(old_name) + strlen(old_pkg);
+ int new_len = strlen(name) + strlen(new_pkg);
+
+ char* full_name;
+ Newxz(full_name, (old_len > new_len ? old_len : new_len) + 3, char);
+
+ strcat(full_name, old_pkg);
+ strcat(full_name, "::");
+ strcat(full_name, old_name);
+
+ SV** old_data = hv_fetch(hv, full_name, strlen(full_name), 0);
+
+ if (old_data) {
+ strcpy(full_name, new_pkg);
+ strcat(full_name, "::");
+ strcat(full_name, name);
+
+ SvREFCNT_inc(*old_data);
+ if (!hv_store(hv, full_name, strlen(full_name), *old_data, 0))
+ SvREFCNT_dec(*old_data);
+ }
+ Safefree(full_name);
}
+
gv = (GV *) newSV(0);
gv_init(gv, stash, name, s - name, TRUE);
-#ifndef USE_5005THREADS
- if (CvPADLIST(cv)) {
- /* cheap way to refcount the gv */
- av_store((AV *) AvARRAY(CvPADLIST(cv))[0], 0, (SV *) gv);
- } else
-#endif
- {
- /* expensive way to refcount the gv */
- MAGIC *mg = SvMAGIC(cv);
- while (mg && mg->mg_virtual != &subname_vtbl)
- mg = mg->mg_moremagic;
- if (!mg) {
- Newz(702, mg, 1, MAGIC);
- mg->mg_moremagic = SvMAGIC(cv);
- mg->mg_type = PERL_MAGIC_ext;
- mg->mg_virtual = &subname_vtbl;
- SvMAGIC_set(cv, mg);
- }
- if (mg->mg_flags & MGf_REFCOUNTED)
- SvREFCNT_dec(mg->mg_obj);
- mg->mg_flags |= MGf_REFCOUNTED;
- mg->mg_obj = (SV *) gv;
+
+ mg = SvMAGIC(cv);
+ while (mg && mg->mg_virtual != &subname_vtbl)
+ mg = mg->mg_moremagic;
+ if (!mg) {
+ Newxz(mg, 1, MAGIC);
+ mg->mg_moremagic = SvMAGIC(cv);
+ mg->mg_type = PERL_MAGIC_ext;
+ mg->mg_virtual = &subname_vtbl;
+ SvMAGIC_set(cv, mg);
}
+ if (mg->mg_flags & MGf_REFCOUNTED)
+ SvREFCNT_dec(mg->mg_obj);
+ mg->mg_flags |= MGf_REFCOUNTED;
+ mg->mg_obj = (SV *) gv;
+ SvRMAGICAL_on(cv);
+ CvANON_off(cv);
#ifndef CvGV_set
CvGV(cv) = gv;
#else