diameter 0.1.0.pre1 → 0.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e140baae5544d85586d01a9dbd1000c63d95aab0
-  data.tar.gz: c8407d154a3498d9d159acf99c1222043a288760
+  metadata.gz: 094780fda8c683887185f52d477741b15ad4fa33
+  data.tar.gz: e96a298d199fd0b2b1f5964829bd29ffbc4eb2cc
 SHA512:
-  metadata.gz: 5e8e0a512e7b9ec8111a7e8d8e70252a6e0deaad7b966013a8a80be8bfb8f0d84dcfcfa65caa7264e7798ab4b39f08ed1fdcb616cc0307914b4ff9534e86722b
-  data.tar.gz: 44f4430b63e1c4a02c6f477ac89e37a2f0b94897a39e51ccae13eee62e73c0eba8f48ac7a35f74106b8d4cfa01312fa59b9128d40c53dd7be70cc57160d05a29
+  metadata.gz: 910ab518a7907dc8cff3277df5a86ac4572296ee5341a6afdee5bb0485ba94f449dcf0bf100422382a1906afdac9a3449a3db4bcf8602d33ebfed2f82c4e1799
+  data.tar.gz: b8d2ec9c8fe0426f3ef880987caa1d842853219b537a8e66a1b222af122baf77d5d87474ecf9a9dcaaeb59a754205bb7031dfcf1f401563187f994914d0418d2

data/lib/diameter/stack.rb

@@ -22,6 +22,15 @@ module Diameter
       @tcp_helper = TCPStackHelper.new(self)
       @peer_table = {}
       @handlers = {}
+
+      @threadpool = pool = Concurrent::ThreadPoolExecutor.new(
+                                                              min_threads: 5,
+                                                              max_threads: 5,
+                                                              max_queue: 100,
+                                                              overflow_policy: :caller_runs
+                                                              )
+
+      
       Diameter.logger.log(Logger::INFO, 'Stack initialized')
     end
 
@@ -51,6 +60,12 @@ module Diameter
 
     def shutdown
       @tcp_helper.shutdown
+      @pending_ete.each do |ete, q|
+        Diameter.logger.debug("Shutting down queue #{q} as no answer has been received with EtE #{ete}")
+        q.push :shutdown
+      end
+      @threadpool.kill
+      @threadpool.wait_for_termination(5)
     end
 
     def close(connection)
@@ -91,15 +106,15 @@ module Diameter
       fail "Must pass a request" unless req.request
       req.add_avp('Origin-Host', @local_host) unless req.has_avp? 'Origin-Host'
       req.add_avp('Origin-Realm', @local_realm) unless req.has_avp? 'Origin-Realm'
-      q = Queue.new
-      @pending_ete[req.ete] = q
       peer_name = req.avp_by_name('Destination-Host').octet_string
       state = peer_state(peer_name)
       if state == :UP
         peer = @peer_table[peer_name]
         @tcp_helper.send(req.to_wire, peer.cxn)
-        p = Concurrent::Promise.execute {
-          Diameter.logger.debug("Waiting for answer to message with EtE #{req.ete}")
+        q = Queue.new
+        @pending_ete[req.ete] = q
+        p = Concurrent::Promise.execute(executor: @threadpool) {
+          Diameter.logger.debug("Waiting for answer to message with EtE #{req.ete}, queue #{q}")
           val = q.pop
           Diameter.logger.debug("Promise fulfilled for message with EtE #{req.ete}")
           val
@@ -233,7 +248,6 @@ module Diameter
 
     def handle_cea(cea)
       peer = cea.avp_by_name('Origin-Host').octet_string
-      # puts peer
       if @peer_table.has_key? peer
         @peer_table[peer].state = :UP
         @peer_table[peer].reset_timer

data/lib/diameter/stack_transport_helpers.rb

@@ -3,6 +3,10 @@ require 'socket'
 require 'diameter/message'
 require 'diameter/avp'
 
+if RUBY_ENGINE != 'jruby'
+  ServerSocket = Socket
+end
+
 module Diameter
   module Internals
     # @private
@@ -15,6 +19,7 @@ module Diameter
         @loop_thread = nil
         @accept_loop_thread = nil
         @connection_lock = Mutex.new
+        @wakeup_pipe_rd, @wakeup_pipe_wr = IO.pipe
       end
 
       def start_main_loop
@@ -27,25 +32,25 @@ module Diameter
       end
 
       def wakeup
-        @loop_thread.raise
+        @wakeup_pipe_wr.puts "wakeup"
       end
 
       def main_loop
-        begin
-          rs, _ws, es = IO.select(@all_connections, [], @all_connections)
-        rescue RuntimeError
-          return
-        end
+          rs, _ws, es = IO.select(@all_connections + [@wakeup_pipe_rd], [], @all_connections)
 
         es.each do |e|
           Diameter.logger.log(Logger::WARN, "Exception on connection #{e}")
         end
 
         rs.each do |r|
+          if r == @wakeup_pipe_rd
+            r.gets
+            next
+          end
 
           existing_data = @data[r]
           if existing_data.length < 4
-            msg, _src = r.recvfrom_nonblock(4 - existing_data.length)
+            msg, _src = r.recv_nonblock(4 - existing_data.length)
             if msg == ''
               Diameter.logger.warn('Received 0 bytes on read, closing connection')
               close(r)
@@ -59,7 +64,7 @@ module Diameter
             expected_len = Message.length_from_header(existing_data[0..4])
             Diameter.logger.debug("Read 4 bytes #{existing_data[0..4].inspect}, " \
                                   "reading full message of length #{expected_len}")
-            msg, _src = r.recvfrom_nonblock(expected_len - existing_data.length)
+            msg, _src = r.recv_nonblock(expected_len - existing_data.length)
             existing_data += msg
             if msg == ''
               # Connection closed
@@ -78,7 +83,7 @@ module Diameter
       end
 
       def send(bytes, connection)
-        connection.sendmsg(bytes)
+        connection.send(bytes, 0)
       end
     end
 
@@ -113,7 +118,7 @@ module Diameter
       end
       
       def setup_new_listen_connection(host, port)
-        sd = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+        sd = ServerSocket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
         # reuse = [1,0].pack('ii')
         sd.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
         sd.bind(Socket.pack_sockaddr_in(port, host))

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: diameter
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre1
+  version: 0.1.0.pre2
 platform: ruby
 authors:
 - Rob Day
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-spec-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -101,15 +101,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/diameter/avp.rb
-- lib/diameter/avp_parser.rb
-- lib/diameter/constants.rb
-- lib/diameter/diameter_logger.rb
-- lib/diameter/fsm.rb
 - lib/diameter/message.rb
-- lib/diameter/peer.rb
+- lib/diameter/diameter_logger.rb
 - lib/diameter/stack.rb
 - lib/diameter/stack_transport_helpers.rb
 - lib/diameter/u24.rb
+- lib/diameter/fsm.rb
+- lib/diameter/avp_parser.rb
+- lib/diameter/peer.rb
+- lib/diameter/constants.rb
 homepage: http://rkday.github.io/ruby-diameter/api-docs/master/
 licenses:
 - MIT
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Pure-Ruby Diameter stack