asynchronic 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 823dcc2c35bf1f7df17c20f250353123fa85c205
-  data.tar.gz: c6f9507f48e4cb8b4e17051dcf30333bb1747b0b
+  metadata.gz: f5e63019f4cecfab21e005adaf3f0ca4cb18fac6
+  data.tar.gz: 208ef42aa7f3b6ed1a395650d09944b53e8d425d
 SHA512:
-  metadata.gz: 30d4424ab6e16190dbcd2404259bfa0720db02e092d6998f3fd8c1129e0e1d4b47064aed4a4a571dd85a5f3ab871a8a11091ca22c2a9d9d5d759e568c6efda8d
-  data.tar.gz: deb0672e6e9d1e4bf01017a8db5775cf6c2b57dc5e65257c333f7e8dd1fbb60e0562ff9dbe9533ec57bb5f74adc891967d48a2d80bcefd658b163a1a95f49d3e
+  metadata.gz: ff558de68371b4af458784cb02fdf2ca97e712f3525670608f5c1008a66bcf4d32072f73b6c7e3efa824d8a03c1ed13acb97976c474290316d30847df0a7c198
+  data.tar.gz: 86fcec1a2c20383b4dcc29dea9b1926f1b3ea52d61dabffe62482e7c3d1faefc872b48a9832c75afb3156af1cb335dd67709070726d2802e308d2f1323c0fe3c

data/lib/asynchronic/data_store/in_memory.rb

@@ -7,6 +7,7 @@ module Asynchronic
       def initialize(hash={})
         @hash = {}
         @mutex = Mutex.new
+        @keys_mutex = Hash.new { |h,k| h[k] = Mutex.new }
         self.class.connections[object_id] = self
       end
 
@@ -26,6 +27,10 @@ module Asynchronic
         @hash.keys.map { |k| Key.new k }
       end
 
+      def synchronize(key, &block)
+        @keys_mutex[key].synchronize &block
+      end
+
       def connection_args
         [object_id]
       end

data/lib/asynchronic/data_store/redis.rb

@@ -2,6 +2,9 @@ module Asynchronic
   module DataStore
     class Redis
 
+      TIMEOUT = 0.001
+      LOCKED = 'locked'
+
       include Helper
 
       def initialize(scope, *args)
@@ -29,6 +32,15 @@ module Asynchronic
         @connection.keys(@scope['*']).map { |k| Key.new(k).remove_first }
       end
 
+      def synchronize(key)
+        while @connection.getset(@scope[key][LOCKED], LOCKED) == LOCKED
+          sleep TIMEOUT
+        end
+        yield
+      ensure
+        @connection.del @scope[key][LOCKED]
+      end
+
       def connection_args
         [@scope, @connection.client.options]
       end

data/lib/asynchronic/data_store/scoped_store.rb

@@ -30,6 +30,10 @@ module Asynchronic
           map { |k| Key.new(k).remove_first @scope.sections.count }
       end
 
+      def synchronize(key, &block)
+        data_store.synchronize(key, &block)
+      end
+
       def connection_args
         [
           {

data/lib/asynchronic/process.rb

@@ -85,19 +85,21 @@ module Asynchronic
     end
 
     def wakeup
-      if waiting?
-        if processes.any?(&:aborted?)
-          abort! Error.new "Error caused by #{processes.select(&:aborted?).map{|p| p.name}.join(', ')}"
-        elsif processes.all?(&:completed?)
-          completed!
-        else
-          processes.each do |p|
-            p.enqueue if p.ready?
+      data_store.synchronize(id) do
+        if waiting?
+          if processes.any?(&:aborted?)
+            abort! Error.new "Error caused by #{processes.select(&:aborted?).map{|p| p.name}.join(', ')}"
+          elsif processes.all?(&:completed?)
+            completed!
+          else
+            processes.each do |p|
+              p.enqueue if p.ready?
+            end
           end
         end
-      end
 
-      parent.wakeup if parent && finalized?
+        parent.wakeup if parent && finalized?
+      end
     end
 
     def nest(type, params={})

data/lib/asynchronic/version.rb

@@ -1,3 +1,3 @@
 module Asynchronic
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/data_store/data_store_examples.rb

@@ -90,5 +90,21 @@ module DataStoreExamples
 
     no_lazy_store[:key].must_equal 2
   end
+
+  it 'Synchronization' do
+    sum = 0
+    threads = 1.upto(100).map do |i|
+      Thread.new do
+        data_store.synchronize('xxx') do
+          temp = sum
+          sleep 0
+          sum = temp + 1
+        end
+      end
+    end
+    threads.each(&:join)
+      
+    sum.must_equal 100
+  end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asynchronic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis