rmodbus 1.1.3 → 1.1.4

data/NEWS.md

@@ -1,13 +1,18 @@
-2012-06-06 Release 1.1.3
-==================================
+###2012-06-28 Release 1.1.4
+
+1. Fixed issue [#23](https://github.com/flipback/rmodbus/issues/23).
+2. Improved speed of the RTU\RTUViaTCP part. 
+
+###2012-06-06 Release 1.1.3
+
 1. Fixed issue [#22](https://github.com/flipback/rmodbus/issues/22) 
 
-2012-05-12 Release 1.1.2
-==================================
+###2012-05-12 Release 1.1.2
+
 1. Fixed issue [#20](https://github.com/flipback/rmodbus/issues/20) 
 
-2012-04-12 Release 1.1.1
-==================================
+###2012-04-12 Release 1.1.1
+
 1. Fixed issue [#15](https://github.com/flipback/rmodbus/issues/15) 
 
 2011-10-29 Release 1.1.0
@@ -31,26 +36,23 @@
 
 3. Deleted dependency with `serialport` gem. Install it manual for using RTU
 
-2011-08-10 Release 1.0.4
-====================================
+###2011-08-10 Release 1.0.4
+
 1. Fixed issue [#11](https://github.com/flipback/rmodbus/issues/11)
 
 
-2011-07-17 Release 1.0.3
-====================================
+###2011-07-17 Release 1.0.3
 
 1. Fixed issue #10
 2. Added new options for TCPServer#new and RTUViaTCPServer#new
    :host - ip of host server (default 127.0.0.1)
    :max_connection - maximum (client default 4)
 
-2011-07-1 Release 1.0.2
-====================================
+###2011-07-1 Release 1.0.2
 
 1. Fixed issue #9
 
-2011-06-30 Release 1.0.1
-====================================
+###2011-06-30 Release 1.0.1
 
 1. Fixed issue #8
 

data/README.md

@@ -32,6 +32,7 @@ Download and install RModBus with the following
 Example
 ------------------------------------
 
+  ```ruby
     require 'rmodbus'
 
     ModBus::TCPClient.new('127.0.0.1', 8502) do |cl|
@@ -49,6 +50,7 @@ Example
         slave.holding_registers[16..20] = [1, 2, 3, 4, 5]
       end
     end
+  ```
 
 GitHub
 ----------------------------------

data/examples/perfomance_rtu_via_tcp.rb

@@ -0,0 +1,55 @@
+$:.unshift File.join(File.dirname(__FILE__),'../lib')
+
+require 'rmodbus'
+require 'benchmark'
+
+include ModBus
+
+TIMES = 1000
+
+srv = ModBus::RTUViaTCPServer.new 1502 
+srv.coils = [0,1]  * 50
+srv.discrete_inputs = [1,0]  * 50
+srv.holding_registers = [0,1,2,3,4,5,6,7,8,9]  * 10
+srv.input_registers = [0,1,2,3,4,5,6,7,8,9]  * 10
+srv.start
+
+
+cl = RTUViaTCPClient.new('127.0.0.1', 1502)
+cl.with_slave(1) do |slave|
+  Benchmark.bmbm do |x|
+    x.report('Read coils') do
+      TIMES.times { slave.read_coils 0, 100 }
+    end
+    
+    x.report('Read discrete inputs') do
+      TIMES.times { slave.read_discrete_inputs 0, 100 }
+    end
+    
+    x.report('Read holding registers') do
+      TIMES.times { slave.read_holding_registers 0, 100 } 
+    end
+    
+    x.report('Read input registers') do
+      TIMES.times { slave.read_input_registers 0, 100 }
+    end
+    
+    x.report('Write single coil') do
+      TIMES.times { slave.write_single_coil 0, 1 }
+    end
+    
+    x.report('Write single register') do
+      TIMES.times { slave.write_single_register 100, 0xAAAA }
+    end
+    
+    x.report('Write multiple coils') do
+      TIMES.times { slave.write_multiple_coils 0, [1,0] * 50 }
+    end    
+    
+    x.report('Write multiple registers') do
+      TIMES.times { slave.write_multiple_registers 0, [0,1,2,3,4,5,6,7,8,9] * 10  }
+    end
+  end
+end
+cl.close
+srv.stop

data/lib/rmodbus/rtu.rb

@@ -23,7 +23,6 @@ module ModBus
       msg = nil
       while msg.nil?
 	      msg = io.read(2)
-        sleep(0.01)
       end
 
       function_code = msg.getbyte(1)
@@ -45,11 +44,22 @@ module ModBus
       end
     end
 
+    def clean_input_buff
+      begin
+        # Read up to 1500 bytes of trash.
+        @io.read_nonblock(1500)
+      rescue Errno::EAGAIN
+        # Ignore the fact we couldn't read.
+      rescue Exception => e
+        raise e
+      end
+    end
+
     def send_rtu_pdu(pdu)
       msg = @uid.chr + pdu
       msg << crc16(msg).to_word
       
-      @io.read # Clean input buffer
+      clean_input_buff  
       @io.write msg
 
       log "Tx (#{msg.size} bytes): " + logging_bytes(msg)
@@ -72,7 +82,6 @@ module ModBus
       end
     end
 
-
     def read_rtu_request(io)
 			# Read the slave_id and function code
 			msg = io.read(2)
@@ -112,7 +121,6 @@ module ModBus
           log "Server TX (#{resp.size} bytes): #{logging_bytes(resp)}"
           io.write resp
 		    end
-        sleep(0.01)
 	    end
     end
 

data/lib/rmodbus/tcp_server.rb

@@ -57,7 +57,6 @@ module ModBus
           log "Server TX (#{resp.size} bytes): #{logging_bytes(resp)}"
           io.write resp
         end
-        sleep(0.01)
 			end
 		end
 	end

data/lib/rmodbus/version.rb

@@ -13,5 +13,5 @@
 # GNU General Public License for more details.
 module ModBus
   # Package version
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/spec/logging_spec.rb

@@ -42,6 +42,7 @@ begin
       @sp = mock('Serial port')
       SerialPort.should_receive(:new).with("/dev/port1", 9600, 7, 2, SerialPort::ODD).and_return(@sp)    
       
+      @sp.stub!(:read_timeout)
       @sp.stub!(:read_timeout=)
       
       @slave = ModBus::RTUClient.new("/dev/port1", 9600, :data_bits => 7, :stop_bits => 2, :parity => SerialPort::ODD).with_slave(1)
@@ -51,7 +52,7 @@ begin
     it 'should log rec\send bytes' do
       request = "\x3\x0\x1\x0\x1"
       @sp.should_receive(:write).with("\1#{request}\xd5\xca")
-      @sp.should_receive(:read).and_return("\xff\xff") # Clean a garbage
+      @sp.should_receive(:read_nonblock).and_return("\xff\xff") # Clean a garbage
       @sp.should_receive(:read).with(2).and_return("\x1\x3")
       @sp.should_receive(:read).with(1).and_return("\x2")
       @sp.should_receive(:read).with(4).and_return("\xff\xff\xb9\xf4")

data/spec/rtu_client_spec.rb

@@ -5,7 +5,8 @@ describe ModBus::RTUClient do
     @sp = mock('Serial port')
     SerialPort.should_receive(:new).with("/dev/port1", 9600, 8, 1, 0).and_return(@sp)    
     @sp.stub!(:read_timeout=)
-    @sp.stub!(:read)
+    @sp.stub!(:read_timeout)
+    @sp.stub!(:read_nonblock)
 
     @cl = ModBus::RTUClient.new("/dev/port1", 9600, :data_bits => 8, :stop_bits => 1, :parity => SerialPort::NONE)
     @slave = @cl.with_slave(1)

data/spec/rtu_via_tcp_client_spec.rb

@@ -6,7 +6,7 @@ describe ModBus::RTUViaTCPClient do
       @sock = mock('Socked')
       TCPSocket.should_receive(:new).with("127.0.0.1", 10002).and_return(@sock)    
       @sock.stub!(:read_timeout=)
-      @sock.stub!(:read)
+      @sock.stub!(:read_nonblock)
       
       @cl = ModBus::RTUViaTCPClient.new("127.0.0.1")
       @slave = @cl.with_slave(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmodbus
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -163,48 +179,49 @@ extra_rdoc_files:
 - README.md
 - NEWS.md
 files:
-- lib/rmodbus/options.rb
-- lib/rmodbus/errors.rb
-- lib/rmodbus/rtu_server.rb
-- lib/rmodbus/client.rb
-- lib/rmodbus/debug.rb
 - lib/rmodbus/rtu_client.rb
-- lib/rmodbus/version.rb
-- lib/rmodbus/tcp.rb
-- lib/rmodbus/sp.rb
-- lib/rmodbus/rtu_slave.rb
-- lib/rmodbus/server.rb
-- lib/rmodbus/tcp_server.rb
 - lib/rmodbus/rtu_via_tcp_slave.rb
+- lib/rmodbus/rtu_server.rb
+- lib/rmodbus/tcp_server.rb
+- lib/rmodbus/slave.rb
+- lib/rmodbus/sp.rb
 - lib/rmodbus/rtu.rb
+- lib/rmodbus/tcp_client.rb
+- lib/rmodbus/version.rb
+- lib/rmodbus/client.rb
+- lib/rmodbus/tcp.rb
 - lib/rmodbus/ext.rb
-- lib/rmodbus/rtu_via_tcp_server.rb
 - lib/rmodbus/tcp_slave.rb
+- lib/rmodbus/rtu_via_tcp_server.rb
+- lib/rmodbus/server.rb
+- lib/rmodbus/rtu_slave.rb
+- lib/rmodbus/options.rb
 - lib/rmodbus/proxy.rb
-- lib/rmodbus/tcp_client.rb
 - lib/rmodbus/rtu_via_tcp_client.rb
-- lib/rmodbus/slave.rb
+- lib/rmodbus/debug.rb
+- lib/rmodbus/errors.rb
 - lib/rmodbus.rb
-- examples/perfomance_tcp.rb
-- examples/simple-xpca-gateway.rb
-- examples/use_tcp_modbus.rb
 - examples/use_rtu_via_tcp_modbus.rb
+- examples/perfomance_rtu_via_tcp.rb
 - examples/perfomance_rtu.rb
-- spec/tcp_server_spec.rb
+- examples/use_tcp_modbus.rb
+- examples/simple-xpca-gateway.rb
+- examples/perfomance_tcp.rb
+- spec/response_mismach_spec.rb
+- spec/rtu_server_spec.rb
 - spec/proxy_spec.rb
-- spec/rtu_via_tcp_server_spec.rb
-- spec/exception_spec.rb
+- spec/spec_helper.rb
+- spec/logging_spec.rb
+- spec/client_spec.rb
+- spec/slave_spec.rb
 - spec/rtu_via_tcp_client_spec.rb
+- spec/rtu_via_tcp_server_spec.rb
+- spec/tcp_server_spec.rb
+- spec/tcp_client_spec.rb
 - spec/rtu_client_spec.rb
 - spec/read_rtu_response_spec.rb
-- spec/slave_spec.rb
-- spec/response_mismach_spec.rb
-- spec/tcp_client_spec.rb
+- spec/exception_spec.rb
 - spec/ext_spec.rb
-- spec/logging_spec.rb
-- spec/client_spec.rb
-- spec/spec_helper.rb
-- spec/rtu_server_spec.rb
 - Rakefile
 - README.md
 - NEWS.md
@@ -233,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RModBus - free implementation of protocol ModBus