ilios 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c54ed7ca20c4e0633a57b33b41cbe2a8a9fe1c89134d92496fea61c1b5d6d0bb
-  data.tar.gz: dbde2f3d25981a52980fb9eaf198c90aea663f1cd99b33923227ccb2fb0d76f4
+  metadata.gz: fe04ef9746b0a963eade104e22e4285eac2a5192fbb19407c6d5373d0b69e9e0
+  data.tar.gz: 66b83da5d0da081c2f737e7ce03ea4c878f62e28dfc6fc8816bece5d10ef941e
 SHA512:
-  metadata.gz: 2db32fe42576c2a1add3b44903c2e4b93b163f240b5adc668ecbc18ea44f1611d007737657798e11e06125e8eda86a92994716b1b6ce74231a4c6d14d901f3f9
-  data.tar.gz: ea74e0a82689fdae39a2924c1c5feccf1a334588eb239d0bddbc0878e4811b703cc53e2c6d873a26c8c8e05b9529a1280ffc07eabd025a96a860b01a9ec6a43f
+  metadata.gz: ac26a4ed1f5f37807161acde7fbb62f2268f0e81b9d81b3412eb151650ad830cf38fbdb3283b67251c8aba526d56781b4ee4419e5ebb98a7459e6cfab5f39606
+  data.tar.gz: 93a3620eea6b6af5982d0805d36350100d93340353e0ea0681bdfb4043dbfa59cdf8e4267c12989ef9620f9da99fca73b1a8d21fc412609054220bf696cdb4f0

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   cassandra:
-    image: cassandra:5
+    image: cassandra:4
     ports:
     - 9042:9042
     volumes:

data/ext/ilios/future.c

@@ -195,31 +195,12 @@ VALUE future_create(CassFuture *future, VALUE session, future_kind kind)
     return cassandra_future_obj;
 }
 
-/**
- * Run block when future resolves to a value.
- *
- * @yieldparam value [Cassandra::Statement, Cassandra::Result] A value.
- *   Yields +Cassandra::Statement+ object when future was created by +Cassandra::Session#prepare_async+.
- *   Yields +Cassandra::Result+ object when future was created by +Cassandra::Session#execute_async+.
- * @return [Cassandra::Future] self.
- * @raise [Cassandra::ExecutionError] If this method will be called twice.
- * @raise [ArgumentError] If no block was given.
- */
-static VALUE future_on_success(VALUE self)
+static VALUE future_on_success_synchronize(VALUE future)
 {
     CassandraFuture *cassandra_future;
     bool wakeup_thread = false;
 
-    GET_FUTURE(self, cassandra_future);
-
-    if (cassandra_future->on_success_block) {
-        rb_raise(eExecutionError, "It should not call twice");
-    }
-    if (!rb_block_given_p()) {
-        rb_raise(rb_eArgError, "no block given");
-    }
-
-    rb_mutex_lock(cassandra_future->proc_mutex);
+    GET_FUTURE(future, cassandra_future);
 
     if (!cassandra_future->on_failure_block) {
         // Invoke the callback with thread pool only once
@@ -229,44 +210,52 @@ static VALUE future_on_success(VALUE self)
     cassandra_future->on_success_block = rb_block_proc();
 
     if (cass_future_ready(cassandra_future->future)) {
-        rb_mutex_unlock(cassandra_future->proc_mutex);
         uv_sem_post(&cassandra_future->sem);
         if (cass_future_error_code(cassandra_future->future) == CASS_OK) {
             future_result_success_yield(cassandra_future);
         }
-        return self;
+        return future;
     }
 
     if (wakeup_thread) {
-        future_queue_push(future_thread_pool_get(cassandra_future), self);
+        future_queue_push(future_thread_pool_get(cassandra_future), future);
     }
-    rb_mutex_unlock(cassandra_future->proc_mutex);
 
-    return self;
+    return future;
 }
 
 /**
- * Run block when future resolves to error.
+ * Run block when future resolves to a value.
  *
+ * @yieldparam value [Cassandra::Statement, Cassandra::Result] A value.
+ *   Yields +Cassandra::Statement+ object when future was created by +Cassandra::Session#prepare_async+.
+ *   Yields +Cassandra::Result+ object when future was created by +Cassandra::Session#execute_async+.
  * @return [Cassandra::Future] self.
  * @raise [Cassandra::ExecutionError] If this method will be called twice.
  * @raise [ArgumentError] If no block was given.
  */
-static VALUE future_on_failure(VALUE self)
+static VALUE future_on_success(VALUE self)
 {
     CassandraFuture *cassandra_future;
-    bool wakeup_thread = false;
 
     GET_FUTURE(self, cassandra_future);
 
-    if (cassandra_future->on_failure_block) {
+    if (cassandra_future->on_success_block) {
         rb_raise(eExecutionError, "It should not call twice");
     }
     if (!rb_block_given_p()) {
         rb_raise(rb_eArgError, "no block given");
     }
 
-    rb_mutex_lock(cassandra_future->proc_mutex);
+    return rb_mutex_synchronize(cassandra_future->proc_mutex, future_on_success_synchronize, self);
+}
+
+static VALUE future_on_failure_synchronize(VALUE future)
+{
+    CassandraFuture *cassandra_future;
+    bool wakeup_thread = false;
+
+    GET_FUTURE(future, cassandra_future);
 
     if (!cassandra_future->on_success_block) {
         // Invoke the callback with thread pool only once
@@ -276,20 +265,41 @@ static VALUE future_on_failure(VALUE self)
     cassandra_future->on_failure_block = rb_block_proc();
 
     if (cass_future_ready(cassandra_future->future)) {
-        rb_mutex_unlock(cassandra_future->proc_mutex);
         uv_sem_post(&cassandra_future->sem);
         if (cass_future_error_code(cassandra_future->future) != CASS_OK) {
             future_result_failure_yield(cassandra_future);
         }
-        return self;
+        return future;
     }
 
     if (wakeup_thread) {
-        future_queue_push(future_thread_pool_get(cassandra_future), self);
+        future_queue_push(future_thread_pool_get(cassandra_future), future);
     }
-    rb_mutex_unlock(cassandra_future->proc_mutex);
 
-    return self;
+    return future;
+}
+
+/**
+ * Run block when future resolves to error.
+ *
+ * @return [Cassandra::Future] self.
+ * @raise [Cassandra::ExecutionError] If this method will be called twice.
+ * @raise [ArgumentError] If no block was given.
+ */
+static VALUE future_on_failure(VALUE self)
+{
+    CassandraFuture *cassandra_future;
+
+    GET_FUTURE(self, cassandra_future);
+
+    if (cassandra_future->on_failure_block) {
+        rb_raise(eExecutionError, "It should not call twice");
+    }
+    if (!rb_block_given_p()) {
+        rb_raise(rb_eArgError, "no block given");
+    }
+
+    return rb_mutex_synchronize(cassandra_future->proc_mutex, future_on_failure_synchronize, self);
 }
 
 /**
@@ -303,16 +313,18 @@ static VALUE future_await(VALUE self)
 
     GET_FUTURE(self, cassandra_future);
 
+    rb_mutex_lock(cassandra_future->proc_mutex);
     if (cassandra_future->already_waited) {
+        rb_mutex_unlock(cassandra_future->proc_mutex);
         return self;
     }
+    cassandra_future->already_waited = true;
+    rb_mutex_unlock(cassandra_future->proc_mutex);
 
+    nogvl_future_wait(cassandra_future->future);
     if (cassandra_future->on_success_block || cassandra_future->on_failure_block) {
         nogvl_sem_wait(&cassandra_future->sem);
-    } else {
-        nogvl_future_wait(cassandra_future->future);
     }
-    cassandra_future->already_waited = true;
     return self;
 }
 

data/lib/ilios/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '0.4.8'
+  VERSION = '0.4.9'
   public_constant :VERSION
 
   CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Watson
@@ -77,7 +77,7 @@ metadata:
   homepage_uri: https://github.com/Watson1978/ilios
   source_code_uri: https://github.com/Watson1978/ilios
   bug_tracker_uri: https://github.com/Watson1978/ilios/issues
-  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.8
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.9
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []