min_max 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1111038380ae3a10c7d27e970e3f689243adaf93a0d56341f7838a8edb6e70df
-  data.tar.gz: 9cfcbcd91ff7676988c18f3abff722a28f2ca22f1f5e78daaf55e090219db37b
+  metadata.gz: aef5e878c1412daa7a16bf7aad72afff1bdcc4cfa37709e6a88601d6ef2f1a93
+  data.tar.gz: 74f22abb3ad7a47e654cf6033d0512e00344a373e21aa18e46f86a9d38e6dc17
 SHA512:
-  metadata.gz: dae2da6ad5bb703b5aca311f80b9af0254c8adc746e406870600a4f343892225edc2a8dd598de08b407926a23bd053eecca900c7cf4265679af4158ac112cbe1
-  data.tar.gz: 264f99dd737e0e0a3592c94c9007d03f5fd7cc3838dd91a9ca479bcb79faf2ea10276bce9dad98b9ccd1b2fca12a097dee90683fcf6671006f58c7f753d2c9bd
+  metadata.gz: 0b992bc50cd6e4920503b8a9257916dc3cb83326126c9e56c38fb693bbf513335573f8c7730386109044de48f58dd6e8a9c1da7f4a6e91e9f28e2aeb981cd23c
+  data.tar.gz: e5f84db084190697f2d8ab7738b70fc82ae2b4a23466936d47e74aef27e46dd39f1f2e5885b1a7d3f876f28aadc0dfc747dabffe36c05eaa3f4661f7424091bf

data/Cargo.lock

@@ -13,16 +13,16 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.66.1"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
+ "itertools",
  "lazy_static",
  "lazycell",
- "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
@@ -63,12 +63,27 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "either"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+
 [[package]]
 name = "glob"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -139,6 +154,7 @@ dependencies = [
  "lazy_static",
  "magnus",
  "min-max-heap",
+ "rb-sys",
 ]
 
 [[package]]
@@ -157,12 +173,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.66"
@@ -183,18 +193,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.81"
+version = "0.9.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a57240b308b155b09dce81e32829966a99f52d1088b45957e4283e526c5317a1"
+checksum = "0d197f2c03751ef006f29d593d22aa9068c9c358e04ca503afea0329c366147c"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.81"
+version = "0.9.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24ce877a4c5d07f06f6aa6fec3ac95e4b357b9f73b0f5445d8cbb7266d410e8"
+checksum = "2b50caf8fd028f12abe00d6debe2ae2adf6202c9ca3caa59487eda710d90fa28"
 dependencies = [
  "bindgen",
  "lazy_static",

data/ext/min_max/Cargo.toml

@@ -10,6 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-magnus = { version = "0.6.1" }
+magnus = { version = "0.6.1"}
 min-max-heap = "1.3.0"
 lazy_static = "1.4.0"
+rb-sys = { version = "0.9.89", features=["stable-api-compiled-fallback"]}

data/ext/min_max/src/lib.rs

@@ -1,27 +1,27 @@
 use magnus::block::Proc;
 use magnus::scan_args::scan_args;
-use magnus::value::{BoxValue, ReprValue};
+use magnus::value::ReprValue;
 use magnus::{
     block::{block_given, Yield},
     define_class, function, method,
     prelude::*,
     Error, IntoValue, RArray, Ruby, Value,
 };
-use magnus::{eval, DataTypeFunctions, RHash, RString, TypedData};
+use magnus::{eval, gc, DataTypeFunctions, RHash, RString, TypedData};
 use min_max_heap::MinMaxHeap;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 
 #[derive(Debug, Clone)]
-struct PriorityOrderableValue(i64, usize);
+struct PriorityOrderableValue(i64, i64);
 
 #[macro_use]
 extern crate lazy_static;
 
 struct MEM(
-    RwLock<HashMap<usize, BoxValue<Value>>>,
-    RwLock<HashMap<usize, RefCell<usize>>>,
+    RwLock<HashMap<i64, Box<Value>>>,
+    RwLock<HashMap<i64, RefCell<usize>>>,
 );
 
 impl MEM {
@@ -36,13 +36,13 @@ lazy_static! {
     static ref MEMORY: MEM = MEM::new();
 }
 
-fn get_rb_obj(key: usize) -> Option<Value> {
+fn get_rb_obj(key: i64) -> Option<Value> {
     let binding = (*MEMORY).0.read().unwrap();
     let v = binding.get(&key).unwrap();
     Some(**v)
 }
 
-fn pop_rb_obj(key: usize) -> Option<Value> {
+fn pop_rb_obj(key: i64) -> Option<Value> {
     let binding = (*MEMORY).1.read().unwrap();
     let mut count = binding.get(&key).unwrap().borrow_mut();
     if *count == 0 {
@@ -51,6 +51,7 @@ fn pop_rb_obj(key: usize) -> Option<Value> {
     *count -= 1;
     let res = if *count == 0 {
         let val = (*MEMORY).0.write().unwrap().remove(&key).unwrap();
+        gc::unregister_address(&*val);
         Some(*val)
     } else {
         let binding = (*MEMORY).0.read().unwrap();
@@ -60,17 +61,15 @@ fn pop_rb_obj(key: usize) -> Option<Value> {
     res
 }
 
-fn push_rb_obj(key: usize, value: Value) -> usize {
+fn push_rb_obj(key: i64, value: Value) -> i64 {
     let mut binding = (*MEMORY).1.write().unwrap();
     let mut count = binding.entry(key).or_insert(RefCell::new(0)).borrow_mut();
 
     *count += 1;
     if *count == 1 {
-        (*MEMORY)
-            .0
-            .write()
-            .unwrap()
-            .insert(key, BoxValue::new(value));
+        let boxed = Box::new(value);
+        gc::register_address(&*boxed);
+        (*MEMORY).0.write().unwrap().insert(key, boxed);
     };
     return key;
 }
@@ -133,7 +132,7 @@ impl RubyMinMaxHeap {
         let mut hp = self.heap.borrow_mut();
         value.iter().for_each(|v| {
             let priority: i64 = (*self.priority_proc).call([*v]).unwrap_or_default();
-            let key = v.hash().unwrap().to_usize().unwrap();
+            let key = v.hash().unwrap().to_i64().unwrap();
             hp.push(PriorityOrderableValue(priority, push_rb_obj(key, *v)));
         });
         Ok(())

data/lib/min_max/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class MinMax
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: min_max
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Wouter Coppieters