cosmos 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb2fffb8f204bc932ef93438457c310503837e2f
-  data.tar.gz: 6ecd99712d7682a2d70de2539c03826502868cc9
+  metadata.gz: d82d5f0bf5ba66085f85878c642a00882a44eae6
+  data.tar.gz: 06f95196ee1a8cef8a806a51ceff0bebfeb480e8
 SHA512:
-  metadata.gz: e3b958ffc7000f284188567ae8cf57934288373617682208b913767b2d230cdeb05b98f55745347d9d6ad12ab5d4874e1a8c6f29f379baccbaf4a3f2f21c4253
-  data.tar.gz: c3b6704c2d87fdc6a9413eab98be998fe278a364f2097776521610a876b605c3eb6b0876dd349a5f523ea5255ad7df6259769fe111d6be439b18ebfd6b3389a9
+  metadata.gz: e73b10b1c4ef740738c03421e698c4f6d5a1ecee377d7f147a10b28f6919a1cd0bc05a8d4db31d4cdf88232ca700df733969f594edeb32d5e3d7311faf1aa116
+  data.tar.gz: 03006e36721d7afcf22adcb05cc2f056d32f7d6f83270437de56a0ffbe07d1c09aa15eeb5c6a69138a46401dd537d849f0a126e77f59fceb1a4f45dbde01207c

data/data/crc.txt

@@ -90,7 +90,7 @@
 "lib/cosmos/gui/choosers/combobox_chooser.rb" 0xAD5383D5
 "lib/cosmos/gui/choosers/float_chooser.rb" 0x23B2FA77
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0x1E46E8AA
-"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0xB999FC77
+"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0xF3F14036
 "lib/cosmos/tools/script_runner/script_runner.rb" 0x88EEB809
 "lib/cosmos/tools/script_runner/script_audit.rb" 0xB857FA4A
 "lib/cosmos/tools/cmd_extractor/cmd_extractor.rb" 0xEECB31B8
@@ -234,7 +234,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x1D2090F6
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0xFED34D5F
+"lib/cosmos/version.rb" 0x1CF2C150
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D
@@ -267,7 +267,7 @@
 "lib/cosmos/packets/parsers/limits_response_parser.rb" 0x05979119
 "lib/cosmos/packets/packet_config.rb" 0xFDD8F251
 "lib/cosmos/packets/binary_accessor.rb" 0xF913F2EA
-"lib/cosmos/packets/packet.rb" 0x39B6C0C4
+"lib/cosmos/packets/packet.rb" 0x043EF800
 "lib/cosmos/packets/structure_item.rb" 0xBDC81085
 "lib/cosmos/packets/packet_item_limits.rb" 0xE187C389
 "lib/cosmos/packets/packet_item.rb" 0x2A07D5B4
@@ -277,7 +277,7 @@
 "lib/cosmos/processors/watermark_processor.rb" 0xDADF4580
 "lib/cosmos/io/stdout.rb" 0xAC9CC4B1
 "lib/cosmos/io/buffered_file.rb" 0x70A3B880
-"lib/cosmos/io/json_drb_object.rb" 0x58BE861D
+"lib/cosmos/io/json_drb_object.rb" 0x9825D709
 "lib/cosmos/io/cosmos_snmp.rb" 0x64541158
 "lib/cosmos/io/json_rpc.rb" 0xAF9D95D5
 "lib/cosmos/io/tcpip_server.rb" 0xBAA24660
@@ -286,7 +286,7 @@
 "lib/cosmos/io/serial_driver.rb" 0x9A2515F4
 "lib/cosmos/io/raw_logger_pair.rb" 0x7A0A3F00
 "lib/cosmos/io/raw_logger.rb" 0x42BC42CC
-"lib/cosmos/io/json_drb.rb" 0x53EC6DBC
+"lib/cosmos/io/json_drb.rb" 0x878C8A71
 "lib/cosmos/io/stderr.rb" 0x401624AF
 "lib/cosmos/io/io_multiplexer.rb" 0xD183938D
 "lib/cosmos/io/win32_serial_driver.rb" 0xA7E055CA
@@ -299,7 +299,7 @@
 "lib/cosmos/interfaces/tcpip_client_interface.rb" 0x5F0DB50D
 "lib/cosmos/interfaces/udp_interface.rb" 0xCE4532AD
 "lib/cosmos/interfaces/tcpip_server_interface.rb" 0xC8F6E908
-"lib/cosmos/script/script.rb" 0x06BF2D5F
+"lib/cosmos/script/script.rb" 0x472901A7
 "lib/cosmos/script/extract.rb" 0xF3243476
 "lib/cosmos/core_ext/range.rb" 0x0D55D9D1
 "lib/cosmos/core_ext/stringio.rb" 0x28B64FB4

data/lib/cosmos/io/json_drb.rb

@@ -30,8 +30,6 @@ module Cosmos
 
     # @return [Integer] The number of JSON-RPC requests processed
     attr_accessor :request_count
-    # @return [Integer] The number of clients currently connected to the server
-    attr_accessor :num_clients
     # @return [Array<String>] List of methods that should be allowed
     attr_accessor :method_whitelist
     # @return [ACL] The access control list
@@ -47,16 +45,42 @@ module Cosmos
       @request_times = []
       @request_times_index = 0
       @request_mutex = Mutex.new
-      @num_clients = 0
+      @client_sockets = []
+      @client_threads = []
+      @client_mutex = Mutex.new
       @thread_reader, @thread_writer = IO.pipe
     end
 
+    # Returns the number of connected clients
+    # @return [Integer] The number of connected clients
+    def num_clients
+      @client_threads.length
+    end
+
     # Stops the DRb service by closing the socket and the processing thread
     def stop_service
       Cosmos.kill_thread(self, @thread)
       @thread = nil
       Cosmos.close_socket(@listen_socket)
       @listen_socket = nil
+      client_threads = nil
+      @client_mutex.synchronize do
+        @client_sockets.each do |client_socket|
+          Cosmos.close_socket(client_socket)
+        end
+        client_threads = @client_threads.clone
+      end
+
+      # This cannot be inside of the client_mutex or the threads will not
+      # be able to shutdown because they will stick on the client_mutex
+      client_threads.each do |client_thread|
+        Cosmos.kill_thread(self, client_thread)
+      end
+
+      @client_mutex.synchronize do
+        @client_threads.clear
+        @client_sockets.clear
+      end
     end
 
     # Gracefully kill the thread
@@ -254,7 +278,11 @@ module Cosmos
       socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
 
       Thread.new(socket) do |my_socket|
-        @num_clients += 1
+        @client_mutex.synchronize do
+          @client_sockets << my_socket
+          @client_threads << Thread.current
+        end
+
         data = ''
         begin
           while true
@@ -270,14 +298,18 @@ module Cosmos
               break unless process_request(request_data, my_socket, start_time)
             else
               # Socket was closed by client
-              Cosmos.close_socket(my_socket)
               break
             end
           end
         rescue Exception => error
           Logger.error "JsonDrb client thread unexpectedly died.\n#{error.formatted}"
         end
-        @num_clients -= 1
+
+        @client_mutex.synchronize do
+          Cosmos.close_socket(my_socket)
+          @client_sockets.delete(my_socket)
+          @client_threads.delete(Thread.current)
+        end
       end
     end
 

data/lib/cosmos/io/json_drb_object.rb

@@ -58,6 +58,10 @@ module Cosmos
     # Disconnects from the JSON server
     def disconnect
       Cosmos.close_socket(@socket)
+      # Cannot set @socket to nil here because this method can be called by
+      # other threads and @socket being nil would cause unexpected errors in method_missing
+      # Also don't want to take the mutex so that we can interrupt method_missing if necessary
+      # Only method_missing can set @socket to nil
     end
 
     # Permanently disconnects from the JSON server
@@ -75,91 +79,120 @@ module Cosmos
     #   protocol a DRb::DRbConnError exception is raised.
     def method_missing(method_name, *method_params)
       @mutex.synchronize do
-        raise DRb::DRbConnError, "Shutdown" if @shutdown
-        if !@socket or @socket.closed? or @request_in_progress
-          if @request_in_progress
+        # This flag and loop are used to automatically reconnect and retry if something goes
+        # wrong on the first attempt writing to the socket.   Sockets can become disconnected
+        # between function calls, but as long as the remote server is back up and running the
+        # call should succeed even when it discovers a broken socket on the first attempt.
+        first_try = true
+        loop do
+          raise DRb::DRbConnError, "Shutdown" if @shutdown
+          connect() if !@socket or @socket.closed? or @request_in_progress
+
+          response = make_request(method_name, method_params, first_try)
+          unless response
             disconnect()
             @socket = nil
-            @request_in_progress = false
+            was_first_try = first_try
+            first_try = false
+            next if was_first_try
           end
+          return handle_response(response)
+        end # loop
+      end # @mutex.synchronize
+    end # def method_missing
+
+    private
+
+    def connect
+      if @request_in_progress
+        disconnect()
+        @socket = nil
+        @request_in_progress = false
+      end
+      begin
+        addr = Socket.pack_sockaddr_in(@port, @hostname)
+        @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+        @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        begin
+          @socket.connect_nonblock(addr)
+        rescue IO::WaitWritable
           begin
-            addr = Socket.pack_sockaddr_in(@port, @hostname)
-            @socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-            @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+            _, sockets, _ = IO.select(nil, [@socket], nil, @connect_timeout) # wait 3-way handshake completion
+          rescue IOError, Errno::ENOTSOCK
+            disconnect()
+            @socket = nil
+            raise "Connect canceled"
+          end
+          if sockets and !sockets.empty?
             begin
-              @socket.connect_nonblock(addr)
-            rescue IO::WaitWritable
-              begin
-                _, sockets, _ = IO.select(nil, [@socket], nil, @connect_timeout) # wait 3-way handshake completion
-              rescue IOError, Errno::ENOTSOCK
-                disconnect()
-                @socket = nil
-                raise "Connect canceled"
-              end
-              if sockets and !sockets.empty?
-                begin
-                  @socket.connect_nonblock(addr) # check connection failure
-                rescue IOError, Errno::ENOTSOCK
-                  disconnect()
-                  @socket = nil
-                  raise "Connect canceled"
-                rescue Errno::EINPROGRESS
-                  retry
-                rescue Errno::EISCONN, Errno::EALREADY
-                end
-              else
-                disconnect()
-                @socket = nil
-                raise "Connect timeout"
-              end
+              @socket.connect_nonblock(addr) # check connection failure
             rescue IOError, Errno::ENOTSOCK
               disconnect()
               @socket = nil
               raise "Connect canceled"
+            rescue Errno::EINPROGRESS
+              retry
+            rescue Errno::EISCONN, Errno::EALREADY
             end
-          rescue => e
-            raise DRb::DRbConnError, e.message
+          else
+            disconnect()
+            @socket = nil
+            raise "Connect timeout"
           end
-        end
-
-        request = JsonRpcRequest.new(method_name, method_params, @id)
-        @id += 1
-
-        request_data = request.to_json(:allow_nan => true)
-        begin
-          @request_in_progress = true
-          STDOUT.puts "Request:\n" if JsonDRb.debug?
-          STDOUT.puts request_data if JsonDRb.debug?
-          JsonDRb.send_data(@socket, request_data)
-          response_data = JsonDRb.receive_message(@socket, '')
-          STDOUT.puts "\nResponse:\n" if JsonDRb.debug?
-          STDOUT.puts response_data if JsonDRb.debug?
-          @request_in_progress = false
-        rescue => e
+        rescue IOError, Errno::ENOTSOCK
           disconnect()
           @socket = nil
-          raise DRb::DRbConnError, e.message, e.backtrace
+          raise "Connect canceled"
         end
+      rescue => e
+        raise DRb::DRbConnError, e.message
+      end
+    end
 
-        if response_data
-          response = JsonRpcResponse.from_json(response_data)
-          if JsonRpcErrorResponse === response
-            if response.error.data
-              raise Exception.from_hash(response.error.data)
-            else
-              raise "JsonDRb Error (#{response.error.code}): #{response.error.message}"
-            end
+    def make_request(method_name, method_params, first_try)
+      request = JsonRpcRequest.new(method_name, method_params, @id)
+      @id += 1
+
+      request_data = request.to_json(:allow_nan => true)
+      begin
+        STDOUT.puts "Request:\n" if JsonDRb.debug?
+        STDOUT.puts request_data if JsonDRb.debug?
+        @request_in_progress = true
+        JsonDRb.send_data(@socket, request_data)
+        response_data = JsonDRb.receive_message(@socket, '')
+        @request_in_progress = false
+        STDOUT.puts "\nResponse:\n" if JsonDRb.debug?
+        STDOUT.puts response_data if JsonDRb.debug?
+      rescue => e
+        disconnect()
+        @socket = nil
+        return false if first_try
+        raise DRb::DRbConnError, e.message, e.backtrace
+      end
+      response_data
+    end
+
+    def handle_response(response_data)
+      # The code below will always either raise or return breaking out of the loop
+      if response_data
+        response = JsonRpcResponse.from_json(response_data)
+        if JsonRpcErrorResponse === response
+          if response.error.data
+            raise Exception.from_hash(response.error.data)
           else
-            return response.result
+            raise "JsonDRb Error (#{response.error.code}): #{response.error.message}"
           end
         else
-          # Socket was closed by server
-          disconnect()
-          @socket = nil
-          raise DRb::DRbConnError, "Socket closed by server"
+          return response.result
         end
+      else
+        # Socket was closed by server
+        disconnect()
+        @socket = nil
+        raise DRb::DRbConnError, "Socket closed by server"
       end
     end
-  end
+
+  end # class JsonDRbObject
 
 end # module Cosmos

data/lib/cosmos/packets/packet.rb

@@ -357,7 +357,7 @@ module Cosmos
 
         # Convert from value to state if possible
         if item.states
-          if item.array_size
+          if Array === value
             value = value.map do |val, index|
               if item.states.key(val)
                 item.states.key(val)
@@ -374,7 +374,7 @@ module Cosmos
             end
           end
         else
-          if item.array_size
+          if Array === value
             value = value.map do |val, index|
               apply_format_string_and_units(item, val, value_type)
             end

data/lib/cosmos/script/script.rb

@@ -970,6 +970,25 @@ module Cosmos
       end
     end
 
+    def disable_instrumentation
+      if defined? ScriptRunnerFrame and ScriptRunnerFrame.instance
+        ScriptRunnerFrame.instance.use_instrumentation = false
+        begin
+          yield
+        ensure
+          ScriptRunnerFrame.instance.use_instrumentation = true
+        end
+      else
+        yield
+      end
+    end
+
+    def set_stdout_max_lines(max_lines)
+      if defined? ScriptRunnerFrame and ScriptRunnerFrame.instance
+        ScriptRunnerFrame.instance.stdout_max_lines = max_lines
+      end
+    end
+
     #######################################
     # Methods for debugging
     #######################################

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -101,6 +101,7 @@ module Cosmos
     attr_reader   :message_log
     attr_reader   :script_class
     attr_reader   :top_level_instrumented_cache
+    attr_accessor :stdout_max_lines
 
     @@instance = nil
     @@run_thread = nil
@@ -1195,8 +1196,8 @@ module Cosmos
             lines_to_write << line_to_write
 
             line_count += 1
-            if line_count > 1000
-              out_line = "ERROR: Too much written to stdout.  Truncating output to 1000 lines.\n"
+            if line_count > @stdout_max_lines
+              out_line = "ERROR: Too much written to stdout.  Truncating output to #{@stdout_max_lines} lines.\n"
               if filename
                 line_to_write = time_formatted + " (#{out_filename}:#{out_line_number}): "  + out_line
               else
@@ -1249,6 +1250,7 @@ module Cosmos
       @inline_eval = nil
       @current_filename = nil
       @current_line_number = 0
+      @stdout_max_lines = 1000
 
       @script.stop_highlight
       @call_stack.push(@current_file.dup)

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.3.1'
+COSMOS_VERSION = '3.3.2'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '3'
-    PATCH = '1'
-    BUILD = 'ec5e7d055502c4160427af946416839a23cda7ea'
+    PATCH = '2'
+    BUILD = '5c4dd480988b12d90f6b7bc8c161489fca570a63'
   end
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end

data/spec/io/json_drb_object_spec.rb

@@ -93,6 +93,26 @@ module Cosmos
         sleep(0.1)
       end
 
+      it "handles the remote going away and coming back" do
+        class JsonDRbObjectServer
+          def my_method(param)
+            param * 2
+          end
+        end
+
+        json = JsonDRb.new
+        json.start_service('127.0.0.1', 7777, JsonDRbObjectServer.new)
+        obj = JsonDRbObject.new("localhost", 7777)
+        expect(obj.my_method(10)).to eql 20
+        json.stop_service
+        json = JsonDRb.new
+        json.start_service('127.0.0.1', 7777, JsonDRbObjectServer.new)
+        expect(obj.my_method(10)).to eql 20
+        obj.disconnect
+        json.stop_service
+        sleep(0.1)
+      end
+
     end
   end
 end

data/spec/packets/packet_spec.rb

@@ -449,6 +449,12 @@ module Cosmos
         expect(@p.read_item(i, :WITH_UNITS, "\x02\x04")).to eql ["TRUE","FALSE"]
         expect(@p.read("ITEM", :WITH_UNITS, "\x08")).to eql ["0x4 V"]
         expect(@p.read_item(i, :WITH_UNITS, "\x08")).to eql ["0x4 V"]
+        @p.define_item("item2",0, 0, :DERIVED)
+        i = @p.get_item("ITEM2")
+        i.units = "V"
+        i.read_conversion = GenericConversion.new("[1,2,3,4,5]")
+        expect(@p.read("ITEM2", :FORMATTED, "")).to eql ["1", "2", "3", "4", "5"]
+        expect(@p.read("ITEM2", :WITH_UNITS, "")).to eql ["1 V", "2 V", "3 V", "4 V", "5 V"]
       end
     end
 

data/spec/script/script_spec.rb

@@ -704,6 +704,10 @@ module Cosmos
         get_line_delay
         get_scriptrunner_message_log_filename
         start_new_scriptrunner_message_log
+        disable_instrumentation do
+          value = 1
+        end
+        set_stdout_max_lines(1000)
         insert_return
         step_mode
         run_mode

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler