yeptris 0.1.13.2 → 0.1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288c8f3951e7cd252310e271ed666996442d66d90f04fbdefc8fde57fc122826
-  data.tar.gz: d52fb5127d673914f553b47449dbf2b57b2d1b581c5e0636c40c5faf99141222
+  metadata.gz: dfe67fff242e1aeaa61b4faed0633a90f4b2de0c70b630e733ae557a467cae2e
+  data.tar.gz: e8755921e9b5b8fe78c5db36a24727fee8d61e4742d56aa70ca939e13091034c
 SHA512:
-  metadata.gz: fc3a2f57041c9f28ec5133a98cf8573cfd820f9451d321ae6d333e507b1f2b9d7ce51814a0380eadee799904e056d013eea70142ebb6031d9c7480762f91634c
-  data.tar.gz: a6f0f5990a19597c1ac060e0dbb5abe2c921cdbdc2e49ec1fe70d04bfa91609c36c7b114e0d4e294e1175613a710fab722b1e524f6a1e5cd73f0340fbc2ead31
+  metadata.gz: 1f0443a1150f595e94eb6cf59afca9fd182a2ea269f2ca3a784260efb5d3cb1174325f48d056b06edaf50f2b30d4f90f641c90beebe456d0a862918b9edbdfe0
+  data.tar.gz: 0daf1afec8df455dd2bf72353b694f54003f6c3cbfbf1aa4dbf571c84083029362e0abeee5318f3fc22713199b9221650ac8bab1ca1705e39a0bab3a8f7d8467

data/ext/yeptris_native/extconf.rb

@@ -35,7 +35,11 @@ end
 abort "libyeptris not found (set YEPTRIS_LIB_PATH)" unless libdir
 
 $LIBPATH << libdir
-$LDFLAGS << " -Wl,-rpath,#{libdir}" if RUBY_PLATFORM =~ /linux|darwin/
+# Platform gems bake a RELATIVE rpath so the bundle finds the
+  # vendored libyeptris next to itself; absolute build-time paths
+  # would dangle on user machines.
+  rpath = ENV["YEPTRIS_RPATH"] || libdir
+  $LDFLAGS << " -Wl,-rpath,#{rpath}" if RUBY_PLATFORM =~ /linux|darwin/
 have_library("yeptris", "yep_json_string") or abort "yep_json_string not exported — rebuild libyeptris"
 have_library("yeptris", "yeptris_visit_json") or abort "yeptris_visit_json missing"
 

data/ext/yeptris_native/json_ruby.c

@@ -30,6 +30,7 @@ typedef struct {
 } jr;
 
 static VALUE jr_value(jr* j);
+static VALUE jr_object_body(jr* j, VALUE h_pre);
 
 static void jr_ws(jr* j) {
     while (j->i < j->len) {
@@ -46,6 +47,13 @@ static void jr_ws(jr* j) {
 enum { YEP_CACHE_ON = 0, YEP_CACHE_OFF = 1 };
 static int yep_cache_mode = YEP_CACHE_ON;
 
+/* Allocation-shape knob (TODO.restructure/39): pre = capa(8) up
+ * front (forces heap buffers even for tiny arrays); natural =
+ * rb_ary_new() so 3-element arrays stay EMBEDDED in the RVALUE, and
+ * bulk-path hashes get exact capacity from the counted pairs. */
+enum { YEP_SHAPE_PRE = 0, YEP_SHAPE_NATURAL = 1 };
+static int yep_shape_mode = YEP_SHAPE_PRE;
+
 static uint64_t jr_hash(const char* sp, long sl) {
     /* 8-byte-prefix key (the leptris nametab trick): one safe load
      * of min(8, len) bytes + a multiply mix. Replaced byte-wise FNV
@@ -140,9 +148,20 @@ static int yep_ins_mode = YEP_INS_BULK;
 
 static VALUE jr_object(jr* j) {
     j->i++; j->depth++;
-    VALUE h = rb_hash_new_capa(8);
+    if (yep_shape_mode == YEP_SHAPE_PRE) {
+        VALUE h = rb_hash_new_capa(8);
+        jr_ws(j);
+        if (j->i < j->len && j->p[j->i] == '}') { j->i++; j->depth--; return h; }
+        return jr_object_body(j, h);
+    }
     jr_ws(j);
-    if (j->i < j->len && j->p[j->i] == '}') { j->i++; j->depth--; return h; }
+    if (j->i < j->len && j->p[j->i] == '}') { j->i++; j->depth--; return rb_hash_new(); }
+    return jr_object_body(j, Qundef); /* created post-loop with exact capa */
+
+    /* NOTREACHED */
+}
+
+static VALUE jr_object_body(jr* j, VALUE h_pre) {
     VALUE pairs[64];
     VALUE* pv = pairs;
     size_t pcap = 64, pn = 0, heap_cap = 0;
@@ -157,7 +176,7 @@ static VALUE jr_object(jr* j) {
         VALUE val = jr_value(j);
         if (j->err) goto out;
         if (yep_ins_mode == YEP_INS_ASET) {
-            rb_hash_aset(h, key, val);
+            rb_hash_aset(h_pre == Qundef ? (h_pre = rb_hash_new_capa(8)) : h_pre, key, val);
         } else {
             if (pn + 2 > pcap) {
                 size_t ncap = pcap * 2;
@@ -177,18 +196,23 @@ static VALUE jr_object(jr* j) {
         j->err = -2; goto out;
     }
     if (yep_ins_mode == YEP_INS_BULK) {
+        VALUE h = (h_pre == Qundef) ? rb_hash_new_capa((long)(pn / 2)) : h_pre;
         rb_hash_bulk_insert((long)pn, (const VALUE*)pv, h);
+        if (pv != pairs) { free(pv); }
+        j->depth--;
+        return h;
     }
+    if (h_pre == Qundef) { h_pre = rb_hash_new_capa(8); }
 out:
     if (pv != pairs) { free(pv); (void)heap_cap; }
     if (j->err) return Qnil;
     j->depth--;
-    return h;
+    return h_pre;
 }
 
 static VALUE jr_array(jr* j) {
     j->i++; j->depth++;
-    VALUE a = rb_ary_new_capa(8);
+    VALUE a = (yep_shape_mode == YEP_SHAPE_NATURAL) ? rb_ary_new() : rb_ary_new_capa(8);
     jr_ws(j);
     if (j->i < j->len && j->p[j->i] == ']') { j->i++; j->depth--; return a; }
     for (;;) {
@@ -257,6 +281,10 @@ static int yep_gc_mode = YEP_GC_DEFAULT;
 int yep_rb_gc_mode(void) { return yep_gc_mode; }
 int yep_rb_ins_mode(void) { return yep_ins_mode; }
 int yep_rb_cache_mode(void) { return yep_cache_mode; }
+int yep_rb_shape_mode(void) { return yep_shape_mode; }
+void yep_rb_set_shape_mode(int mode) {
+    if (mode == YEP_SHAPE_PRE || mode == YEP_SHAPE_NATURAL) yep_shape_mode = mode;
+}
 void yep_rb_set_cache_mode(int mode) {
     if (mode == YEP_CACHE_ON || mode == YEP_CACHE_OFF) yep_cache_mode = mode;
 }

data/ext/yeptris_native/yeptris_native.c

@@ -331,6 +331,8 @@ extern int yep_rb_ins_mode(void);
 extern void yep_rb_set_ins_mode(int mode);
 extern int yep_rb_cache_mode(void);
 extern void yep_rb_set_cache_mode(int mode);
+extern int yep_rb_shape_mode(void);
+extern void yep_rb_set_shape_mode(int mode);
 extern double yep_rb_scan_time(const char* p, size_t len, int n);
 
 static VALUE native_gc_mode(VALUE self) {
@@ -380,6 +382,21 @@ static VALUE native_scan_time(VALUE self, VALUE input, VALUE count) {
     return DBL2NUM(secs / (double)n);
 }
 
+static VALUE native_shape_mode(VALUE self) {
+    (void)self;
+    return yep_rb_shape_mode() == 1 ? ID2SYM(rb_intern("natural")) : ID2SYM(rb_intern("pre"));
+}
+
+static VALUE native_shape_mode_set(VALUE self, VALUE mode) {
+    (void)self;
+    Check_Type(mode, T_SYMBOL);
+    ID id = rb_sym2id(mode);
+    if (id == rb_intern("pre")) yep_rb_set_shape_mode(0);
+    else if (id == rb_intern("natural")) yep_rb_set_shape_mode(1);
+    else rb_raise(rb_eArgError, "shape_mode must be :pre or :natural");
+    return mode;
+}
+
 static VALUE native_gc_mode_set(VALUE self, VALUE mode) {
     (void)self;
     Check_Type(mode, T_SYMBOL);
@@ -404,6 +421,8 @@ RUBY_FUNC_EXPORTED void Init_native(void) {
     rb_define_singleton_method(mNat, "ins_mode=", native_ins_mode_set, 1);
     rb_define_singleton_method(mNat, "cache_mode", native_cache_mode, 0);
     rb_define_singleton_method(mNat, "cache_mode=", native_cache_mode_set, 1);
+    rb_define_singleton_method(mNat, "shape_mode", native_shape_mode, 0);
+    rb_define_singleton_method(mNat, "shape_mode=", native_shape_mode_set, 1);
     rb_define_singleton_method(mNat, "scan_time", native_scan_time, 2);
     rb_define_const(mNat, "AVAILABLE", Qtrue);
     const char* env = getenv("YEPTRIS_NATIVE_GC");
@@ -414,4 +433,6 @@ RUBY_FUNC_EXPORTED void Init_native(void) {
     if (ins != NULL && strcmp(ins, "aset") == 0) yep_rb_set_ins_mode(1);
     const char* cache = getenv("YEPTRIS_NATIVE_CACHE");
     if (cache != NULL && strcmp(cache, "off") == 0) yep_rb_set_cache_mode(1);
+    const char* shape = getenv("YEPTRIS_NATIVE_SHAPE");
+    if (shape != NULL && strcmp(shape, "natural") == 0) yep_rb_set_shape_mode(1);
 }

data/lib/yeptris.rb

@@ -3,7 +3,7 @@
 module Yeptris
   # The gem's version lives in the parent namespace's file — the last
   # internal require (yeptris/version) retired with it.
-  VERSION = "0.1.13.2".freeze
+  VERSION = "0.1.13.3".freeze
   # The error hierarchy lives in THIS file (the parent namespace's
   # own file): nested constants do not trigger a parent-constant
   # autoload, and the law forbids internal requires — defining the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeptris
 version: !ruby/object:Gem::Version
-  version: 0.1.13.2
+  version: 0.1.13.3
 platform: ruby
 authors:
 - Ribose Inc.