isomorfeus-iodine 0.7.45 → 0.7.46

data/ext/iodine/iodine_store.c

@@ -1,142 +1,142 @@
-#include "iodine.h"
-
-#include "iodine_store.h"
-
-#include <inttypes.h>
-#include <stdint.h>
-
-#define FIO_SET_NAME fio_store
-#define FIO_SET_OBJ_TYPE uintptr_t
-#include <fio.h>
-
-static fio_lock_i iodine_storage_lock = FIO_LOCK_INIT;
-static fio_store_s iodine_storage = FIO_SET_INIT;
-static size_t iodine_storage_count_max = 0;
-
-#ifndef IODINE_DEBUG
-#define IODINE_DEBUG 0
-#endif
-
-/* *****************************************************************************
-API
-***************************************************************************** */
-
-/** Adds an object to the storage (or increases it's reference count). */
-static VALUE storage_add(VALUE obj) {
-  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse)
-    return obj;
-  uintptr_t old = 0;
-  fio_lock(&iodine_storage_lock);
-  fio_store_overwrite(&iodine_storage, obj, 1, &old);
-  if (old)
-    fio_store_overwrite(&iodine_storage, obj, old + 1, NULL);
-  if (iodine_storage_count_max < fio_store_count(&iodine_storage))
-    iodine_storage_count_max = fio_store_count(&iodine_storage);
-  fio_unlock(&iodine_storage_lock);
-  return obj;
-}
-/** Removes an object from the storage (or decreases it's reference count). */
-static VALUE storage_remove(VALUE obj) {
-  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse ||
-      iodine_storage.count == 0)
-    return obj;
-  fio_lock(&iodine_storage_lock);
-  uintptr_t old = 0;
-  fio_store_remove(&iodine_storage, obj, 0, &old);
-  if (old > 1)
-    fio_store_overwrite(&iodine_storage, obj, old - 1, NULL);
-  fio_unlock(&iodine_storage_lock);
-  return obj;
-}
-/** Should be called after forking to reset locks */
-static void storage_after_fork(void) { iodine_storage_lock = FIO_LOCK_INIT; }
-
-/** Prints debugging information to the console. */
-static void storage_print(void) {
-  FIO_LOG_DEBUG("Ruby <=> C Memory storage stats (pid: %d):\n", getpid());
-  fio_lock(&iodine_storage_lock);
-  uintptr_t index = 0;
-  FIO_SET_FOR_LOOP(&iodine_storage, pos) {
-    if (pos->obj) {
-      fprintf(stderr, "[%" PRIuPTR "] => %" PRIuPTR " X obj %p type %d\n",
-              index++, pos->obj, (void *)pos->hash, TYPE(pos->hash));
-    }
-  }
-  fprintf(stderr, "Total of %" PRIuPTR " objects protected form GC\n", index);
-  fprintf(stderr,
-          "Storage uses %" PRIuPTR " Hash bins for %" PRIuPTR " objects\n"
-          "The largest collection was %zu objects.\n",
-          iodine_storage.capa, iodine_storage.count, iodine_storage_count_max);
-  fio_unlock(&iodine_storage_lock);
-}
-
-/**
- * Used for debugging purposes (when testing iodine for Ruby object "leaks").
- */
-static VALUE storage_print_rb(VALUE self) {
-  storage_print();
-  return Qnil;
-  (void)self;
-}
-/* *****************************************************************************
-GC protection
-***************************************************************************** */
-
-/* a callback for the GC (marking active objects) */
-static void storage_mark(void *ignore) {
-  (void)ignore;
-  if (FIO_LOG_LEVEL >= FIO_LOG_LEVEL_DEBUG)
-    storage_print();
-  fio_lock(&iodine_storage_lock);
-  // fio_store_compact(&iodine_storage);
-  FIO_SET_FOR_LOOP(&iodine_storage, pos) {
-    if (pos->obj) {
-      rb_gc_mark((VALUE)pos->hash);
-    }
-  }
-  fio_unlock(&iodine_storage_lock);
-}
-
-/* clear the registry (end of lifetime) */
-static void storage_clear(void *ignore) {
-  (void)ignore;
-  FIO_LOG_DEBUG("Ruby<=>C Storage cleared.\n");
-  fio_lock(&iodine_storage_lock);
-  fio_store_free(&iodine_storage);
-  iodine_storage = (fio_store_s)FIO_SET_INIT;
-  fio_unlock(&iodine_storage_lock);
-}
-
-/*
-the data-type used to identify the registry
-this sets the callbacks.
-*/
-static const struct rb_data_type_struct storage_type_struct = {
-    .wrap_struct_name = "RubyReferencesIn_C_Land",
-    .function.dfree = (void (*)(void *))storage_clear,
-    .function.dmark = (void (*)(void *))storage_mark,
-};
-
-/* *****************************************************************************
-Initialization
-***************************************************************************** */
-
-struct IodineStorage_s IodineStore = {
-    .add = storage_add,
-    .remove = storage_remove,
-    .after_fork = storage_after_fork,
-    .print = storage_print,
-};
-
-/** Initializes the storage unit for first use. */
-void iodine_storage_init(void) {
-  fio_store_capa_require(&iodine_storage, 512);
-  VALUE tmp =
-      rb_define_class_under(rb_cObject, "IodineObjectStorage", rb_cData);
-  VALUE storage_obj =
-      TypedData_Wrap_Struct(tmp, &storage_type_struct, &iodine_storage);
-  // rb_global_variable(&iodine_storage_obj);
-  rb_ivar_set(IodineModule, rb_intern2("storage", 7), storage_obj);
-  rb_define_module_function(IodineBaseModule, "db_print_protected_objects",
-                            storage_print_rb, 0);
-}
+#include "iodine.h"
+
+#include "iodine_store.h"
+
+#include <inttypes.h>
+#include <stdint.h>
+
+#define FIO_SET_NAME fio_store
+#define FIO_SET_OBJ_TYPE uintptr_t
+#include <fio.h>
+
+static fio_lock_i iodine_storage_lock = FIO_LOCK_INIT;
+static fio_store_s iodine_storage = FIO_SET_INIT;
+static size_t iodine_storage_count_max = 0;
+
+#ifndef IODINE_DEBUG
+#define IODINE_DEBUG 0
+#endif
+
+/* *****************************************************************************
+API
+***************************************************************************** */
+
+/** Adds an object to the storage (or increases it's reference count). */
+static VALUE storage_add(VALUE obj) {
+  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse)
+    return obj;
+  uintptr_t old = 0;
+  fio_lock(&iodine_storage_lock);
+  fio_store_overwrite(&iodine_storage, obj, 1, &old);
+  if (old)
+    fio_store_overwrite(&iodine_storage, obj, old + 1, NULL);
+  if (iodine_storage_count_max < fio_store_count(&iodine_storage))
+    iodine_storage_count_max = fio_store_count(&iodine_storage);
+  fio_unlock(&iodine_storage_lock);
+  return obj;
+}
+/** Removes an object from the storage (or decreases it's reference count). */
+static VALUE storage_remove(VALUE obj) {
+  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse ||
+      iodine_storage.count == 0)
+    return obj;
+  fio_lock(&iodine_storage_lock);
+  uintptr_t old = 0;
+  fio_store_remove(&iodine_storage, obj, 0, &old);
+  if (old > 1)
+    fio_store_overwrite(&iodine_storage, obj, old - 1, NULL);
+  fio_unlock(&iodine_storage_lock);
+  return obj;
+}
+/** Should be called after forking to reset locks */
+static void storage_after_fork(void) { iodine_storage_lock = FIO_LOCK_INIT; }
+
+/** Prints debugging information to the console. */
+static void storage_print(void) {
+  FIO_LOG_DEBUG("Ruby <=> C Memory storage stats (pid: %d):\n", getpid());
+  fio_lock(&iodine_storage_lock);
+  uintptr_t index = 0;
+  FIO_SET_FOR_LOOP(&iodine_storage, pos) {
+    if (pos->obj) {
+      fprintf(stderr, "[%" PRIuPTR "] => %" PRIuPTR " X obj %p type %d\n",
+              index++, pos->obj, (void *)pos->hash, TYPE(pos->hash));
+    }
+  }
+  fprintf(stderr, "Total of %" PRIuPTR " objects protected form GC\n", index);
+  fprintf(stderr,
+          "Storage uses %" PRIuPTR " Hash bins for %" PRIuPTR " objects\n"
+          "The largest collection was %zu objects.\n",
+          iodine_storage.capa, iodine_storage.count, iodine_storage_count_max);
+  fio_unlock(&iodine_storage_lock);
+}
+
+/**
+ * Used for debugging purposes (when testing iodine for Ruby object "leaks").
+ */
+static VALUE storage_print_rb(VALUE self) {
+  storage_print();
+  return Qnil;
+  (void)self;
+}
+/* *****************************************************************************
+GC protection
+***************************************************************************** */
+
+/* a callback for the GC (marking active objects) */
+static void storage_mark(void *ignore) {
+  (void)ignore;
+  if (FIO_LOG_LEVEL >= FIO_LOG_LEVEL_DEBUG)
+    storage_print();
+  fio_lock(&iodine_storage_lock);
+  // fio_store_compact(&iodine_storage);
+  FIO_SET_FOR_LOOP(&iodine_storage, pos) {
+    if (pos->obj) {
+      rb_gc_mark((VALUE)pos->hash);
+    }
+  }
+  fio_unlock(&iodine_storage_lock);
+}
+
+/* clear the registry (end of lifetime) */
+static void storage_clear(void *ignore) {
+  (void)ignore;
+  FIO_LOG_DEBUG("Ruby<=>C Storage cleared.\n");
+  fio_lock(&iodine_storage_lock);
+  fio_store_free(&iodine_storage);
+  iodine_storage = (fio_store_s)FIO_SET_INIT;
+  fio_unlock(&iodine_storage_lock);
+}
+
+/*
+the data-type used to identify the registry
+this sets the callbacks.
+*/
+static const struct rb_data_type_struct storage_type_struct = {
+    .wrap_struct_name = "RubyReferencesIn_C_Land",
+    .function.dfree = (void (*)(void *))storage_clear,
+    .function.dmark = (void (*)(void *))storage_mark,
+};
+
+/* *****************************************************************************
+Initialization
+***************************************************************************** */
+
+struct IodineStorage_s IodineStore = {
+    .add = storage_add,
+    .remove = storage_remove,
+    .after_fork = storage_after_fork,
+    .print = storage_print,
+};
+
+/** Initializes the storage unit for first use. */
+void iodine_storage_init(void) {
+  fio_store_capa_require(&iodine_storage, 512);
+  VALUE tmp =
+      rb_define_class_under(rb_cObject, "IodineObjectStorage", rb_cObject);
+  VALUE storage_obj =
+      TypedData_Wrap_Struct(tmp, &storage_type_struct, &iodine_storage);
+  // rb_global_variable(&iodine_storage_obj);
+  rb_ivar_set(IodineModule, rb_intern2("storage", 7), storage_obj);
+  rb_define_module_function(IodineBaseModule, "db_print_protected_objects",
+                            storage_print_rb, 0);
+}

data/ext/iodine/iodine_tls.c

@@ -241,7 +241,7 @@ void iodine_init_tls(void) {
   IODINE_MAKE_SYM(private_key);
   IODINE_MAKE_SYM(password);
 
-  IodineTLSClass = rb_define_class_under(IodineModule, "TLS", rb_cData);
+  IodineTLSClass = rb_define_class_under(IodineModule, "TLS", rb_cObject);
   rb_define_alloc_func(IodineTLSClass, iodine_tls_data_alloc_c);
   rb_define_method(IodineTLSClass, "initialize", iodine_tls_new, -1);
   rb_define_method(IodineTLSClass, "use_certificate",

data/isomorfeus-iodine.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '>=3.9.0', '< 4.0'
   spec.add_development_dependency 'spec', '>=5.3.0', '< 6.0'
   spec.add_development_dependency 'rake-compiler', '>= 1', '< 2.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
   spec.post_install_message = "Thank you for installing Iodine #{Iodine::VERSION}.\n" +
                               "Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations) to Bo."

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
-module Iodine
-  VERSION = '0.7.45'.freeze
-end
+module Iodine
+  VERSION = '0.7.46'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.45
+  version: 0.7.46
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -242,7 +242,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thank you for installing Iodine 0.7.45.
+  Thank you for installing Iodine 0.7.46.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations) to Bo.
 rdoc_options: []
 require_paths:
@@ -252,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -265,7 +265,7 @@ requirements:
 - Ruby >= 2.5.0 recommended.
 - TLS requires OpenSSL >= 1.1.0.
 - Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: iodine build for Isomorfeus