safe_regexp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7989a74f69ebade41d93d489dc195534a979ac9a85e985c6d6461a8db53d65f0
-  data.tar.gz: 333a79c41170a8282832b908bbc71e86198b430f752746267b665deffaf998a0
+  metadata.gz: a08c39c5fefd324f445219dd0a9c1480fc6e7fb9a8d87d2a8c94cb8fe9ffe842
+  data.tar.gz: 5a0fcafc1b454f4cbb870d3ca5ec6052614688c6f1431cd9e413e2542e07a691
 SHA512:
-  metadata.gz: 703a1ff819189b105b8a26c6ff78cb9670d0e898538759c05d807570b9a6eaf59cd78827185b8bc3dcd55e039aa2bb82cee63c26cfd1d7468f50cc14b9ec7948
-  data.tar.gz: 7a91b3448c11a695ba54dd0beaf6011ee00e9809bd147f9dd96721e764c413efbab926fba3ea2ad450ae72c4a1fc07096bd76a0af627fece1df8044d01482717
+  metadata.gz: dfce8cc283436b706e02be017a6b5cc515255ff058b853c10cfbd9c568ae8e5e73f7e8f368a3fbf6bb97164cb6ec6caee1845973dc5e0e13f1147664fc972b65
+  data.tar.gz: 05ae09e0f259262cc3f5b93b6c180ecea9031efc8f17e1234b04d0720bc057707d959b0a978d2d0c0cb2021e4e3d68f0ba53a8623170ebded1c752a91ecc6331

data/lib/safe_regexp/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SafeRegexp
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/safe_regexp.rb

@@ -9,22 +9,36 @@ module SafeRegexp
   class << self
     def execute(regex, method, string, timeout: 1, keepalive: 10)
       retried = false
+
       begin
-        read, write, pid = executor
-        Marshal.dump([regex, method, string, keepalive], write)
-      rescue Errno::EPIPE # keepalive already killed the process
-        raise if retried
+        loading_result = false
+
+        begin
+          read, write, pid = executor
+          Marshal.dump([regex, method, string, keepalive], write)
+        rescue Errno::EPIPE
+          # keepalive already killed the process, but we don't check before sending
+          # since that would be a race condition and cause overhead for the 99.9% case
+          raise if retried
+          retried = true
+          discard_executor # avoiding kill overhead since it's already dead
+          retry # new executor will be created by `executor` call
+        end
+
+        unless IO.select([read], nil, nil, timeout)
+          kill_executor pid
+          raise RegexpTimeout
+        end
+
+        loading_result = true
+        result = Marshal.load(read)
+      rescue EOFError # process was dead from keepalive when we sent to it or got killed from outside
+        raise if retried || !loading_result
         retried = true
         discard_executor # avoiding kill overhead since it's already dead
-        retry # new executor will be created by `executor` call
-      end
-
-      unless IO.select([read], nil, nil, timeout)
-        kill_executor pid
-        raise RegexpTimeout
+        retry
       end
 
-      result = Marshal.load(read)
       result.is_a?(RESCUED_EXCEPTION) ? raise(result) : result
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_regexp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it