hakuban 0.5.2 → 0.6.2

data/lib/hakuban/manager.rb

@@ -0,0 +1,275 @@
+require 'hakuban/hakuban'
+require 'ostruct'
+
+#TODO: prevent usage of old object?
+#TODO: destructors
+
+module Hakuban
+
+	class ObjectManager
+
+		attr_reader :contract
+
+		class Event < OpenStruct; end
+
+		def initialize(contract, object_class, block)
+			@contract = contract
+			@objects_mutex = Mutex.new
+			@objects = {}
+			@running_handlers = {}
+			@event_queue = Queue.new
+
+			# This callback gets called from a separate thread, with no async reactor running.
+			# So, we only use it to forward actions to the main thread.
+			@ffi_callback = proc { |descriptor, action|
+				@event_queue << Event.new(action: action, descriptor: descriptor)
+			}
+			@ffi_events = @contract.new_callback_event_queue
+			@ffi_events.callback_register(&@ffi_callback)
+
+			@async = async_run {
+				while @event_queue and event = @event_queue.shift
+					@objects_mutex.synchronize {
+						case event.action
+						when :insert
+							raise  if @objects[event.descriptor]
+							@objects[event.descriptor] = object_class.new(@contract, event.descriptor)
+							@event_queue << Event.new(action: :handler_start, descriptor: event.descriptor)  if block
+						when :change
+							raise  if not @objects[event.descriptor]
+							@objects[event.descriptor].do_change(:change)
+						when :remove
+							raise  if not @objects[event.descriptor]
+							@objects[event.descriptor].do_change(:remove)
+							@objects.delete(event.descriptor)
+						when :handler_start
+							if (object = @objects[event.descriptor]) and !object.handler_already_run and !@running_handlers[event.descriptor]
+								descriptor_for_lambda = event.descriptor	
+								@running_handlers[event.descriptor] = async_run {
+									object.run(block)
+									@event_queue << Event.new(action: :handler_finished, descriptor: descriptor_for_lambda)  if @event_queue
+								}
+							end
+						when :handler_finished
+							raise  if not @running_handlers[event.descriptor]
+							@running_handlers.delete(event.descriptor)
+							@event_queue << Event.new(action: :handler_start, descriptor: event.descriptor)  if @objects[event.descriptor]
+						when :drop
+							@ffi_events.callback_unregister
+							@objects.values.each { |object| object.do_change(:remove) }
+							while @running_handlers.size > 0
+								event = @event_queue.shift
+								@running_handlers.delete(event.descriptor)  if event.action == :handler_finished
+							end
+							@event_queue.clear
+							@objects.clear
+							@contract.drop
+							@contract, @event_queue = nil, nil
+							break
+						end
+					}
+				end
+			}
+		end
+
+
+		def objects
+			@objects_mutex.synchronize {
+				@objects.dup
+			}
+		end
+
+		
+		def object
+			@objects_mutex.synchronize {
+				@objects.values.first
+			}
+		end	
+
+
+		def drop
+			drop_nonblock
+			async_join(@async)
+		end
+
+
+		def drop_nonblock
+			if @contract
+				@event_queue << Event.new(action: :drop)
+			end
+		end
+	end
+
+
+
+	class ManagedObject
+
+		attr_reader :descriptor, :async, :handler_already_run
+
+
+		def initialize(contract, descriptor)
+			@contract,@descriptor = contract, descriptor
+			@changes = Queue.new
+			@handler_already_run = false
+		end		
+
+
+		def run(handler)
+			@handler_already_run = true
+			handler.call(self)
+		end
+
+
+		def next_event; next_change; end
+		def next_change
+			loop {
+				case @changes.shift
+				when :change then return true
+				when :remove then return false
+				end
+			}
+		end
+
+
+		def do_change(change)
+			@changes.push(change)
+		end		
+
+	end
+
+
+
+	class ObjectObserve
+
+		class ObservedObject < 	ManagedObject
+
+			def state
+				@contract.object_state
+			end
+			
+			def data
+				@contract.object_state&.data
+			end
+
+		end
+
+	end
+
+
+	class ObjectExpose
+
+		class ExposedObject < ManagedObject
+
+			def initialize(contract, descriptor)
+				super(contract, descriptor)
+				@assignment = contract.assignment
+			end
+
+			def run(handler)
+				super
+				@contract.desynchronize(@assignment)
+			end
+
+			def do_change(change)
+				@assignment = @contract.assignment
+				super(change)
+			end
+
+			def assignement
+				@assignment = @contract.assignment()
+			end
+
+			def assigned?
+				@contract.assigned?()
+			end
+
+			def set_state(*state, **kwargs)
+				kwargs[:assignment] ||= @assignment
+				@contract.set_object_state(*state, **kwargs)
+			end
+
+			def state=(state)
+				set_state(*state)
+			end
+
+			def set_data(value)
+				timestamp = Time.new.to_f
+				set_state([1, timestamp.floor, ((timestamp - timestamp.floor)*1000000000).floor, 0],value)
+			end
+
+			def data=(value)
+				set_data(value)
+			end
+
+		end
+
+	end
+
+
+	class TagObserve
+
+		class ObservedObject < 	ManagedObject
+
+			def state
+				@contract.object_state(@descriptor)
+			end
+
+			def data
+				@contract.object_state(@descriptor)&.data
+			end
+
+		end
+
+	end
+
+
+	class TagExpose
+
+		class ExposedObject < 	ManagedObject
+
+			def initialize(contract, descriptor)
+				super(contract, descriptor)
+				@assignment = contract.assignment(@descriptor)
+			end
+
+			def run(handler)
+				super
+				@contract.desynchronize(@descriptor, @assignment)
+			end
+
+			def do_change(change)
+				@assignment = @contract.assignment(@descriptor)
+				super(change)
+			end
+
+			def assignement
+				@assignment = @contract.assignment(@descriptor)
+			end
+
+			def assigned?
+				@contract.assigned?(@descriptor)
+			end
+			
+			def set_state(*args, **kwargs)
+				kwargs[:assignment] ||= @assignment
+				@contract.set_object_state(@descriptor, *args, **kwargs)
+			end
+
+			def state=(state)
+				set_state(*state)
+			end
+
+			def set_data(value)
+				timestamp = Time.new.to_f
+				set_state([1, timestamp.floor, ((timestamp - timestamp.floor)*1000000000).floor, 0],value)
+			end
+
+			def data=(value)
+				set_data(value)
+			end
+
+		end
+
+	end
+
+end

data/lib/hakuban/thread.rb

@@ -0,0 +1,44 @@
+require 'hakuban'
+require 'hakuban/manager'
+
+module Hakuban
+
+	class ThreadObjectManager < ObjectManager
+		def async_run
+			Thread.new { yield }
+		end
+
+		def async_join(thread)
+			thread.join
+		end
+	end
+
+
+	class ObjectObserve
+		def thread(&block)
+			ThreadObjectManager.new(self, ObservedObject, block)
+		end
+	end
+
+
+	class ObjectExpose
+		def thread(&block)
+			ThreadObjectManager.new(self, ExposedObject, block)
+		end
+	end
+
+
+	class TagObserve
+		def thread(&block)
+			ThreadObjectManager.new(self, ObservedObject, block)
+		end
+	end
+
+
+	class TagExpose
+		def thread(&block)
+			ThreadObjectManager.new(self, ExposedObject, block)
+		end
+	end
+
+end

data/lib/hakuban/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hakuban
-	VERSION = "0.5.2"
+	VERSION = "0.6.2"
 end

data/lib/hakuban.rb

@@ -2,6 +2,9 @@
 
 require_relative "hakuban/version"
 require_relative "hakuban/hakuban"
+require_relative "hakuban/engine"
+#require_relative "hakuban/async"
+#require_relative "hakuban/thread"
 
 module Hakuban
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hakuban
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.2
 platform: ruby
 authors:
 - yunta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -39,55 +39,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.9'
 description: Ruby binding for convenient data-object sharing library - Hakuban.
 email:
 - maciej.blomberg@mikoton.com
-executables: []
+executables:
+- hakuban-observer
+- hakuban-thread-engine
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- Gemfile
-- LICENSE.txt
+- MIT-LICENSE
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
-- examples/all-top-managed.rb
-- examples/all-top-simple.rb
-- examples/cpu-usage.rb
-- hakuban.gemspec
+- bin/hakuban-observer
+- bin/hakuban-thread-engine
 - lib/hakuban.rb
+- lib/hakuban/async.rb
+- lib/hakuban/engine.rb
+- lib/hakuban/event-queue.rb
 - lib/hakuban/ffi.rb
 - lib/hakuban/hakuban.rb
+- lib/hakuban/manager.rb
+- lib/hakuban/thread.rb
 - lib/hakuban/version.rb
 homepage: https://gitlab.com/yunta/hakuban-ruby
 licenses:
@@ -99,16 +99,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Ruby binding for Hakuban library

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/vendor/
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/Gemfile

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gemspec
-

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 yunta
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "hakuban"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/examples/all-top-managed.rb

@@ -1,46 +0,0 @@
-require 'hakuban'
-require_relative './cpu-usage.rb'
-
-
-class Utilization < Hakuban::ObjectManager::ManagedObject
-	include Hakuban::ObjectManager::ObservedObject
-	include Hakuban::ObjectManager::ExposedObject
-	
-	attr_reader :id
-
-	def initialize(contract, descriptor)
-		super
-		@id = descriptor.json["id"]
-	end
-end
-
-
-id = "#{$$}@#{`hostname`.strip}"
-
-hakuban = Hakuban::LocalNode.new
-connector = Hakuban::WebsocketConnector.new("ws://localhost:3001").start(hakuban)
-all_utilizations = hakuban.tag("utilizations").observe.manage(Utilization)
-my_utilization = hakuban.object(["utilizations"],{id: id}).expose.manage(Utilization)
-
-previous_cpu_usage_state = nil
-loop {
-	previous_cpu_usage_state, cpu_usage = CPU::current_usage(previous_cpu_usage_state)
-	my_utilization.data = [cpu_usage]
-
-	utilizations = all_utilizations.objects.values.sort_by(&:id).map { |utilization|
-		[utilization.id, utilization.data&.first]
-	}.select { |id, utilization| utilization }
-	next sleep 1 if utilizations.empty?
-
-	widest_id_width = utilizations.transpose[0].map(&:size).max
-	utilizations.each.with_index { |(id, utilization), i|
-		bars = utilization.map { |percentage| " ▁▂▃▄▅▆▇█"[percentage*9/100] }.join("")
-		bg_color = [0,0,180 + (i % 2)*64]
-		fg_color = [255,255,0]
-		puts "%s -> \e[48;2;%i;%i;%im\e[38;2;%i;%i;%im%s\e[49m\e[39m"%([id.ljust(widest_id_width)]+bg_color+fg_color+[bars])
-	}
-
-	sleep 1
-	#TODO: make this more friendly, save state, etc.
-	print "\e[2J\e[f"
-}

data/examples/all-top-simple.rb

@@ -1,26 +0,0 @@
-require 'hakuban'
-require_relative './cpu-usage.rb'
-
-
-id = "#{$$}@#{`hostname`.strip}"
-
-hakuban = Hakuban::LocalNode.new
-connector = Hakuban::WebsocketConnector.new("ws://localhost:3001").start(hakuban)
-all_utilizations = hakuban.tag("utilizations").observe
-my_utilization = hakuban.object(["utilizations"],{id: id}).expose
-
-previous_cpu_usage_state = nil
-
-loop {
-	previous_cpu_usage_state, cpu_usage = CPU::current_usage(previous_cpu_usage_state)
-	my_utilization.set_object_state([Time.new.to_f],[],[cpu_usage])    if cpu_usage
-
-	all_utilizations.object_descriptors.map { |descriptor|
-		if data = all_utilizations.object_state(descriptor).data
-			puts "#{descriptor.json["id"]} -> #{data.first}"
-		end
-	}
-
-	sleep 1
-	puts
-}

data/examples/cpu-usage.rb

@@ -1,16 +0,0 @@
-module CPU
-
-	def self.current_usage(previous_cpu_usage_state)
-		current_uptime = open("/proc/uptime") { |file| file.read.split(" ")[0].to_f }
-		current_cpu_ticks = open("/proc/stat") { |file| 
-			file.read.split("\n").select { |line| line.start_with?(/cpu[0-9]+/) }.map { |line| line.split(" ")[4].to_f }
-		}
-		cpu_usage = previous_cpu_usage_state&.dig(0)&.zip(current_cpu_ticks)&.map { |old_ticks, new_ticks|
-			[0,(100 - (new_ticks - old_ticks) / (current_uptime - previous_cpu_usage_state[1]))].max.floor 
-		}
-		[[current_cpu_ticks, current_uptime], cpu_usage]
-	end
-
-end
-
-

data/hakuban.gemspec

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/hakuban/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "hakuban"
-  spec.version       = Hakuban::VERSION
-  spec.authors       = ["yunta"]
-  spec.email         = ["maciej.blomberg@mikoton.com"]
-
-  spec.summary       = "Ruby binding for Hakuban library"
-  spec.description   = "Ruby binding for convenient data-object sharing library - Hakuban."
-  spec.homepage      = "https://gitlab.com/yunta/hakuban-ruby"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
-
-  #spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-  #spec.metadata["homepage_uri"] = spec.homepage
-  #spec.metadata["source_code_uri"] = "https://gitlab.com/yunta/hakuban-ruby"
-  #spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
-  end
-  #spec.bindir        = "exe"
-  #spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "rspec", "~>3.10"
-  spec.add_dependency "ffi", "~>1.15"
-  spec.add_dependency "msgpack", "~>1.4"
-  spec.add_dependency "json", "~>2.5"
-end