extreme_timeout 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d98ba4c245814afabec6e1f5fc5a23d3eee686
-  data.tar.gz: 4ce0b834aa9ee9bf52cc087208850cda2a3bee85
+  metadata.gz: 7754f3b91ffc5530ee342f1ce0bf1656a6849a0d
+  data.tar.gz: 722846c93dd5ccc6f2829cc96d8b3ecfc026455b
 SHA512:
-  metadata.gz: 7545df380d0d7c3f41b367e4f0019e8f3b224ddae253c6b7158029f61a8e4c336184873038bfdac71d4b15266ca4b7daa10c7ce3c39dbf084b078a9ee9714976
-  data.tar.gz: 31f5f53757e9b8b5129f41ca60f222d1db8b437be343113172bd1b64e137c878947e7cc73924068fa49cd3a5e8c11c87081422a5bf14b29b1dfbd4cd685c6827
+  metadata.gz: 2c0d7a96b0f5964780b876f7a53f4531cea70e10074a2c493ed48704ddbce3c67240b38c7e1d56d3c6ea2a34e140f5b8ba49cee3a62c04bec4946c61cc6e82bb
+  data.tar.gz: f79640ff7b1455e7d4f10b5a482e147ad006b35877f41428bf7d637511c4c6307ca3195c7f6cb9d4a1da862c37209f376d6a938fe50cdad08489dff80e7c317d

data/ext/extreme_timeout/extreme_timeout.c

@@ -65,17 +65,27 @@ sleep_thread_main(void *_arg)
 
     pthread_mutex_lock(&exitcode_mutex);
     exitcode = arg->exitcode;
-    set_stacktrace_dumper();
-    if (pthread_kill(arg->running_thread, SIGCONT) == 0) {
-        pthread_join(arg->running_thread, NULL);
+    if (!rb_during_gc()) {
+      set_stacktrace_dumper();
+      if (pthread_kill(arg->running_thread, SIGCONT) == 0) {
+          pthread_join(arg->running_thread, NULL);
+      }
+    } else {
+      exit(exitcode);
     }
     return NULL;
 }
 
+static VALUE
+timeout_cb(VALUE block)
+{
+    return rb_funcall(block, rb_intern("call"), 0);
+}
+
 VALUE
 timeout(int argc, VALUE *argv, VALUE self)
 {
-    int exitcode = 1;
+    int exitcode = 1, state;
     unsigned int timeout_sec = 0;
     VALUE timeout_sec_value, exitcode_value, block;
     pthread_t thread;
@@ -108,7 +118,7 @@ timeout(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eRuntimeError, "pthread_create was failed");
     }
 
-    retval = rb_funcall(block, rb_intern("call"), 0);
+    retval = rb_protect(timeout_cb, block, &state);
 
     pthread_cancel(thread);
     pthread_join(thread, NULL);

data/extreme_timeout.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "extreme_timeout"
-  spec.version       = "0.3.0"
+  spec.version       = "0.3.1"
   spec.authors       = ["Masaya SUZUKI"]
   spec.email         = ["draftcode@gmail.com"]
   spec.description   = "Timeout from the outside of the GVL"

data/spec/extreme_timeout_spec.rb

@@ -73,5 +73,14 @@ describe ExtremeTimeout do
         expect(stderr.read).to start_with("Process exits(ExtremeTimeout::timeout)\n")
       end
     end
+
+    it 'discards timeout if an exception was raised' do
+      begin
+        ExtremeTimeout::timeout(1) { raise Exception.new }
+        fail 'An exception should be raised'
+      rescue Exception
+        sleep(5)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extreme_timeout
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Masaya SUZUKI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler