origen_sim 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b31bfc2f252031780f05373507dbbb75db36300
-  data.tar.gz: fb37cfeb67cde82e1f829630b36ea6752e581189
+  metadata.gz: d7effe33984317ccde4bbf6f5d09f584b07a3b10
+  data.tar.gz: b31096962de3a27c1768bf461bdb84221fad70cd
 SHA512:
-  metadata.gz: f86cbee77db2cd17707e7c68aa96a70a18922772207e302b7abf6c416d9e28a2a0c2035339d28f3fde56214a6331a6e657a0be3b1b3945dfc5b1566d673d1e91
-  data.tar.gz: 865533e70e134f220837accecdbefa616f1df14f8cf185bc3584a923e3c5af4afe2d5a3b7662221de125b0b45c5eb975569bfe51da679dc442d10e4c5f38e0df
+  metadata.gz: 0aaa884d3836bb39262e3116e3cfe5125c6c32447b7b4ab30613aad0c90948eb205e559f544615cebde8c0768fe148fad0180f115a0aa56a2fc57dc799007b40
+  data.tar.gz: a795ad25a6ea90ad158f27861730f9a5e365f7b022ac92edf87242fc1113e57fe1b992f19c1475c8cc189c35bf52c1976c96b4fccd74f0f20cdd9d336ba42905

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenSim
   MAJOR = 0
-  MINOR = 10
+  MINOR = 11
   BUGFIX = 0
   DEV = nil
 

data/lib/origen_sim/simulation.rb

@@ -1,6 +1,8 @@
 require 'socket'
 require 'io/wait'
 require 'origen_sim/heartbeat'
+require 'origen_sim/stdout_reader'
+require 'origen_sim/stderr_reader'
 module OrigenSim
   # Responsible for managing each individual simulation that is run in an
   # Origen thread e.g. If multiple patterns are run in separate simulations, then one
@@ -12,7 +14,7 @@ module OrigenSim
     attr_reader :view_wave_command, :id
 
     attr_accessor :logged_errors, :error_count, :failed_to_start, :completed_cleanly
-    attr_accessor :pid, :stderr_logged_errors
+    attr_accessor :pid
     # Returns the communication socket used for sending commands to the Origen VPI running
     # in the simulation process
     attr_reader :socket
@@ -23,7 +25,6 @@ module OrigenSim
       @completed_cleanly = false
       @failed_to_start = false
       @logged_errors = false
-      @stderr_logged_errors = false
       @error_count = 0
       @socket_ids = {}
 
@@ -42,6 +43,14 @@ module OrigenSim
       end
     end
 
+    def logged_errors
+      @logged_errors || @stdout_reader.logged_errors
+    end
+
+    def stderr_logged_errors
+      @stderr_reader.logged_errors
+    end
+
     def log_results(in_progress = false)
       if failed?(in_progress)
         if failed_to_start
@@ -85,6 +94,8 @@ module OrigenSim
       @stdout = @server_stdout.accept
       @stderr = @server_stderr.accept
       @socket = @server.accept
+      @stdout_reader = StdoutReader.new(@stdout)
+      @stderr_reader = StderrReader.new(@stderr)
       @opened = true
     end
 
@@ -92,6 +103,8 @@ module OrigenSim
     def close
       return unless @opened
       stop_heartbeat
+      @stdout_reader.stop
+      @stderr_reader.stop
       @heartbeat.close
       @socket.close
       @stderr.close
@@ -102,37 +115,6 @@ module OrigenSim
       File.unlink(socket_id(:stdout)) if File.exist?(socket_id(:stdout))
     end
 
-    def read_sim_output
-      while @stdout.ready?
-        line = @stdout.gets.chomp
-        if OrigenSim.error_strings.any? { |s| line =~ /#{s}/ } &&
-           !OrigenSim.error_string_exceptions.any? { |s| line =~ /#{s}/ }
-          @logged_errors = true
-          Origen.log.error "(STDOUT): #{line}"
-        else
-          if OrigenSim.verbose? ||
-             OrigenSim.log_strings.any? { |s| line =~ /#{s}/ }
-            Origen.log.info line
-          else
-            Origen.log.debug line
-          end
-        end
-      end
-      while @stderr.ready?
-        line = @stderr.gets.chomp
-        if OrigenSim.fail_on_stderr && !line.empty? &&
-           !OrigenSim.stderr_string_exceptions.any? { |s| line =~ /#{s}/ }
-          # We're failing on stderr, so print its results and log as errors if its not an exception.
-          @stderr_logged_errors = true
-          Origen.log.error "(STDERR): #{line}"
-        elsif OrigenSim.verbose?
-          # We're not failing on stderr, or the string in stderr is an exception.
-          # Print the string as regular output if verbose is set, otherwise just ignore.
-          Origen.log.info line
-        end
-      end
-    end
-
     # Returns true if the simulation is running
     def running?
       return false unless pid

data/lib/origen_sim/simulator.rb

@@ -599,7 +599,6 @@ module OrigenSim
 
     def cycle(number_of_cycles)
       put("3^#{number_of_cycles}")
-      simulation.read_sim_output
     end
 
     # Blocks the Origen process until the simulator indicates that it has
@@ -610,7 +609,6 @@ module OrigenSim
       unless data.strip == 'OK!'
         fail 'Origen and the simulator are out of sync!'
       end
-      simulation.read_sim_output
     end
 
     def error(message)
@@ -717,7 +715,6 @@ module OrigenSim
     # Stop the simulator
     def stop
       @simulation_open = false
-      simulation.read_sim_output
       simulation.error_count = error_count
       Origen.listeners_for(:simulation_shutdown).each(&:simulation_shutdown)
       ended = Time.now

data/lib/origen_sim/stderr_reader.rb

@@ -0,0 +1,34 @@
+require 'thread'
+require 'io/wait'
+module OrigenSim
+  class StderrReader < Thread
+    attr_reader :socket, :logged_errors
+
+    def initialize(socket)
+      @socket = socket
+      @continue = true
+      @logged_errors = false
+      super do
+        while @continue
+          while @socket.ready?
+            line = @socket.gets.chomp
+            if OrigenSim.fail_on_stderr && !line.empty? &&
+               !OrigenSim.stderr_string_exceptions.any? { |s| line =~ /#{s}/ }
+              # We're failing on stderr, so print its results and log as errors if its not an exception.
+              @logged_errors = true
+              Origen.log.error "(STDERR): #{line}"
+            elsif OrigenSim.verbose?
+              Origen.log.info line
+            else
+              Origen.log.debug line
+            end
+          end
+        end
+      end
+    end
+
+    def stop
+      @continue = false
+    end
+  end
+end

data/lib/origen_sim/stdout_reader.rb

@@ -0,0 +1,36 @@
+require 'thread'
+require 'io/wait'
+module OrigenSim
+  class StdoutReader < Thread
+    attr_reader :socket, :logged_errors
+
+    def initialize(socket)
+      @socket = socket
+      @continue = true
+      @logged_errors = false
+      super do
+        while @continue
+          while @socket.ready?
+            line = @socket.gets.chomp
+            if OrigenSim.error_strings.any? { |s| line =~ /#{s}/ } &&
+               !OrigenSim.error_string_exceptions.any? { |s| line =~ /#{s}/ }
+              @logged_errors = true
+              Origen.log.error "(STDOUT): #{line}"
+            else
+              if OrigenSim.verbose? ||
+                 OrigenSim.log_strings.any? { |s| line =~ /#{s}/ }
+                Origen.log.info line
+              else
+                Origen.log.debug line
+              end
+            end
+          end
+        end
+      end
+    end
+
+    def stop
+      @continue = false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_sim
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.33.1
+        version: 0.33.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.33.1
+        version: 0.33.3
 - !ruby/object:Gem::Dependency
   name: origen_testers
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,8 @@ files:
 - lib/origen_sim/origen_testers/api.rb
 - lib/origen_sim/simulation.rb
 - lib/origen_sim/simulator.rb
+- lib/origen_sim/stderr_reader.rb
+- lib/origen_sim/stdout_reader.rb
 - lib/origen_sim/tester.rb
 - lib/origen_sim_dev/dut.rb
 - lib/tasks/origen_sim.rake