bake-toolkit 2.34.1 → 2.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b11e2453cd82049d2070eb49b22ecb28d8048bde
-  data.tar.gz: f10d2cd9bfeca29b371f7c9ee20fad0147390410
+  metadata.gz: 98b05bb56fe7c5eaf9c8d6c6a3c542736a790ced
+  data.tar.gz: 79780886841138ccce28d47f67debb6233d55da5
 SHA512:
-  metadata.gz: f0bb5910da86ad9840662d921af520b44cb7b63b14c265ab3e3cf9e2ba3d800f23dc888fdffaea3fea7db4f6f482a088bede87ec5a968713c2eecf5825564a60
-  data.tar.gz: bbb83467b457996c83a751383f90bae049cdba3d60c9a60258457a06a62b04bc20783ccb7c35c13b1f9eb790b9609f97aabe2f20a252cb592a5e6a9d0b6a8486
+  metadata.gz: f986ef4d25e75f8e6afed97a91205a5794f5165509a2afcb501863276475e79fff702dec233300d9011cc1373ae9bc3a80b37097090bd8e1c6c7434d4ed3c419
+  data.tar.gz: c3af0083a89660fc6bd08d86a3ea6a27ab9778e5a604cb10ce9abdc6108c739737eea2c275d3b9933139ce729458f03c4be7c2cff5c6ef5807d5505743e26987

data/bin/bakery

@@ -138,11 +138,11 @@ module Bake
     Bake::cleanup
     ExitHelper.reset_exit_code
 
-    if runOk == false
+    if runOk == false && abort == false
       exitValue = 1
       failedRuns << "bake " + cmd.join(" ")
       if @options.error
-        msg1 << "aborted"
+        msg1 << "stopped on first error"
         abort = true
         break
       end

data/lib/blocks/block.rb

@@ -187,7 +187,9 @@ module Bake
       def self.waitForAllThreads
         if @@threads.length > 0
           STDOUT.puts "DEBUG_THREADS: Wait for all threads." if Bake.options.debug_threads
-          ThreadsWait.all_waits(@@threads)
+          ThreadsWait.all_waits(@@threads) { |t|
+            STDOUT.puts "DEBUG_THREADS: Waited for #{t.object_id}"
+          }
           @@threads = []
           STDOUT.puts "DEBUG_THREADS: All threads finished." if Bake.options.debug_threads
         end
@@ -289,7 +291,7 @@ module Bake
           begin
             STDOUT.puts "DEBUG_THREADS: Wait for free thread." if Bake.options.debug_threads
             endedThread = ThreadsWait.new(@@threads).next_wait
-            STDOUT.puts "DEBUG_THREADS: Thread free." if Bake.options.debug_threads
+            STDOUT.puts "DEBUG_THREADS: Thread free: #{endedThread.object_id}" if Bake.options.debug_threads
             @@threads.delete(endedThread)
           rescue ErrNoWaitingThread
           end
@@ -494,6 +496,7 @@ module Bake
         @@threads = []
         @@result = true
         @@mutex = Mutex.new
+        Bake::Multithread::Jobs.init_semaphore()
       end
 
       def startup

data/lib/common/process.rb

@@ -6,7 +6,7 @@ module Bake
 
     def self.run(cmdLineArray, immediateOutput=false, force=true, outpipe=nil, exitCodeArray = [0], dir = Dir.pwd)
       rd, wr = IO.pipe
-      @@rd = rd if force
+      @@rd = force ? rd : nil
       duppedCmdLineArray = cmdLineArray.dup
       duppedCmdLineArray << { :chdir=>dir, :err=>wr, :out=>(outpipe ? outpipe : wr) }
       begin
@@ -14,7 +14,7 @@ module Bake
       rescue Exception => e
         return [false, e.message]
       end
-      @@pid = pid if force
+      @@pid = force ? pid : nil
       wr.close
       output = ""
       begin
@@ -42,22 +42,38 @@ module Bake
       pid, status = Process.wait2(pid)
       @@pid = nil
       @@rd = nil
+
+      if status.nil? && output.empty?
+        puts output.inspect
+        output = "Process returned with unknown exit status"
+        puts output if immediateOutput
+      end
       return [false, output] if status.nil?
+
       exitCodeArray = [0] if exitCodeArray.empty?
-      [(exitCodeArray.include?status.exitstatus), output]
+      ret = (exitCodeArray.include?status.exitstatus)
+      if ret == false && output.empty?
+        output = "Process returned with exit status #{status.exitstatus}"
+        puts output if immediateOutput
+      end
+      [ret, output]
     end
 
     def self.killProcess(force) # do not kill compile processes or implement rd and pid array if really needed
-      begin
-        @@rd.close
-      rescue Exception => e
+      if @@rd
+        begin
+          @@rd.close
+        rescue Exception => e
+        end
+        @@rd = nil
       end
-      begin
-        Process.kill("KILL",@@pid)
-      rescue Exception => e
+      if @@pid
+        begin
+          Process.kill("KILL",@@pid)
+        rescue Exception => e
+        end
+        @@pid = nil
       end
-      @@rd = nil
-      @@pid = nil
     end
 
   end

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.34.1"
+      "2.34.2"
     end
 
     def self.printBakeVersion(ry = "")
@@ -23,6 +23,7 @@ module Bake
 
   expectedRGen = "0.8.2"
   expectedRText = "0.9.0"
+  expectedConcurrent = "1.0.5"
 
   begin
     gem "rgen", "=#{expectedRGen}"
@@ -36,4 +37,10 @@ module Bake
     puts "Warning: Failed to load rtext #{expectedRText}, using latest version"
   end
 
+  begin
+    gem "concurrent-ruby", "=#{expectedConcurrent}"
+  rescue Exception => e
+    puts "Warning: Failed to load concurrent-ruby #{expectedConcurrent}, using latest version"
+  end
+
 end

data/lib/multithread/job.rb

@@ -1,36 +1,21 @@
 require 'common/ext/stdout'
 require 'stringio'
 require 'thread'
+require 'concurrent/atomic/mutex_semaphore'
 
 module Bake
   module Multithread
 
     class Jobs
 
-      @@mutex_sempaphore = Mutex.new
-      @@running_threads = 0
-      @@waiting_threads = 0
-      @@cv = ConditionVariable.new
-
       def self.incThread
-        @@mutex_sempaphore.synchronize do
-          if @@running_threads >= Bake.options.threads
-            @@waiting_threads += 1
-            @@cv.wait(@@mutex_sempaphore)
-            @@waiting_threads -= 1
-            @@running_threads += 1
-          else
-            @@running_threads += 1
-          end
-        end
+        @@semaphore.acquire
       end
       def self.decThread
-        @@mutex_sempaphore.synchronize do
-          @@running_threads -= 1
-          if @@waiting_threads > 0
-            @@cv.signal
-          end
-        end
+        @@semaphore.release
+      end
+      def self.init_semaphore
+        @@semaphore = ::Concurrent::MutexSemaphore.new(Bake.options.threads)
       end
 
       def initialize(jobs, &block)
@@ -41,9 +26,12 @@ module Bake
           @threads << ::Thread.new(Thread.current[:stdout], Thread.current[:errorStream]) do |outStr, errStr|
             Thread.current[:stdout] = outStr
             Thread.current[:errorStream] = errStr
-            Jobs.incThread()
-            block.call(self)
-            Jobs.decThread()
+            begin
+              Jobs.incThread()
+              block.call(self)
+            ensure
+              Jobs.decThread()
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.34.1
+  version: 2.34.2
 platform: ruby
 authors:
 - Alexander Schaal
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.7.8
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement