backport 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef66ad1688e603cf9a8c9844c5551bbc3ca9187abf747bca2064e46fb7c2600f
-  data.tar.gz: 3952f19adbe1639f82c98568d4adc97aa0c690d5fa568fef768efbcf6134ee7c
+  metadata.gz: 37e4d45bec3b70c07d7bb7ec027399c01ce149f3567ab9f5ddb4661741c8f990
+  data.tar.gz: '0906731f50ef216c4bb239fdfffc63f40e086c4e6817849363736c93e1c9b9b7'
 SHA512:
-  metadata.gz: 334cb82482d72e1b617fa9fa2a1a1b87764b800e4a8abf6ecc2c63fc012406fb05bf744b362aa6f3211aae0f868ab188902132825602ee3909b54358e2cd1813
-  data.tar.gz: 2ff55f4495545b50e4e226f961d38b5471cc8d1890a4339091f126139f61422e1ae3af1e1a8c3fc80aafb915b187da099ef312a5e7da1ad4a500f737e9a6909c
+  metadata.gz: aa2e6670f6ea2503bcd3ada456522a547c35b18cd4fb12fd38f0a3e00aece71cdae3aa72a168c83ab590d3ea306e8a04b3dc0daec8dd0cc459351cac488907f0
+  data.tar.gz: 5eeb2227c5b2f3474b3fbbe6792f0f005f28ce9342b3f395cc596f6cc764741abce8d4daa8cc90dff95d71d877a4fd3c336a5e72ae5980656a2ab971a473c538

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0 - May 27, 2019
+- Interval server uses threads for timing
+- Servers use observer patterns to reduce polling
+
 ## 1.0.0 - February 19, 2019
 - Renamed Adapter#sending to Adapter#receiving
 - Travis tests up to Ruby 2.6

data/lib/backport/adapter.rb

@@ -79,6 +79,7 @@ module Backport
     def close
       return if closed?
       _data[:closed] = true
+      _data[:on_close].call unless _data[:on_close].nil?
       closing
     end
   end

data/lib/backport/client.rb

@@ -1,7 +1,11 @@
+require 'observer'
+
 module Backport
   # A client connected to a connectable Backport server.
   #
   class Client
+    include Observable
+
     # @return [Adapter]
     attr_reader :adapter
 
@@ -33,6 +37,8 @@ module Backport
       return if stopped?
       @adapter.closing
       @stopped = true
+      changed
+      notify_observers self
     end
 
     # Start running the client. This method will start the thread that reads
@@ -53,12 +59,8 @@ module Backport
     #
     # @return [void]
     def tick
-      if adapter.closed?
-        stop
-      else
-        input = read
-        @adapter.receiving input unless input.nil?
-      end
+      input = read
+      @adapter.receiving input unless input.nil?
     end
 
     private
@@ -105,16 +107,18 @@ module Backport
     #
     # @return [void]
     def read_input
-      @in.flush
       begin
+        @in.flush
         chars = @in.sysread(255)
-      rescue EOFError, Errno::ECONNRESET
+      rescue EOFError, IOError, Errno::ECONNRESET
         chars = nil
       end
       if chars.nil?
         stop
       else
         mutex.synchronize { @buffer.concat chars }
+        changed
+        notify_observers self
       end
     end
   end

data/lib/backport/machine.rb

@@ -41,6 +41,7 @@ module Backport
     # @param server [Server::Base]
     # @return [void]
     def prepare server
+      server.add_observer self
       servers.push server
       server.start unless stopped?
     end
@@ -50,26 +51,28 @@ module Backport
       @servers ||= []
     end
 
-    # Update the machine's servers.
-    #
-    # @return [void]
-    def tick
-      servers.delete_if(&:stopped?)
-      stop if servers.empty?
-      servers.each(&:tick)
+    # @param server [Server::Base]
+    def update server
+      if server.stopped?
+        servers.delete server
+        stop if servers.empty?
+      else
+        mutex.synchronize { server.tick }
+      end
     end
 
     private
 
+    def mutex
+      @mutex ||= Mutex.new
+    end
+
     # Start the thread that updates servers via the #tick method.
     #
     # @return [void]
     def run_server_thread
       servers.map(&:start)
-      until stopped?
-        tick
-        sleep 0.001
-      end
+      sleep 0.1 until stopped?
     end
   end
 end

data/lib/backport/server/base.rb

@@ -1,9 +1,13 @@
+require 'observer'
+
 module Backport
   module Server
     # An extendable server class that provides basic start/stop functionality
     # and common callbacks.
     #
     class Base
+      include Observable
+
       # Start the server.
       #
       def start
@@ -18,6 +22,8 @@ module Backport
         return if stopped?
         stopping
         @started = false
+        changed
+        notify_observers self
       end
 
       def started?

data/lib/backport/server/connectable.rb

@@ -5,12 +5,12 @@ module Backport
     # Connectable servers check clients for incoming data on each tick.
     #
     module Connectable
-      def tick
-        mutex.synchronize do
-          clients.each(&:tick)
-          clients.delete_if(&:stopped?)
-        end
-      end
+      # def tick
+      #   mutex.synchronize do
+      #     # clients.each(&:tick)
+      #     clients.delete_if(&:stopped?)
+      #   end
+      # end
 
       def starting
         clients.map(&:run)

data/lib/backport/server/interval.rb

@@ -9,18 +9,32 @@ module Backport
       def initialize period, &block
         @period = period
         @block = block
-        @last_time = Time.now
+        @ready = false
       end
 
       def starting
-        @last_time = Time.now
+        @ready = false
+        run_ready_thread
       end
 
       def tick
-        now = Time.now
-        return unless now - @last_time >= @period
+        return unless @ready
         @block.call self
-        @last_time = now
+        @ready = false
+      end
+
+      private
+
+      def run_ready_thread
+        Thread.new do
+          until stopped?
+            sleep @period
+            break if stopped?
+            @ready = true
+            changed
+            notify_observers self
+          end
+        end
       end
     end
   end

data/lib/backport/server/stdio.rb

@@ -11,6 +11,11 @@ module Backport
         @out.binmode
         @adapter = adapter
         clients.push Client.new(input, output, adapter)
+        clients.last.add_observer self
+      end
+
+      def update client
+        client.tick
       end
     end
   end

data/lib/backport/server/tcpip.rb

@@ -38,7 +38,7 @@ module Backport
         result = nil
         mutex.synchronize do
           begin
-            conn = socket.accept_nonblock
+            conn = socket.accept
             addr = conn.addr(true)
             data = {
               family: addr[0],
@@ -47,6 +47,13 @@ module Backport
               address: addr[3]
             }
             clients.push Client.new(conn, conn, @adapter, data)
+            this = self
+            clients.last.adapter._data[:on_close] = Proc.new {
+              conn.close
+              changed
+              notify_observers this
+            }
+            clients.last.add_observer self
             clients.last.run
             result = clients.last
           rescue IO::WaitReadable, Errno::EAGAIN
@@ -62,6 +69,14 @@ module Backport
         result
       end
 
+      def update client
+        if client.stopped?
+          clients.delete client
+        else
+          client.tick
+        end
+      end
+
       private
 
       # @return [TCPSocket]

data/lib/backport/version.rb

@@ -1,3 +1,3 @@
 module Backport
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backport
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A pure Ruby library for event-driven IO