More robust tests for threads

[gitmo/Mouse.git] / xs-src / MouseUtil.xs

diff --git a/xs-src/MouseUtil.xs b/xs-src/MouseUtil.xs
index c1d4d91..3e97648 100644 (file)
--- a/xs-src/MouseUtil.xs
+++ b/xs-src/MouseUtil.xs
@@ -1,5 +1,11 @@
 #include "mouse.h"
 
+#define MY_CXT_KEY "Mouse::Util::_guts" XS_VERSION
+typedef struct {
+    HV* metas;
+} my_cxt_t;
+START_MY_CXT
+
 #define ISA_CACHE "::LINEALIZED_ISA_CACHE::"
 
 #ifdef no_mro_get_linear_isa
@@ -156,9 +162,8 @@ mouse_is_class_loaded(pTHX_ SV * const klass){
 }
 
 
-SV *
-mouse_call0 (pTHX_ SV *const self, SV *const method)
-{
+SV*
+mouse_call0 (pTHX_ SV* const self, SV* const method) {
     dSP;
     SV *ret;
 
@@ -175,9 +180,8 @@ mouse_call0 (pTHX_ SV *const self, SV *const method)
     return ret;
 }
 
-SV *
-mouse_call1 (pTHX_ SV *const self, SV *const method, SV* const arg1)
-{
+SV*
+mouse_call1 (pTHX_ SV* const self, SV* const method, SV* const arg1) {
     dSP;
     SV *ret;
 
@@ -196,31 +200,30 @@ mouse_call1 (pTHX_ SV *const self, SV *const method, SV* const arg1)
     return ret;
 }
 
+int
+mouse_predicate_call(pTHX_ SV* const self, SV* const method) {
+    SV* const value = mcall0(self, method);
+    return SvTRUE(value);
+}
+
 SV*
 mouse_get_metaclass(pTHX_ SV* metaclass_name){
-    CV* const get_metaclass  = get_cvs("Mouse::Util::get_metaclass_by_name", TRUE);
-    SV* metaclass;
-    dSP;
+    dMY_CXT;
+    HE* he;
 
     assert(metaclass_name);
+    assert(MY_CXT.metas);
+
     if(IsObject(metaclass_name)){
-        HV* const stash = SvSTASH(metaclass_name);
+        HV* const stash = SvSTASH(SvRV(metaclass_name));
 
         metaclass_name = newSVpvn_share(HvNAME_get(stash), HvNAMELEN_get(stash), 0U);
         sv_2mortal(metaclass_name);
     }
 
-    PUSHMARK(SP);
-    XPUSHs(metaclass_name);
-    PUTBACK;
-
-    call_sv((SV*)get_metaclass, G_SCALAR);
+    he = hv_fetch_ent(MY_CXT.metas, metaclass_name, FALSE, 0U);
 
-    SPAGAIN;
-    metaclass = POPs;
-    PUTBACK;
-
-    return metaclass;
+    return he ? HeVAL(he) : &PL_sv_undef;
 }
 
 MAGIC*
@@ -260,6 +263,28 @@ MODULE = Mouse::Util  PACKAGE = Mouse::Util
 PROTOTYPES:   DISABLE
 VERSIONCHECK: DISABLE
 
+BOOT:
+{
+    MY_CXT_INIT;
+    MY_CXT.metas = NULL;
+}
+
+void
+__register_metaclass_storage(HV* metas, bool cloning)
+CODE:
+{
+    if(cloning){
+        MY_CXT_CLONE;
+        MY_CXT.metas = NULL;
+    }
+    {
+        dMY_CXT;
+        if(MY_CXT.metas) croak("Cannot set metaclass storage more than once");
+        MY_CXT.metas = metas;
+        SvREFCNT_inc_simple_void_NN(metas);
+    }
+}
+
 bool
 is_class_loaded(SV* sv)