cloudi 1.3.3 → 1.4.0

data/lib/cloudi.rb

@@ -78,7 +78,7 @@ module CloudI
             @callbacks = Hash.new
             @timeout_terminate = 1000 # TIMEOUT_TERMINATE_MIN
             send(Erlang.term_to_binary(:init))
-            poll_request(false)
+            poll_request(nil, false)
         end
         attr_reader :process_index
         attr_reader :process_count
@@ -108,7 +108,7 @@ module CloudI
 
         def subscribe_count(pattern)
             send(Erlang.term_to_binary([:subscribe_count, pattern]))
-            return poll_request(false)
+            return poll_request(nil, false)
         end
 
         def unsubscribe(pattern)
@@ -137,7 +137,7 @@ module CloudI
                                         OtpErlangBinary.new(request_info),
                                         OtpErlangBinary.new(request),
                                         timeout, priority]))
-            return poll_request(false)
+            return poll_request(nil, false)
         end
 
         def send_sync(name, request,
@@ -155,7 +155,7 @@ module CloudI
                                         OtpErlangBinary.new(request_info),
                                         OtpErlangBinary.new(request),
                                         timeout, priority]))
-            return poll_request(false)
+            return poll_request(nil, false)
         end
 
         def mcast_async(name, request,
@@ -173,7 +173,7 @@ module CloudI
                                         OtpErlangBinary.new(request_info),
                                         OtpErlangBinary.new(request),
                                         timeout, priority]))
-            return poll_request(false)
+            return poll_request(nil, false)
         end
 
         def forward_(command, name, request_info, request,
@@ -298,7 +298,7 @@ module CloudI
             send(Erlang.term_to_binary([:recv_async, timeout,
                                         OtpErlangBinary.new(trans_id),
                                         consume]))
-            return poll_request(false)
+            return poll_request(nil, false)
         end
 
         def callback(command, name, pattern, request_info, request,
@@ -331,6 +331,12 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
+                rescue InvalidInputException => e
+                    raise e
+                rescue MessageDecodingException => e
+                    raise e
+                rescue TerminateException => e
+                    raise e
                 rescue ReturnAsyncException
                     return
                 rescue ForwardAsyncException
@@ -374,6 +380,12 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
+                rescue InvalidInputException => e
+                    raise e
+                rescue MessageDecodingException => e
+                    raise e
+                rescue TerminateException => e
+                    raise e
                 rescue ReturnSyncException
                     return
                 rescue ForwardSyncException
@@ -430,6 +442,8 @@ module CloudI
                 when MESSAGE_KEEPALIVE
                     send(Erlang.term_to_binary(:keepalive))
                     i += j
+                else
+                    raise MessageDecodingException
                 end
                 if i > data_size
                     raise MessageDecodingException
@@ -441,29 +455,35 @@ module CloudI
             end
         end
 
-        def poll_request(external)
+        def poll_request(timeout, external)
             if @terminate
-                return nil
+                return false
             elsif external and not @initialization_complete
                 send(Erlang.term_to_binary(:polling))
                 @initialization_complete = true
             end
 
-            ready = false
-            while ready == false
-                result = IO.select([@s], nil, [@s])
-                if result[2].length > 0
-                    return nil
-                end
-                if result[0].length > 0
-                    ready = true
-                end
+            poll_timer = nil
+            if timeout.nil? or timeout < 0
+                timeout_value = nil
+            elsif timeout == 0
+                timeout_value = 0
+            elsif timeout > 0
+                poll_timer = Time.now
+                timeout_value = timeout * 0.001
             end
-
+            result = IO.select([@s], nil, [@s], timeout_value)
+            if result.nil?
+                return true
+            end
+            if result[2].length > 0
+                return false
+            end
+        
             data = recv('')
             data_size = data.bytesize
             if data_size == 0
-                return nil
+                return false
             end
             i = 0; j = 4
 
@@ -511,22 +531,22 @@ module CloudI
                     i += j; j = request_size + 1 + 4 + 1 + 16 + 4
                     tmp = data[i, j].unpack("a#{request_size}xLca16L")
                     request = tmp[0]
-                    timeout = tmp[1]
+                    request_timeout = tmp[1]
                     priority = tmp[2]
                     trans_id = tmp[3]
                     pid_size = tmp[4]
                     i += j; j = pid_size
-                    pid = data[i, j].unpack("a#{pid_size}")[0]
+                    pid = data[i, j]
                     i += j
                     if i != data_size
                         API.assert{external == true}
                         if not handle_events(external, data, data_size, i)
-                            return nil
+                            return false
                         end
                     end
                     data.clear()
                     callback(command, name, pattern, request_info, request,
-                             timeout, priority, trans_id,
+                             request_timeout, priority, trans_id,
                              Erlang.binary_to_term(pid))
                 when MESSAGE_RECV_ASYNC, MESSAGE_RETURN_SYNC
                     i += j; j = 4
@@ -547,7 +567,7 @@ module CloudI
                     return [response_info, response, trans_id]
                 when MESSAGE_RETURN_ASYNC
                     i += j; j = 16
-                    trans_id = data[i, j].unpack('a16')[0]
+                    trans_id = data[i, j]
                     i += j
                     if i != data_size
                         API.assert{external == false}
@@ -576,7 +596,7 @@ module CloudI
                     return count
                 when MESSAGE_TERM
                     if not handle_events(external, data, data_size, i, command)
-                        return nil
+                        return false
                     end
                     API.assert{false}
                 when MESSAGE_REINIT
@@ -604,33 +624,52 @@ module CloudI
                     raise MessageDecodingException
                 end
 
-                ready = false
-                while ready == false
-                    result = IO.select([@s], nil, [@s])
-                    if result[2].length > 0
-                        return nil
+                if not poll_timer.nil?
+                    poll_timer_new = Time.now
+                    elapsed = [0,
+                               ((poll_timer_new -
+                                 poll_timer) * 1000.0).floor].max
+                    poll_timer = poll_timer_new
+                    if elapsed >= timeout
+                        timeout = 0
+                    else
+                        timeout -= elapsed
                     end
-                    if result[0].length > 0
-                        ready = true
+                end
+                if not timeout_value.nil?
+                    if timeout == 0
+                        return true
+                    elsif timeout > 0
+                        timeout_value = timeout * 0.001
                     end
                 end
+                result = IO.select([@s], nil, [@s], timeout_value)
+                if result.nil?
+                    return true
+                end
+                if result[2].length > 0
+                    return false
+                end
     
                 data = recv(data)
                 data_size = data.bytesize
                 if data_size == 0
-                    return nil
+                    return false
                 end
                 i = 0; j = 4
             end
         end
 
-        def poll
-            poll_request(true)
+        def poll(timeout=nil)
+            if timeout.nil?
+                timeout = -1
+            end
+            return poll_request(timeout, true)
         end
 
-        def binary_key_value_parse(binary)
+        def text_key_value_parse(text)
             result = {}
-            data = binary.split(NULL.chr)
+            data = text.split(NULL.chr)
             (0...(data.length)).step(2).each do |i|
                 value = result[data[i]]
                 if value == nil
@@ -641,15 +680,15 @@ module CloudI
                     result[data[i]] = [value, data[i + 1]]
                 end
             end
-            result
+            return result
         end
 
         def request_http_qs_parse(request)
-            binary_key_value_parse(request)
+            return text_key_value_parse(request)
         end
 
         def info_key_value_parse(message_info)
-            binary_key_value_parse(message_info)
+            return text_key_value_parse(message_info)
         end
 
         def self.assert
@@ -659,7 +698,7 @@ module CloudI
         private :callback
         private :handle_events
         private :poll_request
-        private :binary_key_value_parse
+        private :text_key_value_parse
         private
 
         def send(data)
@@ -693,7 +732,7 @@ module CloudI
                     end
                 end
             end
-            data
+            return data
         end
 
         MESSAGE_INIT                = 1

metadata

@@ -1,117 +1,132 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cloudi
-version: !ruby/object:Gem::Version
-  version: 1.3.3
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
-authors:
+authors: 
 - Michael Truog
 autorequire: 
 bindir: bin
-cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
   MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MRAwDgYDVQQDDAdtanRy
-
   dW9nMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
-
   HhcNMTQwNjI0MjAzMDQ2WhcNMTUwNjI0MjAzMDQ2WjA+MRAwDgYDVQQDDAdtanRy
-
   dW9nMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
-
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBOoI/CUuwOhXjks02cT58
-
   jLxgsOQ412Xzu4eEKqzNsWMoj/3+qYdb5CR4+51EHtuJHZ8hndL5DTYIO8ylcG11
-
   EvyxqOzU+gqC53gCEBhJLivlyMXvGqL8qHPuSKGEMc1Vpzh0WicwNnaT7z3X6aQP
-
   UE6qWd1yE9jT7TX+GKcKayBJTufxcBMjtwvzMH4IiVaNjUBHBq2LbeNO1yDPYVzV
-
   HWnZCv75vIXdUruFrSZcJgNRYRwzMfHEbf+BcvqqGVV6p3PJgJMrjI8FZ7roIJNf
-
   D7ZO96x4ItjGazoTntAZe3EM9QB5Wjsd1cv2IEOISQ6jyvVX5E84Al+MEKhhhFuL
-
   AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFACw0UcBaNl2dQWwgg/Qzeyf
-
   cKG7MAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAHjLn+8F8yeOFcKst
-
   mKA3m28OIoICMefZOiJfTC9UkVkW+554IXNBu3vVxLc0nlCqmuf/aQGaFBUm9MLA
-
   oD5CmlrU9OrEl2fPxqTHAwFgLNre8e2EWtm2OhBg73JTHRVVyBLpSK5GRUDzhJtZ
-
   7a2ocAE2AgFKpISNxIUe4Zz9O2thg3iryLh9prjETJTUfxDjBmHdx+YkNAblRa2w
-
   k9A+nCZzZECcR5ZZYSeaK6MCugGmXUhAkDbuWumCzu/RAghlVC9RFFQt7o1SwGQp
-
   LdvYOeJbviyiH1q1rC3NAJNC4P7Q41zx1OYa8S9M5qn+JpE0ZsomnZyGunWaya9Q
-
   bTD/aw==
-
   -----END CERTIFICATE-----
 
-'
-date: 2014-09-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2014-12-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: erlang_rb
-  requirement: &15927380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
   type: :runtime
-  prerelease: false
-  version_requirements: *15927380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: erlang_rb
-  requirement: &15925360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
   type: :development
-  prerelease: false
-  version_requirements: *15925360
+  version_requirements: *id002
 description: Ruby CloudI API
 email: mjtruog@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - lib/cloudi.rb
 - README.markdown
 homepage: http://cloudi.org
-licenses:
+licenses: 
 - BSD
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: CloudI API
 test_files: []
+