acpc_table_manager 3.0.11 → 3.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6045e649f8474fe093e827a3fd6c659aa639a26
-  data.tar.gz: c19ca84bbb26ce0285dbcb6d7a2bae23dda3c341
+  metadata.gz: f0e45bdd8fff4488222915a4e977067542d335c4
+  data.tar.gz: '0992f61ada4f67006c53c1653ef371f1d11f6950'
 SHA512:
-  metadata.gz: e58888e75fd4f7918cd41a3ad5cb23be6406d05a28e52a38fed941552e8f8ff68519008bdadf84f8fe1a53d3dcbb99cd2d463bf3e1d08d62c811f3a1649303cb
-  data.tar.gz: 0356b56a54da1ae702bacd23c575cc541c184f127db14ceb5a1ce2ba812ffcfe49f47900551c9e50909fffeb16dbf2627f9ae27a2604a981be7fedecdfed7b9d
+  metadata.gz: 654139f50b17ec5541c14b977049d47e67aae1caccc55c70297938cae5828eb344efd9d3c54e255242da02953b0047e74575c71b33bc03f5efc0dd6ae5fafd19
+  data.tar.gz: 3a2ad7ac571d4a9beba6bd6e020023e289f5dda4840e5e305a8bc4e795a1b55637c06c2022786c5856d22c4816db4c4839a7b6b83d3b3cb10888a88ba38fdf1c

data/lib/acpc_table_manager/match.rb

@@ -113,7 +113,11 @@ class Match
     end
 
     def ports_in_use(matches=all)
-      running(matches).inject([]) { |ports, m| ports += m.port_numbers }
+      ports = []
+      matches.possibly_running.each do |match|
+        ports += m.port_numbers if match.running?
+      end
+      ports
     end
 
     def kill_all_orphan_processes!(matches=all)

data/lib/acpc_table_manager/table_queue.rb

@@ -91,27 +91,30 @@ module AcpcTableManager
     end
 
     def check!
+      my_matches_to_start = matches_to_start.to_a
+      num_running_matches = Match.running(my_matches).length
       log(
         __method__,
         {
-            num_running_matches: Match.running(my_matches).length,
-            num_matches_to_start: matches_to_start.length
+            num_running_matches: num_running_matches,
+            num_matches_to_start: my_matches_to_start.length
         }
       )
 
       matches_started = []
       while (
-        !matches_to_start.empty? &&
-        Match.running(my_matches).length < AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
+        !my_matches_to_start.empty? &&
+        num_running_matches < AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
       )
-        matches_started << dequeue
+        matches_started << dequeue(my_matches_to_start.pop)
+        num_running_matches += 1
       end
 
       log(
         __method__,
         {
           matches_started: matches_started,
-          num_running_matches: Match.running(my_matches).length,
+          num_running_matches: num_running_matches,
           num_matches_to_start: matches_to_start.length
         }
       )
@@ -121,13 +124,13 @@ module AcpcTableManager
 
     protected
 
-    def port(available_ports_)
-      port_ = available_ports_.pop
+    def port(available_ports)
+      port_ = available_ports.pop
       while !AcpcDealer::port_available?(port_)
-        if available_ports_.empty?
+        if available_ports.empty?
           raise NoPortForDealerAvailable.new("None of the special ports (#{available_special_ports}) are open")
         end
-        port_ = available_ports_.pop
+        port_ = available_ports.pop
       end
       unless port_
         raise NoPortForDealerAvailable.new("None of the special ports (#{available_special_ports}) are open")
@@ -135,18 +138,22 @@ module AcpcTableManager
       port_
     end
 
+    def ports_to_use(special_port_requirements, available_ports = nil)
+      ports = special_port_requirements.map do |r|
+        if r
+          # Slow. Only check available special ports if necessary
+          available_ports ||= available_special_ports
+          port(available_ports)
+        else
+          0
+        end
+      end
+      return ports, available_ports
+    end
+
     # @return [Object] The match that has been started or +nil+ if none could
     #   be started.
-    def dequeue
-      my_matches_to_start = matches_to_start
-      log(
-        __method__,
-        num_matches_to_start: my_matches_to_start.length
-      )
-      return nil if my_matches_to_start.empty?
-
-      match = my_matches_to_start.last
-
+    def dequeue(match)
       log(
         __method__,
         msg: "Starting dealer for match \"#{match.name}\" (#{match.id})",
@@ -158,10 +165,7 @@ module AcpcTableManager
       # Add user's port
       special_port_requirements.insert(match.seat - 1, false)
 
-      available_ports_ = available_special_ports
-      ports_to_be_used = special_port_requirements.map do |r|
-        if r then port(available_ports_) else 0 end
-      end
+      ports_to_be_used, available_ports = ports_to_use(special_port_requirements)
 
       num_repetitions = 0
       dealer_info = nil
@@ -170,7 +174,7 @@ module AcpcTableManager
         log(
           __method__,
           msg: "Added #{match.id} list of running matches",
-          available_special_ports: available_ports_,
+          available_special_ports: available_ports,
           special_port_requirements: special_port_requirements,
           :'ports_to_be_used_(zero_for_random)' => ports_to_be_used
         )
@@ -183,14 +187,12 @@ module AcpcTableManager
             Logger::Severity::WARN
           )
           begin
-            ports_to_be_used = special_port_requirements.map do |r|
-              if r then port(available_ports_) else 0 end
-            end
+            ports_to_be_used, available_ports = ports_to_use(special_port_requirements, available_ports)
           rescue NoPortForDealerAvailable => e
-            available_ports_ = available_special_ports
+            available_ports = available_special_ports
             log(
               __method__,
-              {warning: "#{ports_to_be_used} ports unavailable, retrying with all special ports, #{available_ports_}."},
+              {warning: "#{ports_to_be_used} ports unavailable, retrying with all special ports, #{available_ports}."},
               Logger::Severity::WARN
             )
           end
@@ -198,7 +200,7 @@ module AcpcTableManager
             sleep 1
             log(
               __method__,
-              {warning: "Retrying with all special ports, #{available_ports_}."},
+              {warning: "Retrying with all special ports, #{available_ports}."},
               Logger::Severity::WARN
             )
             num_repetitions += 1

data/lib/acpc_table_manager/version.rb

@@ -1,3 +1,3 @@
 module AcpcTableManager
-  VERSION = "3.0.11"
+  VERSION = "3.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_table_manager
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.12
 platform: ruby
 authors:
 - Dustin Morrill