msg-batcher 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac80b44e3f48248b2355ee73c5ed6346a492f9f5749ba670fbc18310171535cc
-  data.tar.gz: 42537898648e2e953ebb3df19fec938db4cc8da487f5014569a4477a71c666ff
+  metadata.gz: c39c802008e79837870af5f88a607a52bc0d1fe47a634012b2fb9d683560d726
+  data.tar.gz: c2ca34fdb97390eb44953dcd2fd3fbefdad4c15f380ca52384ba1d7e1ff0e113
 SHA512:
-  metadata.gz: 8a478b76db6a65bb7a428e01d714a76486f7d1932328b0157da799f83fb05767cab488108ae7dd16b531110e99ea3b6d5dcae15e02bd667e6e9b52e27caea955
-  data.tar.gz: fade326da9e58081a4a8d89d8f05bd368995556c97a12a805f38802974cbe481a3c54a597c1cf23764bd476463269f5b9bd41c62ea6b0d5c58829763704494bc
+  metadata.gz: 6398ddc1c414860880e4ed71e885856c657a5de8bc04e867fae8aa0c636b9ae9cdb8fe0d3228cb1eae086671ba9f6d82ff908c09b5b0215753d07792e05a4995
+  data.tar.gz: 2c301ea4cb70350c1a5a048612d7959dbda580897b99567d6b61a2ac3ee221271883040f70a4bbfb07c9916fa83407b2776d60b059fe251534217df01a73ec0c

data/lib/msg-batcher.rb

@@ -35,15 +35,26 @@ class MsgBatcher
     start_timer
   end
 
-  def kill
-    @closed = true
-    @timer_thread.exit
+  def kill(blocking: true)
+    # no #push will interfere
+    @m.synchronize do
+      # want to make sure that timer thread is in a waiting position. Hence, acquiring @m2
+      @m2.synchronize do
+        @closed = true
+        # releasing timer thread
+        @timer_start_cv.signal
+        # This can happen, however, that timer thread will wait timeout on @timer_release_cv.
+        # If it was waiting on @timer_start_cv. Because timer thread won't reach @timer_release_cv wait poisition
+        @timer_release_cv.signal
+      end
+      @timer_thread.join if blocking
+    end
   end
 
   # Thread-safe
   # @raise [Error] when invoked when batcher has been closed
   def push(entry)
-    raise Error, "Batcher is closed - cannot push" if @closed
+    raise Error, 'Batcher is closed - cannot push' if @closed
 
     @m.lock
     @m2.lock
@@ -78,7 +89,7 @@ class MsgBatcher
     @storage = []
 
     @already_released = true
-    dputs "kill timer"
+    dputs 'kill timer'
     @timer_release_cv.signal # informing timer that release is happening
 
     # Now interesting happens
@@ -91,12 +102,20 @@ class MsgBatcher
     # So now we can be sure that timer is at the beginning, ready to wait for @timer_start_cv signal.
 
     if from_push
-      dputs "--------before wait m2"
+      dputs '--------before wait m2'
       @timer_full_cycle_cv.wait @m2
       @m2.unlock
-      dputs "-----22222"
+      dputs '-----22222'
       @m.unlock
-      dputs "---- unlock all"
+      dputs '---- unlock all'
+    end
+
+    if temp.empty?
+      # The situation when the batch is empty should not happen.
+      # However, when the batcher is killed and the timer thread is forced to finish this can happen
+      # In any case, just ignoring this empty batch and do not call callback on it
+      warn 'MsgBatcher: empty batch. This should not have happened' unless @closed
+      return
     end
 
     begin
@@ -116,31 +135,28 @@ class MsgBatcher
         @already_released = false
         # informing release that timer is at the beginning
         @timer_full_cycle_cv.signal
-        dputs "sdlkfjsd"
-
-
+        dputs 'sdlkfjsd'
 
         # Position: TT1
         # Wait for invocation from push
         # Each release invocation finishes when timer thread are below (waiting for @timer_start_cv)
-
-        dputs "TT1"
+        dputs 'TT1'
         @timer_start_cv.wait @m2
-        dputs "TT1 after wait"
+
+        dputs 'TT1 after wait'
         @timer_started_cv.signal
 
-        dputs "TT2"
+        dputs 'TT2'
         # then wait either time to elapse or signal that data has been released
         @timer_release_cv.wait @m2, @max_time_msecs / 1000.0
-
         dputs "timer end #{@m2.owned?}"
-
         # @m2 is locked here!
-
         unless @already_released
           dputs "timer's release"
           release(false)
         end
+
+        break if @closed
       end
     end
     # wait for timer to be in waiting state

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msg-batcher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - ertygiq
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby library that facilitates thread-safe batch processing of messages.
   In certain situations, processing multiple messages in batch is more efficient than