X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Magic.xs;h=cbd65dc742c18b6b67d24b009907b80aca014286;hb=b539f7ed264d210a08d390f94aab06f7d0aafb10;hp=82bf5dd022c5a614e9f15095f7f72a1c7cdd0453;hpb=ffcfa317935c3d62fc81a061d5d97505779c17f8;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/Magic.xs b/Magic.xs
index 82bf5dd..cbd65dc 100644
--- a/Magic.xs
+++ b/Magic.xs
@@ -12,8 +12,6 @@
 
 #define __PACKAGE__ "Variable::Magic"
 
-#define R(S) fprintf(stderr, "R(" #S ") = %d\n", SvREFCNT(S))
-
 #define PERL_VERSION_GE(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
 
 #define PERL_VERSION_LE(R, V, S) (PERL_REVISION < (R) || (PERL_REVISION == (R) && (PERL_VERSION < (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION <= (S))))))
@@ -30,6 +28,41 @@
 
 #define VMG_HAS_PERL_AND(P, R, V, S) (PERL_VERSION_GE((R), (V), (S)) && (!VMG_PERL_PATCHLEVEL || (VMG_PERL_PATCHLEVEL >= (P))))
 
+/* --- Threads and multiplicity -------------------------------------------- */
+
+#ifndef NOOP
+# define NOOP
+#endif
+
+#ifndef dNOOP
+# define dNOOP
+#endif
+
+#if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+# define VMG_MULTIPLICITY 1
+# ifndef tTHX
+#  define tTHX PerlInterpreter*
+# endif
+#else
+# define VMG_MULTIPLICITY 0
+#endif
+
+#if VMG_MULTIPLICITY && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && defined(MY_CXT_CLONE)
+# define VMG_THREADSAFE 1
+#else
+# define VMG_THREADSAFE 0
+# undef  dMY_CXT
+# define dMY_CXT      dNOOP
+# undef  MY_CXT
+# define MY_CXT vmg_globaldata
+# undef  START_MY_CXT
+# define START_MY_CXT STATIC my_cxt_t MY_CXT;
+# undef  MY_CXT_INIT
+# define MY_CXT_INIT  NOOP
+# undef  MY_CXT_CLONE
+# define MY_CXT_CLONE NOOP
+#endif
+
 /* --- Compatibility ------------------------------------------------------- */
 
 #ifndef Newx
@@ -44,13 +77,6 @@
 # define mPUSHi(I) PUSHs(sv_2mortal(newSViv(I)))
 #endif
 
-#ifndef dMY_CXT
-# define MY_CXT vmg_globaldata
-# define dMY_CXT
-# define START_MY_CXT STATIC my_cxt_t MY_CXT;
-# define MY_CXT_INIT
-#endif
-
 #ifndef PERL_MAGIC_ext
 # define PERL_MAGIC_ext '~'
 #endif
@@ -171,6 +197,9 @@ typedef struct {
 #if VMG_UVAR
  SV *cb_fetch, *cb_store, *cb_exists, *cb_delete;
 #endif /* VMG_UVAR */
+#if VMG_MULTIPLICITY
+ tTHX owner;
+#endif /* VMG_MULTIPLICITY */
 } MGWIZ;
 
 #define MGWIZ2SV(W) (newSVuv(PTR2UV(W)))
@@ -597,7 +626,15 @@ STATIC int vmg_wizard_free(pTHX_ SV *wiz, MAGIC *mg) {
  MGWIZ *w;
  dMY_CXT;
 
+ if (PL_dirty) /* during global destruction, the context is already freed */
+  return 0;
+
  w = SV2MGWIZ(wiz);
+#if VMG_MULTIPLICITY
+ if (w->owner != aTHX)
+  return 0;
+ w->owner = NULL;
+#endif /* VMG_MULTIPLICITY */
 
  if (hv_delete(MY_CXT.wizz, buf, sprintf(buf, "%u", w->sig), 0)) {
   --MY_CXT.count;
@@ -626,6 +663,7 @@ STATIC int vmg_wizard_free(pTHX_ SV *wiz, MAGIC *mg) {
  if (w->cb_exists != NULL) { SvREFCNT_dec(SvRV(w->cb_exists)); }
  if (w->cb_delete != NULL) { SvREFCNT_dec(SvRV(w->cb_delete)); }
 #endif /* VMG_UVAR */
+
  Safefree(w->vtbl);
  Safefree(w);
 
@@ -689,6 +727,61 @@ STATIC U16 vmg_sv2sig(pTHX_ SV *sv) {
   w->cb_  ## N = NULL;                \
  }
 
+#if VMG_MULTIPLICITY
+
+STATIC SV *vmg_clone(pTHX_ SV *sv, tTHX owner) {
+#define vmg_clone(P, O) vmg_clone(aTHX_ (P), (O))
+ CLONE_PARAMS param;
+ param.stashes    = NULL; /* don't need it unless sv is a PVHV */
+ param.flags      = 0;
+ param.proto_perl = owner;
+ return sv_dup(sv, &param);
+}
+
+#define VMG_CLONE_CB(N) \
+ z->cb_ ## N = (w->cb_ ## N) ? newRV_noinc(vmg_clone(SvRV(w->cb_ ## N), \
+                                           w->owner))                   \
+                             : NULL;
+
+STATIC MGWIZ *vmg_wizard_clone(pTHX_ const MGWIZ *w) {
+#define vmg_wizard_clone(W) vmg_wizard_clone(aTHX_ (W))
+ MGVTBL *t;
+ MGWIZ *z;
+
+ Newx(t, 1, MGVTBL);
+ Copy(w->vtbl, t, 1, MGVTBL);
+
+ Newx(z, 1, MGWIZ);
+ VMG_CLONE_CB(data);
+ VMG_CLONE_CB(get);
+ VMG_CLONE_CB(set);
+ VMG_CLONE_CB(len);
+ VMG_CLONE_CB(clear);
+ VMG_CLONE_CB(free);
+#if MGf_COPY
+ VMG_CLONE_CB(copy);
+#endif /* MGf_COPY */
+#if MGf_DUP
+ VMG_CLONE_CB(dup);
+#endif /* MGf_DUP */
+#if MGf_LOCAL
+ VMG_CLONE_CB(local);
+#endif /* MGf_LOCAL */
+#if VMG_UVAR
+ VMG_CLONE_CB(fetch);
+ VMG_CLONE_CB(store);
+ VMG_CLONE_CB(exists);
+ VMG_CLONE_CB(delete);
+#endif /* VMG_UVAR */
+ z->owner = aTHX;
+ z->vtbl  = t;
+ z->sig   = w->sig;
+ z->uvar  = w->uvar;
+
+ return z;
+}
+
+#endif /* VMG_MULTIPLICITY */
 
 /* --- XS ------------------------------------------------------------------ */
 
@@ -717,8 +810,43 @@ BOOT:
  newCONSTSUB(stash, "VMG_COMPAT_SCALAR_LENGTH_NOLEN",
                     newSVuv(VMG_COMPAT_SCALAR_LENGTH_NOLEN));
  newCONSTSUB(stash, "VMG_PERL_PATCHLEVEL", newSVuv(VMG_PERL_PATCHLEVEL));
+ newCONSTSUB(stash, "VMG_THREADSAFE",      newSVuv(VMG_THREADSAFE));
 }
 
+void
+CLONE(...)
+PROTOTYPE: DISABLE
+PREINIT:
+ HV *hv;
+ U16 count;
+CODE:
+#if VMG_THREADSAFE
+ {
+  HE *key;
+  dMY_CXT;
+  count = MY_CXT.count;
+  hv = newHV();
+  hv_iterinit(MY_CXT.wizz);
+  while (key = hv_iternext(MY_CXT.wizz)) {
+   STRLEN len;
+   char *sig = HePV(key, len);
+   SV *sv;
+   MAGIC *mg;
+   MGWIZ *w;
+   sv = MGWIZ2SV(vmg_wizard_clone(SV2MGWIZ(HeVAL(key))));
+   mg = sv_magicext(sv, NULL, PERL_MAGIC_ext, &vmg_wizard_vtbl, NULL, 0);
+   mg->mg_private = SIG_WIZ;
+   SvREADONLY_on(sv);
+   hv_store(hv, sig, len, sv, HeHASH(key));
+  }
+ }
+ {
+  MY_CXT_CLONE;
+  MY_CXT.wizz  = hv;
+  MY_CXT.count = count;
+ }
+#endif /* VMG_THREADSAFE */
+
 SV *_wizard(...)
 PROTOTYPE: DISABLE
 PREINIT:
@@ -789,6 +917,9 @@ CODE:
  VMG_SET_CB(ST(i++), exists);
  VMG_SET_CB(ST(i++), delete);
 #endif /* VMG_UVAR */
+#if VMG_MULTIPLICITY
+ w->owner = aTHX;
+#endif /* VMG_MULTIPLICITY */
 
  w->vtbl = t;
  w->sig  = sig;
@@ -797,12 +928,13 @@ CODE:
 #endif /* VMG_UVAR */
 
  sv = MGWIZ2SV(w);
- mg = sv_magicext(sv, NULL, PERL_MAGIC_ext, &vmg_wizard_vtbl, NULL, -1);
+ mg = sv_magicext(sv, NULL, PERL_MAGIC_ext, &vmg_wizard_vtbl, NULL, 0);
  mg->mg_private = SIG_WIZ;
+ SvREADONLY_on(sv);
 
  hv_store(MY_CXT.wizz, buf, sprintf(buf, "%u", sig), sv, 0);
  ++MY_CXT.count;
- 
+
  RETVAL = newRV_noinc(sv);
 OUTPUT:
  RETVAL