gamespy_query 0.2.0pre9 → 0.2.0pre10

data/lib/gamespy_query/base.rb

@@ -69,7 +69,7 @@ STR
       str
     end
 
-    PLATFORM_IR = /-mswin32/
+    PLATFORM_IR = RUBY_PLATFORM =~ /-mswin32/
 
     # Float Regex
     RX_F = /\A\-?[0-9]+\.[0-9]*\Z/

data/lib/gamespy_query/options.rb

@@ -128,8 +128,9 @@ module GamespyQuery
 
           run do |opts, args, cmd|
             opts = GamespyQuery::Options.setup_master_opts opts
-            process = GamespyQuery::SocketMaster.process_master(opts[:game], opts[:geo])
-            puts process
+            process = GamespyQuery::SocketMaster.process_master(opts[:game], opts[:geo], nil, false, true, true)
+            puts process.size
+            #puts process
           end
         end
 

data/lib/gamespy_query/socket.rb

@@ -11,8 +11,9 @@ module GamespyQuery
   class Socket < UDPSocket
     include Funcs
 
+
     # Default timeout per connection state
-    DEFAULT_TIMEOUT = 3
+    DEFAULT_TIMEOUT = 4
 
     # Maximum amount of packets sent by the server
     # This is a limit set by gamespy
@@ -113,7 +114,7 @@ module GamespyQuery
 
     # Temp Workaround for IO.select issue on IR
     def _read_non_block
-      if RUBY_PLATFORM =~ PLATFORM_IR
+      if PLATFORM_IR
         time_end = Time.now + DEFAULT_TIMEOUT
         success = false
         until success || Time.now >= time_end
@@ -222,7 +223,8 @@ module GamespyQuery
     end
 
     # Determine Read/Write/Exception state
-    def handle_state; [STATE_INIT, STATE_RECEIVED_CHALLENGE].include? state; end
+    WRITE_STATES = [STATE_INIT, STATE_RECEIVED_CHALLENGE]
+    def handle_state; WRITE_STATES.include? state; end
 
     # Process data
     # Supports challenge/response and multi-packet
@@ -250,13 +252,13 @@ module GamespyQuery
       begin
         until valid? || failed
           if handle_state
-            if RUBY_PLATFORM =~ PLATFORM_IR || IO.select(nil, [self], nil, DEFAULT_TIMEOUT)
+            if PLATFORM_IR || IO.select(nil, [self], nil, DEFAULT_TIMEOUT)
               handle_write
             else
               raise TimeOutError, "TimeOut during write, #{self}"
             end
           else
-            if RUBY_PLATFORM =~ PLATFORM_IR || IO.select([self], nil, nil, DEFAULT_TIMEOUT)
+            if PLATFORM_IR || IO.select([self], nil, nil, DEFAULT_TIMEOUT)
               handle_read
             else
               raise TimeOutError, "TimeOut during read, #{self}"

data/lib/gamespy_query/socket_master.rb

@@ -8,6 +8,8 @@ module GamespyQuery
     # Default maximum concurrent connections
     DEFAULT_MAX_CONNECTIONS = 128
 
+    DEFAULT_THREADS = 0
+
     # Configurable timeout in seconds
     attr_accessor :timeout
 
@@ -16,33 +18,64 @@ module GamespyQuery
 
     # Initializes the object
     # @param [Array] addrs List of addresses to process
-    def initialize addrs
+    def initialize addrs, info = false
       @addrs = addrs
+      @info = info
 
       @timeout, @max_connections = Socket::DEFAULT_TIMEOUT, DEFAULT_MAX_CONNECTIONS # Per select iteration
     end
 
     # Process the list of addresses
-    def process!
+    def process! use_threads = DEFAULT_THREADS
       sockets = []
+      if use_threads.to_i > 0
+        monitor = Monitor.new # TODO...
+        threads = []
+        addrs_list = @addrs.each_slice(@addrs.size / use_threads).to_a
+        use_threads.times.each do |i|
+          list = addrs_list.shift
+          break if list.nil? || list.empty?
+          puts "Spawning thread #{i}" if @info
+
+          threads << Thread.new(list, i) do |addrs, id|
+            puts "Thread: #{id} Start, #{addrs.size}" if @info
+            out = proc(addrs, monitor)
+
+            puts "Thread: #{id} Pushing output to list. #{out.size}" if @info
+            monitor.synchronize do
+              sockets += out
+            end
+            puts "Thread: #{id} End" if @info
+          end
+        end
+        threads.each {|t| t.join}
+      else
+        sockets = proc @addrs
+      end
 
-      until @addrs.empty?
-        addrs = @addrs.shift @max_connections
-        queue = addrs.map { |addr| Socket.new(addr) }
+      return sockets
+    end
+
+    def proc addrs_list
+      sockets = []
 
+      until addrs_list.empty?
+        addrs = addrs_list.shift @max_connections
+
+        queue = addrs.map { |addr| Socket.new(addr) }
         sockets += queue
 
         until queue.empty?
           # Fill up the Sockets pool until max_conn
-          if FILL_UP_ON_SPACE && queue.size < @max_connections
-            addrs = @addrs.shift (@max_connections - queue.size)
+          if FILL_UP_ON_SPACE && queue.size < @max_connections && !addrs_list.empty?
+            addrs = addrs_list.shift (@max_connections - queue.size)
             socks = addrs.map { |addr| Socket.new(addr) }
 
             queue += socks
             sockets += socks
           end
 
-          write_sockets, read_sockets = queue.reject {|s| s.valid? }.partition {|s| s.handle_state }
+          write_sockets, read_sockets = queue.partition {|s| s.handle_state }
 
           unless ready = IO.select(read_sockets, write_sockets, nil, @timeout)
             Tools.logger.warn "Timeout, no usable sockets in current queue, within timeout period (#{@timeout}s)"
@@ -51,7 +84,7 @@ module GamespyQuery
             next
           end
 
-          Tools.debug {"Sockets: #{queue.size}, AddrsLeft: #{@addrs.size}, ReadReady: #{"#{ready[0].size} / #{read_sockets.size}, WriteReady: #{ready[1].size} / #{write_sockets.size}, ExcReady: #{ready[2].size} / #{queue.size}" unless ready.nil?}"}
+          Tools.debug {"Sockets: #{queue.size}, AddrsLeft: #{addrs_list.size}, ReadReady: #{"#{ready[0].size} / #{read_sockets.size}, WriteReady: #{ready[1].size} / #{write_sockets.size}, ExcReady: #{ready[2].size} / #{queue.size}" unless ready.nil?}"}
 
           # Read
           ready[0].each { |s| begin; s.handle_read(); rescue nil, Exception => e; queue.delete(s); end }
@@ -61,10 +94,11 @@ module GamespyQuery
 
           # Exceptions
           #ready[2].each { |s| queue.delete(s) unless s.handle_exc }
+          queue.reject! {|s| s.valid? }
         end
       end
 
-      return sockets
+      sockets
     end
 
     class <<self
@@ -73,7 +107,7 @@ module GamespyQuery
       # @param [String] game Game to fetch info from
       # @param [String] geo Geo location enabled?
       # @param [Array] remote Hostname and path+filename strings if the list needs to be fetched from http server
-      def process_master(game = "arma2oapc", geo = nil, remote = nil, dedicated_only = false, sm_dedicated_only = true)
+      def process_master(game = "arma2oapc", geo = nil, remote = nil, dedicated_only = false, sm_dedicated_only = true, info = false)
         master = GamespyQuery::Master.new(geo, game)
         list = if remote
                  Net::HTTP.start(remote[0]) do |http|
@@ -98,9 +132,11 @@ module GamespyQuery
           dat
         end
 
-        sm = GamespyQuery::SocketMaster.new(gm_dat.keys)
+        sm = GamespyQuery::SocketMaster.new(gm_dat.keys, info)
         sockets = sm.process!
-        sockets.select{|s| s.valid? }.each do |s|
+        valid_sockets = sockets.select{|s| s.valid? }
+        puts "Sockets: #{sockets.size}, Valid: #{valid_sockets.size}" if info
+        valid_sockets.each do |s|
           begin
             data = gm_dat[s.addr]
             data[:ip], data[:port] = s.addr.split(":")

data/lib/gamespy_query/version.rb

@@ -1,4 +1,4 @@
 module GamespyQuery
   # Version of the library
-  VERSION = "0.2.0pre9"
+  VERSION = "0.2.0pre10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gamespy_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0pre9
+  version: 0.2.0pre10
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri