usamin 7.7.6 → 7.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 578850ff19b39ff8950a5d31f890d78cef055935521637ab28cbcda311d1739d
-  data.tar.gz: 95705ef10f8fc3dcdf3687d9670638a981c081154cbc1dcdd85b3cb7a9821683
+  metadata.gz: 7413ecd5a577b354f0a536da1b2bd451b5ea59e1b19d2c7875f34371769071f4
+  data.tar.gz: '08a17cb48a760174d1fb5bdbd70fbbb68b65ad1070e91b2cbbdde14452a74d49'
 SHA512:
-  metadata.gz: d95d14dcdfa3578c75699f529e5d324ef47f4e4eba6961efd76136bcaee3b01d50f35cace24c018824de6b48a3cac96e1c0d1ad3c43a72e17f1a882847b6c4c7
-  data.tar.gz: b4f9a8f2cef31b7e7dcfe1e876b59f9164322af8db9a7b970a944559c19d9c83d9490b5dd1c819b34f3f02ec1aa7f83003700c7c243a7af2d2ed96da9947c3cd
+  metadata.gz: 9bb85ee9718f07ef82f87992a38400159fb5601c9479e13718e89bb50e0d4c4a8acf61790efe4cf4a0fa3ab890e1650adf0749c570aebbd428f105cf6f41c4a9
+  data.tar.gz: b9a27406ab4d05ca2cae353e4627bd1c4cb5b01719f50d9c7f3600629bbdce37120467017dd8016b889d4b8fa0f1ccad24357c5bcb90816927e95226bc2baa38

data/ext/usamin/usamin.cpp

@@ -10,6 +10,7 @@
 #include <rapidjson/writer.h>
 #include <rapidjson/prettywriter.h>
 #include <rapidjson/error/en.h>
+#include <iostream>
 
 #if SIZEOF_VALUE < SIZEOF_VOIDP
 #error SIZEOF_VOIDP must not be greater than SIZEOF_VALUE.
@@ -81,35 +82,55 @@ static inline void check_array(UsaminValue *ptr) {
 }
 
 
-static VALUE usamin_free(UsaminValue **ptr) {
+static void usamin_free(void *p) {
+    if (!p)
+        return;
+    UsaminValue **ptr = (UsaminValue**)p;
     if (*ptr)
         delete *ptr;
-    ruby_xfree(ptr);
-    return Qnil;
+    ruby_xfree(p);
 }
 
-static VALUE usamin_mark(UsaminValue **ptr) {
+static void usamin_mark(void *p) {
+    if (!p)
+        return;
+    UsaminValue **ptr = (UsaminValue**)p;
     if (*ptr && (*ptr)->root_document != Qnil)
         rb_gc_mark((*ptr)->root_document);
-    return Qnil;
 }
 
+static size_t usamin_size(const void *p) {
+    if (!p)
+        return 0;
+    UsaminValue **ptr = (UsaminValue**)p;
+    size_t s = 0;
+    if (*ptr) {
+        s += sizeof(UsaminValue);
+        if ((*ptr)->free_flag)
+            s += ((rapidjson::Document*)(*ptr)->value)->GetAllocator().Capacity();
+    }
+    return s;
+}
+
+static const rb_data_type_t rb_usamin_value_type = { "UsaminValue", { usamin_mark, usamin_free, usamin_size }, nullptr, nullptr, RUBY_TYPED_FREE_IMMEDIATELY };
+
 static VALUE usamin_alloc(const VALUE klass) {
-    UsaminValue** ptr = (UsaminValue**)ruby_xmalloc(sizeof(UsaminValue*));
+    UsaminValue** ptr;
+    VALUE ret = TypedData_Make_Struct(klass, UsaminValue*, &rb_usamin_value_type, ptr);
     *ptr = nullptr;
-    return Data_Wrap_Struct(klass, usamin_mark, usamin_free, ptr);
+    return ret;
 }
 
 
 static inline UsaminValue* get_value(VALUE value) {
     UsaminValue** ptr;
-    Data_Get_Struct(value, UsaminValue*, ptr);
+    TypedData_Get_Struct(value, UsaminValue*, &rb_usamin_value_type, ptr);
     return *ptr;
 }
 
 static inline void set_value(VALUE value, UsaminValue *usamin) {
     UsaminValue **ptr;
-    Data_Get_Struct(value, UsaminValue*, ptr);
+    TypedData_Get_Struct(value, UsaminValue*, &rb_usamin_value_type, ptr);
     *ptr = usamin;
 }
 

data/lib/usamin/version.rb

@@ -1,3 +1,3 @@
 module Usamin
-    VERSION = "7.7.6"
+    VERSION = "7.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usamin
 version: !ruby/object:Gem::Version
-  version: 7.7.6
+  version: 7.7.7
 platform: ruby
 authors:
 - Ishotihadus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler