cosmos 3.2.1 → 3.3.0

data/lib/cosmos/packet_logs/packet_log_writer.rb

@@ -88,6 +88,7 @@ module Cosmos
       @file_size = 0
       @filename = nil
       @label = nil
+      @entry_header = String.new
       @start_time = Time.now
 
       @cancel_threads = false
@@ -246,10 +247,10 @@ module Cosmos
           start_new_file()
         end
         if @file
-          entry_header = build_entry_header(packet)
-          if entry_header
-            @file.write(entry_header)
-            @file_size += entry_header.length
+          @entry_header = build_entry_header(packet) # populate @entry_header
+          if @entry_header
+            @file.write(@entry_header)
+            @file_size += @entry_header.length
           end
           buffer = packet.buffer
           @file.write(buffer)
@@ -300,24 +301,21 @@ module Cosmos
     def build_entry_header(packet)
       received_time = packet.received_time
       received_time = Time.now unless received_time
+      # This is an optimization to avoid creating a new entry_header object
+      # each time we create an entry_header which we do a LOT!
+      @entry_header.clear
+      @entry_header << [received_time.tv_sec].pack('N'.freeze)
+      @entry_header << [received_time.tv_usec].pack('N'.freeze)
       target_name = packet.target_name
-      target_name = 'UNKNOWN' unless target_name
+      target_name = 'UNKNOWN'.freeze unless target_name
+      @entry_header << target_name.length
+      @entry_header << target_name
       packet_name = packet.packet_name
-      packet_name = 'UNKNOWN' unless packet_name
-      data_length = [packet.length].pack('N')
-      time_seconds = [received_time.tv_sec].pack('N')
-      time_microseconds = [received_time.tv_usec].pack('N')
-
-      header = ''
-      header << time_seconds
-      header << time_microseconds
-      header << target_name.length
-      header << target_name
-      header << packet_name.length
-      header << packet_name
-      header << data_length
-
-      return header
+      packet_name = 'UNKNOWN'.freeze unless packet_name
+      @entry_header << packet_name.length
+      @entry_header << packet_name
+      @entry_header << [packet.length].pack('N'.freeze)
+      return @entry_header
     end
 
   end # class PacketLogWriter

data/lib/cosmos/packets/commands.rb

@@ -38,9 +38,11 @@ module Cosmos
       return @config.warnings
     end
 
-    # @return [Array<String>] The command target names
+    # @return [Array<String>] The command target names (excluding UNKNOWN)
     def target_names
-      return @config.commands.keys.sort
+      result = @config.commands.keys.sort
+      result.delete('UNKNOWN'.freeze)
+      return result
     end
 
     # @param target_name [String] The target name
@@ -194,17 +196,17 @@ module Cosmos
       items.each do |item_name, item_value|
         unless ignored_parameters.include?(item_name)
           if first
-            string << ' with '
+            string << ' with '.freeze
             first = false
           else
-            string << ', '
+            string << ', '.freeze
           end
 
           item = packet.get_item(item_name)
           if item.data_type ==:STRING or item.data_type == :BLOCK
             item_value = item_value.inspect
             if item_value.length > 256
-              item_value = item_value[0..255] + '..."'
+              item_value = item_value[0..255] + '..."'.freeze
             end
             string << "#{item_name} #{item_value}"
           else
@@ -216,7 +218,7 @@ module Cosmos
           end
         end
       end
-      string << "')"
+      string << "')".freeze
       string
     end
 

data/lib/cosmos/packets/limits.rb

@@ -201,7 +201,8 @@ module Cosmos
     # @return [Array<limits_set, persistence, enabled, red_low, yellow_low, red_high, yellow_high, green_low (optional), green_high (optional)] Limits information
     def set(target_name, packet_name, item_name, red_low, yellow_low, yellow_high, red_high, green_low = nil, green_high = nil, limits_set = :CUSTOM, persistence = nil, enabled = true)
       packet = get_packet(target_name, packet_name)
-      limits = packet.get_item(item_name).limits
+      item = packet.get_item(item_name)
+      limits = item.limits
       if limits_set
         limits_set = limits_set.to_s.upcase.intern
       else
@@ -231,7 +232,7 @@ module Cosmos
       end
       limits.enabled = enabled
       limits.persistence_setting = Integer(persistence) if persistence
-      packet.update_limits_items_cache
+      packet.update_limits_items_cache(item)
       @config.limits_sets << limits_set
       @config.limits_sets.uniq!
       return [limits_set, limits.persistence_setting, limits.enabled, limits_for_set[0], limits_for_set[1], limits_for_set[2], limits_for_set[3], limits_for_set[4], limits_for_set[5]]

data/lib/cosmos/packets/packet.rb

@@ -279,7 +279,7 @@ module Cosmos
     def define(item)
       item = super(item)
       update_id_items(item)
-      update_limits_items_cache()
+      update_limits_items_cache(item)
       item
     end
 
@@ -532,16 +532,19 @@ module Cosmos
       end
     end
 
-    # Force the packet to update its knowledge of items with limits. This is an
-    # optimization so we don't have to iterate through all the items when
+    # Add an item to the limits items cache if necessary.
+    # You MUST call this after adding limits to an item
+    #This is an optimization so we don't have to iterate through all the items when
     # checking for limits.
-    def update_limits_items_cache
-      # Collect only the items who have limits values or states and then
-      # compact the array to remove all the nil values
-      @limits_items = @sorted_items.collect do |item|
-        item if item.limits.values || item.state_colors
+    def update_limits_items_cache(item)
+      if item.limits.values || item.state_colors
+        @limits_items ||= []
+        @limits_items_hash ||= {}
+        unless @limits_items_hash[item]
+          @limits_items << item
+          @limits_items_hash[item] = true
+        end
       end
-      @limits_items.compact!
     end
 
     # Return an array of arrays indicating all items in the packet that are out of limits
@@ -629,8 +632,8 @@ module Cosmos
     #   buffer of data and processors
     def clone
       packet = super()
-      if packet.instance_variable_get("@processors")
-        packet.instance_variable_set("@processors", packet.processors.clone)
+      if packet.instance_variable_get("@processors".freeze)
+        packet.instance_variable_set("@processors".freeze, packet.processors.clone)
         packet.processors.each do |processor_name, processor|
           packet.processors[processor_name] = processor.clone
         end

data/lib/cosmos/packets/parsers/limits_parser.rb

@@ -47,7 +47,7 @@ module Cosmos
       item.limits.persistence_setting = get_persistence()
       item.limits.persistence_count = 0
 
-      packet.update_limits_items_cache
+      packet.update_limits_items_cache(item)
       limits_set
     end
 

data/lib/cosmos/packets/parsers/macro_parser.rb

@@ -71,7 +71,7 @@ module Cosmos
       raise @parser.error("Missing MACRO_APPEND_START before this config.line.", @parser.keyword) unless @macro
       raise @parser.error("No items appended in MACRO_APPEND list", @parser.keyword) if @macro.list.empty?
 
-      create_new_packet_items(packet)#, new_item_names)
+      create_new_packet_items(packet)
     end
 
     private
@@ -85,11 +85,11 @@ module Cosmos
     end
 
     def create_new_packet_items(packet)
+      # Shift off the first macro index because since the first item(s) already exist we just rename
+      first_index = @macro.indices.shift
       @macro.list.each do |name|
         original_item_name = name
-        # Shift off the macro indices because since the first item already
-        # exists we just rename it
-        new_name = format_item_name(name, @macro.indices.shift)
+        new_name = format_item_name(name, first_index)
         item = packet.rename_item(name, new_name)
 
         # The renaming indices create new items

data/lib/cosmos/packets/parsers/state_parser.rb

@@ -85,7 +85,7 @@ module Cosmos
         get_hazardous(item)
       else
         get_state_colors(item)
-        packet.update_limits_items_cache
+        packet.update_limits_items_cache(item)
       end
     end
 

data/lib/cosmos/packets/structure.rb

@@ -371,7 +371,7 @@ module Cosmos
       structure = super()
       # Use instance_variable_set since we have overriden buffer= to do
       # additional work that isn't neccessary here
-      structure.instance_variable_set("@buffer", @buffer.clone) if @buffer
+      structure.instance_variable_set("@buffer".freeze, @buffer.clone) if @buffer
       return structure
     end
     alias dup clone
@@ -442,7 +442,7 @@ module Cosmos
     def internal_buffer_equals(buffer)
       raise ArgumentError, "Buffer class is #{buffer.class} but must be String" unless String === buffer
       @buffer = buffer.dup
-      @buffer.force_encoding('ASCII-8BIT')
+      @buffer.force_encoding('ASCII-8BIT'.freeze)
       if @buffer.length != @defined_length
         if @buffer.length < @defined_length
           resize_buffer()

data/lib/cosmos/packets/telemetry.rb

@@ -39,9 +39,11 @@ module Cosmos
       return @config.warnings
     end
 
-    # @return [Array<String>] The telemetry target names
+    # @return [Array<String>] The telemetry target names (excluding UNKNOWN)
     def target_names
-      return @config.telemetry.keys.sort
+      result = @config.telemetry.keys.sort
+      result.delete('UNKNOWN'.freeze)
+      return result
     end
 
     # @param target_name [String] The target name
@@ -285,7 +287,6 @@ module Cosmos
       tnames = target_names()
       total = tnames.length.to_f
       tnames.each_with_index do |target_name, index|
-        next if target_name == 'UNKNOWN'
         if splash
           splash.message = "Processing #{target_name} telemetry"
           splash.progress = index / total
@@ -296,7 +297,7 @@ module Cosmos
         packets(target_name).each do |packet_name, packet|
           # We don't audit against hidden or disabled packets
           next if !include_hidden and (packet.hidden || packet.disabled)
-          packet.items.keys.each do |item_name|
+          packet.items.each_key do |item_name|
             # Skip ignored items
             next if !include_hidden and ignored_items.include? item_name
             strings << "#{target_name} #{packet_name} #{item_name}"

data/lib/cosmos/script/script.rb

@@ -598,7 +598,7 @@ module Cosmos
     def _wait_tolerance(raw, *args)
       type = (raw ? :RAW : :CONVERTED)
       type_string = 'wait_tolerance'
-      type_string += '_raw' if raw
+      type_string << '_raw' if raw
       target_name, packet_name, item_name, expected_value, tolerance, timeout, polling_rate = wait_tolerance_process_args(args, type_string)
       start_time = Time.now
       success, value = cosmos_script_wait_implementation_tolerance(target_name, packet_name, item_name, type, expected_value, tolerance, timeout, polling_rate)
@@ -682,7 +682,7 @@ module Cosmos
 
     def _wait_check_tolerance(raw, *args)
       type_string = 'wait_check_tolerance'
-      type_string += '_raw' if raw
+      type_string << '_raw' if raw
       type = (raw ? :RAW : :CONVERTED)
       target_name, packet_name, item_name, expected_value, tolerance, timeout, polling_rate = wait_tolerance_process_args(args, type_string)
       start_time = Time.now
@@ -1067,7 +1067,7 @@ module Cosmos
 
             if use_file_cache
               # Check file based instrumented cache
-              flat_path = path.gsub("/", "_").gsub("\\", "_").gsub(":", "_").gsub(" ", "_")
+              flat_path = path.tr("/", "_").gsub("\\", "_").tr(":", "_").tr(" ", "_")
               flat_path_with_md5 = flat_path + '_' + md5
               cache_filename = File.join(cache_path, flat_path_with_md5)
             end
@@ -1418,7 +1418,7 @@ module Cosmos
       end
       output_string << target_name + ' ' + cmd_name
       if cmd_params.nil? or cmd_params.empty?
-        output_string += '")'
+        output_string << '")'
       else
         params = []
         cmd_params.each do |key, value|
@@ -1428,13 +1428,13 @@ module Cosmos
               if value.length > 256
                 value = value[0..255] + "...'"
               end
-              value.gsub!('"',"'")
+              value.tr!('"',"'")
             end
           end
           params << "#{key} #{value}"
         end
         params = params.join(", ")
-        output_string += ' with ' + params + '")'
+        output_string << ' with ' + params + '")'
       end
       return output_string
     end

data/lib/cosmos/streams/tcpip_socket_stream.rb

@@ -39,6 +39,7 @@ module Cosmos
       # Mutex on write is needed to protect from commands coming in from more
       # than one tool
       @write_mutex = Mutex.new
+      @connected = false
     end
 
     # @return [String] Returns a binary string of data from the socket
@@ -50,7 +51,7 @@ module Cosmos
       begin
         data = @read_socket.recv_nonblock(65535)
         @raw_logger_pair.read_logger.write(data) if @raw_logger_pair
-      rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+      rescue IO::WaitReadable
         # Wait for the socket to be ready for reading or for the timeout
         begin
           result = IO.fast_select([@read_socket], nil, nil, @read_timeout)

data/lib/cosmos/streams/template_stream_protocol.rb

@@ -126,7 +126,7 @@ module Cosmos
         # Scan the response for the variables in brackets <VARIABLE>
         # Write the packet value with each of the values received
         response_values = response_string.scan(response_regexp)[0]
-        raise "Unexpected response received: #{response_string}" if response_values.length != response_item_names.length
+        raise "Unexpected response received: #{response_string}" if !response_values or (response_values.length != response_item_names.length)
         response_values.each_with_index do |value, i|
           result_packet.write(response_item_names[i], value)
         end

data/lib/cosmos/tools/cmd_sender/cmd_sender.rb

@@ -443,7 +443,7 @@ module Cosmos
     def update_targets
       @target_select.clearItems()
       target_names = System.commands.target_names
-      target_names_to_delete = ['UNKNOWN']
+      target_names_to_delete = []
       target_names.each do |target_name|
         found_non_hidden = false
         begin

data/lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb

@@ -149,7 +149,9 @@ module Cosmos
       # Add the message output
       @output = Qt::PlainTextEdit.new
       @output.setReadOnly(true)
-      @output.setMaximumBlockCount(10000) # 10000 lines of history will be displayed
+      # Block count does NOT equal line numbers. Testing on Windows indicates
+      # 100 blocks equals a little over 27000 lines.
+      @output.setMaximumBlockCount(100)
 
       @splitter.addWidget(@output)
       # Set the stretch factor to give priority to the tab_widget (index 0) instead of the output (index 1)
@@ -218,16 +220,11 @@ module Cosmos
 
     # Update the status tab of the server
     def handle_status_tab
-      if CmdTlmServer.json_drb
-        previous_request_count = CmdTlmServer.json_drb.request_count
-      else
-        previous_request_count = 0
-      end
       @tab_thread = Thread.new do
         begin
           while true
             start_time = Time.now
-            Qt.execute_in_main_thread(true) { @status_tab.update(previous_request_count) }
+            Qt.execute_in_main_thread(true) { @status_tab.update }
             total_time = Time.now - start_time
             if total_time > 0.0 and total_time < 1.0
               break if @tab_sleeper.sleep(1.0 - total_time)
@@ -296,7 +293,7 @@ module Cosmos
           lines_to_write = ''
           string = @string_output.string.clone
           @string_output.string = @string_output.string[string.length..-1]
-          string.each_line {|out_line| @output.add_formatted_text(out_line); lines_to_write += out_line }
+          string.each_line {|out_line| @output.add_formatted_text(out_line); lines_to_write << out_line }
           @output.flush
           if @first_output < 2
             # Scroll to the bottom on the first two outputs for Linux

data/lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb

@@ -17,6 +17,7 @@ module Cosmos
   class InterfacesTab
     INTERFACES = 'Interfaces'
     ROUTERS = 'Routers'
+    ALIGN_CENTER = Qt::AlignCenter
 
     def initialize
       @interfaces_table = {}
@@ -116,7 +117,7 @@ module Cosmos
       row = 0
       interfaces.all.each do |interface_name, interface|
         item = Qt::TableWidgetItem.new(Qt::Object.tr(interface_name))
-        item.setTextAlignment(Qt::AlignCenter)
+        item.setTextAlignment(ALIGN_CENTER)
         interfaces_table.setItem(row, 0, item)
         interfaces_table.setCellWidget(row, 1, create_button(name, interface, interface_name))
         interfaces_table.setItem(row, 2, create_state(interface))
@@ -126,8 +127,8 @@ module Cosmos
           interface.bytes_written, interface.bytes_read,
           interface.write_count, interface.read_count].each do |val|
 
-          item = Qt::TableWidgetItem.new(Qt::Object.tr(val.to_s))
-          item.setTextAlignment(Qt::AlignCenter)
+          item = Qt::TableWidgetItem.new(val.to_s)#Qt::Object.tr(val.to_s))
+          item.setTextAlignment(ALIGN_CENTER)
           interfaces_table.setItem(row, index, item)
           index += 1
         end

data/lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb

@@ -39,7 +39,7 @@ module Cosmos
       return if cmd_tlm.nil? || cmd_tlm.target_names.empty?
 
       row = 0
-      cmd_tlm.target_names.sort.each do |target_name|
+      cmd_tlm.target_names.each do |target_name|
         packets = cmd_tlm.packets(target_name)
         packets.sort.each do |packet_name, packet|
           next if packet.hidden
@@ -47,6 +47,9 @@ module Cosmos
           row += 1
         end
       end
+      packet = cmd_tlm.packet('UNKNOWN', 'UNKNOWN')
+      @packets_table[name].item(row, 2).setText(packet.received_count.to_s)
+      row += 1
     end
 
     private
@@ -55,12 +58,13 @@ module Cosmos
       return if cmd_tlm.target_names.empty?
 
       count = 0
-      cmd_tlm.target_names.sort.each do |target_name|
+      cmd_tlm.target_names.each do |target_name|
         packets = cmd_tlm.packets(target_name)
         packets.each do |packet_name, packet|
           count += 1 unless packet.hidden
         end
       end
+      count += 1 # For UNKNOWN UNKNOWN
 
       scroll = Qt::ScrollArea.new
       widget = Qt::Widget.new
@@ -95,7 +99,9 @@ module Cosmos
 
     def populate_packets_table(name, cmd_tlm, table)
       row = 0
-      cmd_tlm.target_names.sort.each do |target_name|
+      target_names = cmd_tlm.target_names
+      target_names << 'UNKNOWN'.freeze
+      target_names.each do |target_name|
         packets = cmd_tlm.packets(target_name)
         packets.sort.each do |packet_name, packet|
           packet.received_count ||= 0