Use a pointer table allocated on shared memory

[perl/modules/Lexical-Types.git] / Types.xs

diff --git a/Types.xs b/Types.xs
index 8895acb0b371904adb1598074aa80724210154e2..a6df2b9f8f2e08e40cd09ef04e5e508033c9efb0 100644 (file)
--- a/Types.xs
+++ b/Types.xs
@@ -61,10 +61,11 @@ 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_VAL_FREE(V) PerlMemShared_free(V)
 
-STATIC HV *lt_op_map = NULL;
+#include "ptable.h"
+
+STATIC ptable *lt_op_map = NULL;
 
 typedef struct {
  SV *orig_pkg;
@@ -73,30 +74,26 @@ 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;
- lt_op_info *oi;
+STATIC void lt_map_store(const OP *o, SV *orig_pkg, SV *type_pkg, SV *type_meth, OP *(*pp_padsv)(pTHX)) {
+ lt_op_info *oi = ptable_fetch(lt_op_map, o);
+
+ if (!oi) {
+  oi = PerlMemShared_malloc(sizeof *oi);
+  ptable_store(lt_op_map, o, oi);
+ }
 
- Newx(oi, 1, lt_op_info);
  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);
 }
 
-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) {
+ const lt_op_info *oi;
 
- svp = hv_fetch(lt_op_map, buf, OP2STR(o), 0);
+ oi = ptable_fetch(lt_op_map, o);
 
- return svp ? INT2PTR(const lt_op_info *, SvUVX(*svp)) : NULL;
+ return oi;
 }
 
 /* --- Hooks --------------------------------------------------------------- */
@@ -281,11 +278,12 @@ PROTOTYPES: DISABLE
 BOOT: 
 {                                    
  if (!lt_initialized++) {
+  lt_op_map = ptable_new();
+
   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);