X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Types.xs;h=338201462e072b96920c9450c3c68305c44ad392;hb=802bedc36b8f65e33ea579641fe0dc70b4e59e9d;hp=6fa09b1c70255040abd23a15434a5789d7df564a;hpb=287939132763c340fcbdf4cf0982684de2250ca4;p=perl%2Fmodules%2FLexical-Types.git

diff --git a/Types.xs b/Types.xs
index 6fa09b1..3382014 100644
--- a/Types.xs
+++ b/Types.xs
@@ -23,10 +23,6 @@
 # endif
 #endif
 
-#ifndef Newx
-# define Newx(v, n, c) New(0, v, n, c)
-#endif
-
 #ifndef HvNAME_get
 # define HvNAME_get(H) HvNAME(H)
 #endif
@@ -35,9 +31,152 @@
 # define HvNAMELEN_get(H) strlen(HvNAME_get(H))
 #endif
 
+#ifndef SvIS_FREED
+# define SvIS_FREED(sv) ((sv)->sv_flags == SVTYPEMASK)
+#endif
+
+/* ... Thread safety and multiplicity ...................................... */
+
+#ifndef LT_MULTIPLICITY
+# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT)
+#  define LT_MULTIPLICITY 1
+# else
+#  define LT_MULTIPLICITY 0
+# endif
+#endif
+#if LT_MULTIPLICITY && !defined(tTHX)
+# define tTHX PerlInterpreter*
+#endif
+
+#if LT_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV))
+# define LT_THREADSAFE 1
+# ifndef MY_CXT_CLONE
+#  define MY_CXT_CLONE \
+    dMY_CXT_SV;                                                      \
+    my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1)); \
+    Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t); \
+    sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
+# endif
+#else
+# define LT_THREADSAFE 0
+#endif
+
 /* --- Helpers ------------------------------------------------------------- */
 
-/* ... Hints ............................................................... */
+/* ... Thread-safe hints ................................................... */
+
+#if LT_THREADSAFE
+
+#define PTABLE_NAME        ptable_hints
+#define PTABLE_VAL_FREE(V) if ((V) && !SvIS_FREED((SV *) (V))) SvREFCNT_dec(V)
+
+#define pPTBL  pTHX
+#define pPTBL_ pTHX_
+#define aPTBL  aTHX
+#define aPTBL_ aTHX_
+
+#include "ptable.h"
+
+#define ptable_hints_store(T, K, V) ptable_hints_store(aTHX_ (T), (K), (V))
+#define ptable_hints_free(T)        ptable_hints_free(aTHX_ (T))
+
+#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION
+
+typedef struct {
+ ptable *tbl;
+ tTHX    owner;
+} my_cxt_t;
+
+START_MY_CXT
+
+STATIC void lt_ptable_hints_clone(pTHX_ ptable_ent *ent, void *ud_) {
+ my_cxt_t *ud  = ud_;
+ SV       *val = ent->val;
+
+ if (ud->owner != aTHX) {
+  CLONE_PARAMS param;
+  AV *stashes = (SvTYPE(val) == SVt_PVHV && HvNAME_get(val)) ? newAV() : NULL;
+  param.stashes    = stashes;
+  param.flags      = 0;
+  param.proto_perl = ud->owner;
+  val = sv_dup(val, &param);
+  if (stashes) {
+   av_undef(stashes);
+   SvREFCNT_dec(stashes);
+  }
+ }
+
+ ptable_hints_store(ud->tbl, ent->key, val);
+ SvREFCNT_inc(val);
+}
+
+STATIC void lt_thread_cleanup(pTHX_ void *);
+
+STATIC void lt_thread_cleanup(pTHX_ void *ud) {
+ int *level = ud;
+ SV  *id;
+
+ if (*level) {
+  *level = 0;
+  LEAVE;
+  SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
+  ENTER;
+ } else {
+  dMY_CXT;
+  PerlMemShared_free(level);
+  ptable_hints_free(MY_CXT.tbl);
+ }
+}
+
+STATIC SV *lt_tag(pTHX_ SV *value) {
+#define lt_tag(V) lt_tag(aTHX_ (V))
+ dMY_CXT;
+
+ value = SvOK(value) && SvROK(value) ? SvRV(value) : NULL;
+ /* We only need for the key to be an unique tag for looking up the value later.
+  * Allocated memory provides convenient unique identifiers, so that's why we
+  * use the value pointer as the key itself. */
+ ptable_hints_store(MY_CXT.tbl, value, value);
+ SvREFCNT_inc(value);
+
+ return newSVuv(PTR2UV(value));
+}
+
+STATIC SV *lt_detag(pTHX_ const SV *hint) {
+#define lt_detag(H) lt_detag(aTHX_ (H))
+ void *tag;
+ SV   *value;
+
+ if (!hint || !SvOK(hint) || !SvIOK(hint))
+  croak("Wrong hint");
+
+ tag = INT2PTR(void *, SvIVX(hint));
+ {
+  dMY_CXT;
+  value = ptable_fetch(MY_CXT.tbl, tag);
+ }
+
+ return value;
+}
+
+#else
+
+STATIC SV *lt_tag(pTHX_ SV *value) {
+#define lt_tag(V) lt_tag(aTHX_ (V))
+ UV tag = 0;
+
+ if (SvOK(value) && SvROK(value)) {
+  value = SvRV(value);
+  SvREFCNT_inc(value);
+  tag = PTR2UV(value);
+ }
+
+ return newSVuv(tag);
+}
+
+#define lt_detag(H) INT2PTR(SV *, SvUVX(H))
+
+#endif /* LT_THREADSAFE */
 
 STATIC U32 lt_hash = 0;
 
@@ -61,10 +200,19 @@ STATIC SV *lt_hint(pTHX) {
 
 /* ... op => info map ...................................................... */
 
-#define OP2STR_BUF char buf[(CHAR_BIT * sizeof(UV)) / 2]
-#define OP2STR(O)  (sprintf(buf, "%"UVxf, PTR2UV(O)))
+#define PTABLE_NAME        ptable_map
+#define PTABLE_VAL_FREE(V) PerlMemShared_free(V)
 
-STATIC HV *lt_op_map = NULL;
+#include "ptable.h"
+
+/* PerlMemShared_free() needs the [ap]PTBLMS_? default values */
+#define ptable_map_store(T, K, V) ptable_map_store(aPTBLMS_ (T), (K), (V))
+
+STATIC ptable *lt_op_map = NULL;
+
+#ifdef USE_ITHREADS
+STATIC perl_mutex lt_op_map_mutex;
+#endif
 
 typedef struct {
  SV *orig_pkg;
@@ -73,30 +221,47 @@ typedef struct {
  OP *(*pp_padsv)(pTHX);
 } lt_op_info;
 
-STATIC void lt_map_store(pTHX_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
-#define lt_map_store(O, P1, P2, M, PP) lt_map_store(aTHX_ (O), (P1), (P2), (M), (PP))
- OP2STR_BUF;
- SV *val;
+STATIC void lt_map_store(pPTBLMS_ const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
+#define lt_map_store(O, OP, TP, TM, PP) lt_map_store(aPTBLMS_ (O), (OP), (TP), (TM), (PP))
  lt_op_info *oi;
 
- Newx(oi, 1, lt_op_info);
+#ifdef USE_ITHREADS
+ MUTEX_LOCK(&lt_op_map_mutex);
+#endif
+
+ if (!(oi = ptable_fetch(lt_op_map, o))) {
+  oi = PerlMemShared_malloc(sizeof *oi);
+  ptable_map_store(lt_op_map, o, oi);
+ }
+
  oi->orig_pkg  = orig_pkg;
  oi->type_pkg  = type_pkg;
  oi->type_meth = type_meth;
  oi->pp_padsv  = pp_padsv;
- val = newSVuv(PTR2UV(oi));
 
- (void)hv_store(lt_op_map, buf, OP2STR(o), val, 0);
+#ifdef USE_ITHREADS
+ MUTEX_UNLOCK(&lt_op_map_mutex);
+#endif
 }
 
-STATIC const lt_op_info *lt_map_fetch(pTHX_ const OP *o) {
-#define lt_map_fetch(O) lt_map_fetch(aTHX_ (O))
- OP2STR_BUF;
- SV **svp;
+STATIC const lt_op_info *lt_map_fetch(const OP *o, lt_op_info *oi) {
+ const lt_op_info *val;
+
+#ifdef USE_ITHREADS
+ MUTEX_LOCK(&lt_op_map_mutex);
+#endif
 
- svp = hv_fetch(lt_op_map, buf, OP2STR(o), 0);
+ val = ptable_fetch(lt_op_map, o);
+ if (val) {
+  *oi = *val;
+  val = oi;
+ }
 
- return svp ? INT2PTR(const lt_op_info *, SvUVX(*svp)) : NULL;
+#ifdef USE_ITHREADS
+ MUTEX_UNLOCK(&lt_op_map_mutex);
+#endif
+
+ return val;
 }
 
 /* --- Hooks --------------------------------------------------------------- */
@@ -104,9 +269,9 @@ STATIC const lt_op_info *lt_map_fetch(pTHX_ const OP *o) {
 /* ... Our pp_padsv ........................................................ */
 
 STATIC OP *lt_pp_padsv(pTHX) {
- const lt_op_info *oi;
+ lt_op_info oi;
 
- if ((PL_op->op_private & OPpLVAL_INTRO) && (oi = lt_map_fetch(PL_op))) {
+ if ((PL_op->op_private & OPpLVAL_INTRO) && lt_map_fetch(PL_op, &oi)) {
   PADOFFSET targ = PL_op->op_targ;
   SV *sv         = PAD_SVl(targ);
 
@@ -119,12 +284,12 @@ STATIC OP *lt_pp_padsv(pTHX) {
 
    PUSHMARK(SP);
    EXTEND(SP, 3);
-   PUSHs(oi->type_pkg);
+   PUSHs(oi.type_pkg);
    PUSHs(sv);
-   PUSHs(oi->orig_pkg);
+   PUSHs(oi.orig_pkg);
    PUTBACK;
 
-   items = call_sv(oi->type_meth, G_ARRAY | G_METHOD);
+   items = call_sv(oi.type_meth, G_ARRAY | G_METHOD);
 
    SPAGAIN;
    switch (items) {
@@ -142,7 +307,7 @@ STATIC OP *lt_pp_padsv(pTHX) {
    LEAVE;
   }
 
-  return CALL_FPTR(oi->pp_padsv)(aTHX);
+  return CALL_FPTR(oi.pp_padsv)(aTHX);
  }
 
  return CALL_FPTR(PL_ppaddr[OP_PADSV])(aTHX);
@@ -195,9 +360,9 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
  if (stash && (hint = lt_hint())) {
   SV *orig_pkg  = newSVpvn(HvNAME_get(stash), HvNAMELEN_get(stash));
   SV *orig_meth = lt_default_meth;
-  SV *type_pkg  = orig_pkg;
-  SV *type_meth = orig_meth;
-  SV *code      = INT2PTR(SV *, SvUVX(hint));
+  SV *type_pkg  = NULL;
+  SV *type_meth = NULL;
+  SV *code      = lt_detag(hint);
 
   SvREADONLY_on(orig_pkg);
 
@@ -243,8 +408,15 @@ STATIC OP *lt_ck_padany(pTHX_ OP *o) {
    LEAVE;
   }
 
-  if (type_meth == orig_meth)
+  if (!type_pkg) {
+   type_pkg = orig_pkg;
+   SvREFCNT_inc(orig_pkg);
+  }
+
+  if (!type_meth) {
+   type_meth = orig_meth;
    SvREFCNT_inc(orig_meth);
+  }
 
   lt_pp_padsv_save();
 
@@ -269,35 +441,73 @@ STATIC U32 lt_initialized = 0;
 
 MODULE = Lexical::Types      PACKAGE = Lexical::Types
 
-PROTOTYPES: DISABLE
+PROTOTYPES: ENABLE
 
 BOOT: 
 {                                    
  if (!lt_initialized++) {
+  HV *stash;
+#if LT_THREADSAFE
+  MY_CXT_INIT;
+  MY_CXT.tbl   = ptable_new();
+  MY_CXT.owner = aTHX;
+#endif
+
+  lt_op_map = ptable_new();
+#ifdef USE_ITHREADS
+  MUTEX_INIT(&lt_op_map_mutex);
+#endif
+
   lt_default_meth = newSVpvn("TYPEDSCALAR", 11);
   SvREADONLY_on(lt_default_meth);
 
   PERL_HASH(lt_hash, __PACKAGE__, __PACKAGE_LEN__);
-  lt_op_map = newHV();
 
   lt_old_ck_padany    = PL_check[OP_PADANY];
   PL_check[OP_PADANY] = MEMBER_TO_FPTR(lt_ck_padany);
   lt_old_ck_padsv     = PL_check[OP_PADSV];
   PL_check[OP_PADSV]  = MEMBER_TO_FPTR(lt_ck_padsv);
+
+  stash = gv_stashpvn(__PACKAGE__, __PACKAGE_LEN__, 1);
+  newCONSTSUB(stash, "LT_THREADSAFE", newSVuv(LT_THREADSAFE));
  }
 }
 
-SV *_tag(SV *ref)
+#if LT_THREADSAFE
+
+void
+CLONE(...)
+PROTOTYPE: DISABLE
 PREINIT:
- SV *ret;
+ ptable *t;
+ int    *level;
 CODE:
- if (SvOK(ref) && SvROK(ref)) {
-  SV *sv = SvRV(ref);
-  SvREFCNT_inc(sv);
-  ret = newSVuv(PTR2UV(sv));
- } else {
-  ret = newSVuv(0);
+ {
+  my_cxt_t ud;
+  dMY_CXT;
+  ud.tbl   = t = ptable_new();
+  ud.owner = MY_CXT.owner;
+  ptable_walk(MY_CXT.tbl, lt_ptable_hints_clone, &ud);
+ }
+ {
+  MY_CXT_CLONE;
+  MY_CXT.tbl   = t;
+  MY_CXT.owner = aTHX;
  }
- RETVAL = ret;
+ {
+  level = PerlMemShared_malloc(sizeof *level);
+  *level = 1;
+  LEAVE;
+  SAVEDESTRUCTOR_X(lt_thread_cleanup, level);
+  ENTER;
+ }
+
+#endif
+
+SV *
+_tag(SV *value)
+PROTOTYPE: $
+CODE:
+ RETVAL = lt_tag(value);
 OUTPUT:
  RETVAL