itsi-scheduler 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1bc3d31e647642d096846f41852991ea7f31c3b2c1e70c4ed07ec7c0676e48e
-  data.tar.gz: 1d335eb5d0fbe3cf02031cedb096db4b8bbf8cdd49db899b6e2db4efe30d2830
+  metadata.gz: 1bcd2bc05870dc73258c373197ded9712f184af219a9ab7e705751d43903d1a5
+  data.tar.gz: a4f3dd982ce4d5bd22dd6bda6b8a546f0e5695cd7fdeab989d56067165ae833c
 SHA512:
-  metadata.gz: 9e9a99c1ce6e278159dd31a525810ddf2661563f823dd54bc4c6e5686fcb9b70e7137d3a9622aa1f794553f2e26c43b5c1d37bda2b549aa0306b6c24c410083f
-  data.tar.gz: 30d3ac6eefb849cdf6d53db6dfe420af9586be2b1d7efa2ce5605e29bd5bf686683033e48ebe835d41cabd29abfdce953131f8ee640e7a8ecb902ac235123248
+  metadata.gz: f4d97868c1061dff8ccdfb925dc3ab9e2cdef714bbd6f71752dc258a4630bb6c9963f0beac938993310ce091df72af2dd23afe6e299954f04349d88a6c81e12e
+  data.tar.gz: 44ac2fa697dc01e5f0aa5119676eb72a558ccb5dc0cbe4f202a3f1198ac014d4b4ca90e0c950c3560938cf3485f8e5242fed89b25b3e0846830b52edb0b9f11f

data/Cargo.lock

@@ -213,7 +213,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.7"
+version = "0.2.9"
 dependencies = [
  "bytes",
  "derive_more",

data/ext/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.7"
+version = "0.2.9"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_scheduler/src/itsi_scheduler.rs

@@ -7,7 +7,7 @@ use itsi_error::ItsiError;
 use itsi_rb_helpers::{call_without_gvl, create_ruby_thread};
 use magnus::{
     error::Result as MagnusResult,
-    value::{InnerValue, Opaque, ReprValue},
+    value::{InnerValue, Lazy, LazyId, Opaque, ReprValue},
     Module, RClass, Ruby, Value,
 };
 use mio::{Events, Poll, Token, Waker};
@@ -19,7 +19,7 @@ use std::{
     time::Duration,
 };
 use timer::Timer;
-use tracing::{debug, info, warn};
+use tracing::{debug, error, info, warn};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub(crate) struct Readiness(i16);
@@ -31,6 +31,9 @@ impl std::fmt::Debug for ItsiScheduler {
 }
 
 const WAKE_TOKEN: Token = Token(0);
+static ID_CURRENT: LazyId = LazyId::new("current");
+static CLASS_FIBER: Lazy<RClass> =
+    Lazy::new(|ruby| ruby.module_kernel().const_get("Fiber").unwrap());
 
 #[magnus::wrap(class = "Itsi::Scheduler", free_immediately, size)]
 pub(crate) struct ItsiScheduler {
@@ -225,14 +228,17 @@ impl ItsiScheduler {
         let result: Arc<RwLock<Option<T>>> = Arc::new(RwLock::new(None));
         let result_clone = Arc::clone(&result);
 
-        let current_fiber = Opaque::from(ruby.fiber_current());
-        let scheduler = Opaque::from(
-            ruby.module_kernel()
-                .const_get::<_, RClass>("Fiber")
-                .unwrap()
-                .funcall::<_, _, Value>("scheduler", ())
-                .unwrap(),
-        );
+        let class_fiber = ruby.get_inner(&CLASS_FIBER);
+        let current_fiber = ruby
+            .get_inner(&CLASS_FIBER)
+            .funcall::<_, _, Value>(*ID_CURRENT, ());
+
+        if current_fiber.is_err() {
+            error!("Failed to get current fiber");
+            return Err(ItsiError::ArgumentError("Failed to get current fiber".to_string()).into());
+        }
+        let current_fiber = Opaque::from(current_fiber.unwrap());
+        let scheduler = Opaque::from(class_fiber.funcall::<_, _, Value>("scheduler", ()).unwrap());
 
         create_ruby_thread(move || {
             call_without_gvl(|| {

data/ext/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.7"
+version = "0.2.9"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_server/src/services/itsi_http_service.rs

@@ -108,16 +108,13 @@ impl HttpRequestContext {
     }
 
     pub fn set_supported_encoding_set(&self, req: &HttpRequest) {
-        let supported_encoding_set = req
-            .headers()
-            .get_all(ACCEPT_ENCODING)
-            .into_iter()
-            .cloned()
-            .collect::<Vec<_>>();
-        self.inner
-            .supported_encoding_set
-            .set(supported_encoding_set)
-            .unwrap();
+        self.inner.supported_encoding_set.get_or_init(move || {
+            req.headers()
+                .get_all(ACCEPT_ENCODING)
+                .into_iter()
+                .cloned()
+                .collect::<Vec<_>>()
+        });
     }
 
     pub fn set_origin(&self, origin: Option<String>) {

data/lib/itsi/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.2.7"
+    VERSION = "0.2.9"
   end
 end

data/lib/itsi/scheduler.rb

@@ -122,7 +122,7 @@ module Itsi
 
     # Hook invoked at the end of the thread.
     # Will start our scheduler's Reactor.
-    def scheduler_close
+    def close
       run
     ensure
       @closed ||= true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="