procon_bypass_man 0.2.1 → 0.3.0

data/lib/procon_bypass_man/procon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "procon_bypass_man/procon/macro_plugin_map"
 
 class ProconBypassMan::Procon
@@ -7,8 +9,9 @@ class ProconBypassMan::Procon
   require "procon_bypass_man/procon/value_objects/rumble_binary"
   require "procon_bypass_man/procon/value_objects/binary"
   require "procon_bypass_man/procon/value_objects/bypass_mode"
-
   require "procon_bypass_man/procon/consts"
+  require "procon_bypass_man/procon/performance_measurement"
+  require "procon_bypass_man/procon/performance_measurement/queue_over_process"
   require "procon_bypass_man/procon/mode_registry"
   require "procon_bypass_man/procon/macro"
   require "procon_bypass_man/procon/macro_registry"
@@ -24,11 +27,11 @@ class ProconBypassMan::Procon
 
   def self.reset!
     @@status = {
-      buttons: {},
-      current_layer_key: :up,
       ongoing_macro: MacroRegistry.load(:null),
-      ongoing_mode: ModeRegistry.load(:manual),
+      ongoing_mode: ModeRegistry.load(:manual), # 削除予定
     }
+    BlueGreenProcess::SharedVariable.instance.data["buttons"] = {}
+    BlueGreenProcess::SharedVariable.instance.data["current_layer_key"] = :up
     @@left_stick_tilting_power_scaler = ProconBypassMan::AnalogStickTiltingPowerScaler.new
   end
   reset!
@@ -40,10 +43,20 @@ class ProconBypassMan::Procon
     )
   end
 
-  def status; @@status[:buttons]; end
+  def status
+    BlueGreenProcess::SharedVariable.instance.data["buttons"]
+  end
+
+  def current_layer_key
+    BlueGreenProcess::SharedVariable.instance.data["current_layer_key"].to_sym
+  end
+
+  def current_layer_key=(layer)
+    BlueGreenProcess::SharedVariable.instance.data["current_layer_key"] = layer
+  end
+
   def ongoing_macro; @@status[:ongoing_macro]; end
   def ongoing_mode; @@status[:ongoing_mode]; end
-  def current_layer_key; @@status[:current_layer_key]; end
 
   def current_layer
     ProconBypassMan::ButtonsSettingConfiguration.instance.layers[current_layer_key]
@@ -53,7 +66,7 @@ class ProconBypassMan::Procon
   def apply!
     layer_changer = ProconBypassMan::Procon::LayerChanger.new(binary: user_operation.binary)
     if layer_changer.change_layer?
-      @@status[:current_layer_key] = layer_changer.next_layer_key if layer_changer.pressed_next_layer?
+      self.current_layer_key = layer_changer.next_layer_key if layer_changer.pressed_next_layer?
       user_operation.set_no_action!
       return
     end
@@ -96,10 +109,14 @@ class ProconBypassMan::Procon
 
     # remote macro
     if task = ProconBypassMan::RemoteMacro::TaskQueueInProcess.non_blocking_shift
+      no_op_step = :wait_for_0_3 # マクロの最後に固まって最後の入力をし続けるので、無の状態を最後に注入する
+      BlueGreenProcess::SharedVariable.extend_run_on_this_process = true
       ProconBypassMan::Procon::MacroRegistry.cleanup_remote_macros!
       macro_name = task.name || "RemoteMacro-#{task.steps.join}".to_sym
+      task.steps << no_op_step
       ProconBypassMan::Procon::MacroRegistry.install_plugin(macro_name, steps: task.steps, macro_type: :remote)
       @@status[:ongoing_macro] = MacroRegistry.load(macro_name, macro_type: :remote) do
+        GC.start # NOTE: extend_run_on_this_process = true するとGCされなくなるので手動で呼び出す
         ProconBypassMan::PostCompletedRemoteMacroJob.perform_async(task.uuid)
       end
     end
@@ -109,6 +126,7 @@ class ProconBypassMan::Procon
       @@status[:ongoing_mode] = ModeRegistry.load(:manual)
       current_layer.flip_buttons.each do |button, options|
         if !options[:if_pressed]
+          # FIXME マルチプロセス化したので、クラス変数に状態を保持するFlipCacheは意図した挙動にならない. BlueGreenProcess.shared_variables を使って状態をプロセス間で共有すれば動く
           FlipCache.fetch(key: button, expires_in: options[:flip_interval]) do
             status[button] = !status[button]
           end
@@ -145,6 +163,7 @@ class ProconBypassMan::Procon
     end
 
     if ongoing_macro.ongoing? && (step = ongoing_macro.next_step)
+      BlueGreenProcess::SharedVariable.extend_run_on_this_process = true
       ongoing_macro.force_neutral_buttons&.each do |force_neutral_button|
         user_operation.unpress_button(force_neutral_button)
       end

data/lib/procon_bypass_man/procon_display/bypass_hook.rb

@@ -0,0 +1,12 @@
+module ProconBypassMan::ProconDisplay::BypassHook
+  include ProconBypassMan::Callbacks
+
+  define_callbacks :run
+
+  set_callback :run, :after, :write_procon_display_status
+
+  def write_procon_display_status
+    return unless bypass_value.binary
+    ProconBypassMan::ProconDisplay::Status.instance.current = bypass_value.binary.to_procon_reader.to_hash.dup
+  end
+end

data/lib/procon_bypass_man/procon_display.rb

@@ -8,3 +8,4 @@ require "procon_bypass_man/procon_display/server_app"
 require "procon_bypass_man/procon_display/status"
 require "procon_bypass_man/procon_display/http_response"
 require "procon_bypass_man/procon_display/http_request"
+require "procon_bypass_man/procon_display/bypass_hook"

data/lib/procon_bypass_man/remote_macro/queue_over_process.rb

@@ -1,62 +1,44 @@
-class ProconBypassMan::QueueOverProcess
-  attr_reader :drb
-
-  @@drb_server = nil
-  @@drb_server_thread = nil
-
-  def self.start!
-    return unless ProconBypassMan.config.enable_remote_macro?
-    require 'drb/drb'
-
-    FileUtils.rm_rf(file_path) if File.exist?(file_path)
-    begin
-      @@drb_server = DRb.start_service(url, Queue.new, safe_level: 1)
-    rescue Errno::EADDRINUSE => e
-      ProconBypassMan.logger.error e
-      raise
-    end
-
-    @@drb_server_thread =
-      Thread.new do
-        DRb.thread.join
-      end
-  end
+class ProconBypassMan::RemoteMacro::QueueOverProcess
+  extend ProconBypassMan::CanOverProcess
 
-  def self.shutdown
-    if @@drb_server
-      @@drb_server_thread.kill
-      @@drb_server.stop_service
-    end
-  end
+  include Singleton
 
-  def self.push(value)
-    return unless ProconBypassMan.config.enable_remote_macro?
+  attr_reader :distributed_queue
 
-    drb.push(value)
+  # @override
+  def self.enable?
+    ProconBypassMan.config.enable_remote_macro?
   end
 
-  def self.pop
-    return unless ProconBypassMan.config.enable_remote_macro?
+  # @override
+  def self.distributed_class
+    Queue
+  end
 
-    drb.pop
+  # @override
+  def self.socket_file_path
+    "/tmp/procon_bypass_man_remote_macro_queue".freeze
   end
 
-  def self.drb
-    return unless ProconBypassMan.config.enable_remote_macro?
+  def self.push(value)
+    return unless enable?
 
-    @@drb ||= new.drb
+    instance.distributed_queue.push(value)
   end
 
-  PROTOCOL = "drbunix"
-  def self.url
-    "#{PROTOCOL}:/tmp/procon_bypass_man_queue"
+  def self.pop
+    return unless enable?
+
+    instance.distributed_queue.pop
   end
 
-  def self.file_path
-    url.gsub("#{PROTOCOL}:", "")
+  def self.clear
+    return unless enable?
+
+    instance.distributed_queue.clear
   end
 
   def initialize
-    @drb = DRbObject.new_with_uri(self.class.url)
+    @distributed_queue = DRbObject.new_with_uri(self.class.socket_path)
   end
 end

data/lib/procon_bypass_man/remote_macro/remote_macro_object.rb

@@ -1,30 +1,28 @@
-module ProconBypassMan
-  class RemoteMacroObject
-    # valueobjectがvalidatorの責務も持っている. 今度分離する
-    class ValidationError < StandardError; end
-    class MustBeNotNilError < ValidationError; end
-    class NonSupportAction < ValidationError; end
+class ProconBypassMan::RemoteMacro::RemoteMacroObject
+  # valueobjectがvalidatorの責務も持っている. 今度分離する
+  class ValidationError < StandardError; end
+  class MustBeNotNilError < ValidationError; end
+  class NonSupportAction < ValidationError; end
 
-    attr_accessor :name, :uuid, :steps
+  attr_accessor :name, :uuid, :steps
 
-    # @param [String] name
-    # @param [String] uuid
-    # @param [Array] steps
-    def initialize(name: , uuid:, steps: )
-      @name = name
-      @uuid = uuid
-      @steps = steps
-      freeze
-    end
+  # @param [String] name
+  # @param [String] uuid
+  # @param [Array] steps
+  def initialize(name: , uuid:, steps: )
+    @name = name
+    @uuid = uuid
+    @steps = steps
+    freeze
+  end
 
-    # @raise [MustBeNotNilError]
-    # @raise [NonSupportAction]
-    # @return [void]
-    def validate!
-      self.uuid or raise MustBeNotNilError, "uuidは値が必須です"
-      unless self.steps.is_a?(Array)
-        raise ValidationError, "stepsは配列です"
-      end
+  # @raise [MustBeNotNilError]
+  # @raise [NonSupportAction]
+  # @return [void]
+  def validate!
+    self.uuid or raise MustBeNotNilError, "uuidは値が必須です"
+    unless self.steps.is_a?(Array)
+      raise ValidationError, "stepsは配列です"
     end
   end
 end

data/lib/procon_bypass_man/remote_macro/remote_macro_receiver.rb

@@ -15,7 +15,7 @@ class ProconBypassMan::RemoteMacroReceiver
   end
 
   def self.run
-    while(task = ProconBypassMan::QueueOverProcess.pop)
+    while(task = ProconBypassMan::RemoteMacro::QueueOverProcess.pop)
       receive(task)
     end
     shutdown

data/lib/procon_bypass_man/remote_macro/remote_macro_sender.rb

@@ -1,7 +1,7 @@
 class ProconBypassMan::RemoteMacroSender
   def self.execute(name: , uuid: , steps: )
     ProconBypassMan.logger.info "[remote macro][sender] name: #{name}, uuid: #{uuid}, steps: #{steps}"
-    ProconBypassMan::QueueOverProcess.push(
+    ProconBypassMan::RemoteMacro::QueueOverProcess.push(
       ProconBypassMan::RemoteMacro::Task.new(name, uuid, steps)
     )
   end

data/lib/procon_bypass_man/remote_macro/task.rb

@@ -1,6 +1,2 @@
-module ProconBypassMan
-  module RemoteMacro
-    class Task < Struct.new(:name, :uuid, :steps)
-    end
-  end
+class ProconBypassMan::RemoteMacro::Task < ::Struct.new(:name, :uuid, :steps)
 end

data/lib/procon_bypass_man/remote_macro/task_queue.rb

@@ -1,13 +1,9 @@
-module ProconBypassMan
-  module RemoteMacro
-    class TaskQueue < ::Queue
-      def present?
-        not empty?
-      end
+class ProconBypassMan::RemoteMacro::TaskQueue < ::Queue
+  def present?
+    not empty?
+  end
 
-      def non_blocking_shift
-        present? && shift
-      end
-    end
+  def non_blocking_shift
+    present? && shift
   end
 end

data/lib/procon_bypass_man/remote_macro.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ProconBypassMan
   module RemoteMacro
     require "procon_bypass_man/remote_macro/remote_macro_object"

data/lib/procon_bypass_man/remote_pbm_action/commands/update_remote_pbm_action_status_command.rb

@@ -10,7 +10,7 @@ module ProconBypassMan
     def execute(to_status: )
       ProconBypassMan::UpdateRemotePbmActionStatusHttpClient.new(
         path: path,
-        server_pool: ProconBypassMan.config.server_pool,
+        server: ProconBypassMan.config.api_server,
       ).put(to_status: to_status)
     end
 

data/lib/procon_bypass_man/remote_pbm_action.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ProconBypassMan
   module RemotePbmAction
     require "procon_bypass_man/remote_pbm_action/base_action"

data/lib/procon_bypass_man/runner.rb

@@ -1,8 +1,4 @@
-require_relative "io_monitor"
-
 class ProconBypassMan::Runner
-  class InterruptForRestart < StandardError; end
-
   include ProconBypassMan::SignalHandler
 
   def initialize(gadget: , procon: )
@@ -24,14 +20,12 @@ class ProconBypassMan::Runner
 
     loop do
       # NOTE メインプロセスではThreadをいくつか起動しているので念のためパフォーマンスを優先するためにforkしていく
-      child_pid = Kernel.fork {
+      child_pid = Kernel.fork do
         $will_terminate_token = false
-        DRb.start_service if defined?(DRb)
-        ProconBypassMan::RemoteMacroReceiver.start!
-        ProconBypassMan::ProconDisplay::Server.start!
+        ProconBypassMan.after_fork_on_bypass_process
         ProconBypassMan::BypassCommand.new(gadget: @gadget, procon: @procon).execute # ここでblockingする
         next
-      }
+      end
 
       begin
         # TODO 子プロセスが消滅した時に、メインプロセスは生き続けてしまい、何もできなくなる問題がある
@@ -39,7 +33,7 @@ class ProconBypassMan::Runner
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
         end
-      rescue InterruptForRestart
+      rescue ProconBypassMan::InterruptForRestart
         ProconBypassMan::PrintMessageCommand.execute(text: "設定ファイルの再読み込みを開始します")
         Process.kill("USR2", child_pid)
         Process.wait

data/lib/procon_bypass_man/scheduler.rb

@@ -68,13 +68,22 @@ module ProconBypassMan
     end
 
     def self.register_schedules
-      register(
-        schedule: Schedule.new(
-          klass: ProconBypassMan::SyncDeviceStatsJob,
-          args: [->{ ProconBypassMan::DeviceStatus.current }],
-          interval: 60,
+      if ProconBypassMan.config.has_api_server?
+        register(
+          schedule: Schedule.new(
+            klass: ProconBypassMan::SyncDeviceStatsJob,
+            args: [->{ ProconBypassMan::DeviceStatus.current }],
+            interval: 60,
+          )
         )
-      ) if ProconBypassMan.config.has_api_server?
+        register(
+          schedule: Schedule.new(
+            klass: ProconBypassMan::ReportProconPerformanceMeasurementsJob,
+            args: [->{ ProconBypassMan::Procon::PerformanceMeasurement.pop_measurement_collection }],
+            interval: 60,
+          )
+        )
+      end
     end
 
     # @param [Schedule] schedule

data/lib/procon_bypass_man/support/callbacks.rb

@@ -1,21 +1,17 @@
+# frozen_string_literal: true
+
 module ProconBypassMan
-  module Callbacks
-    class CallbacksChain
-      attr_accessor :filter, :chain_method
-      def initialize(filter: , chain_method: , block: )
-        @filter = filter
-        @chain_method = chain_method
-        @block = block
-      end
-    end
+  module CallbacksRegisterable
+    attr_accessor :callbacks
 
-    # TODO __callbacksをincludeしたクラス側で保持する. 今はnemespaceがない
-    module M
-      class << self
-        attr_accessor :__callbacks
-      end
+    def register_callback_module(mod)
+      self.callbacks ||= []
+      callbacks << mod
+      self.include(mod)
     end
+  end
 
+  module Callbacks
     module ClassMethods
       def define_callbacks(name)
         self.singleton_class.attr_accessor "_#{name}_callbacks"
@@ -29,8 +25,9 @@ module ProconBypassMan
       end
 
       def set_callback(kind, filter, chain_method, &block)
-        ProconBypassMan::Callbacks::M.__callbacks ||= {}
-        ProconBypassMan::Callbacks::M.__callbacks[kind] = CallbacksChain.new(
+        self.__callbacks ||= {}
+        self.__callbacks[kind] ||= CallbackChain.new
+        self.__callbacks[kind].append Callback.new(
           filter: filter,
           chain_method: chain_method,
           block: block,
@@ -38,33 +35,81 @@ module ProconBypassMan
       end
     end
 
+    def self.included(mod)
+      mod.singleton_class.attr_accessor :__callbacks
+      mod.extend(ClassMethods)
+    end
+
+    class CallbackChain
+      attr_accessor :callbacks
+
+      def initialize
+        self.callbacks = {}
+      end
+
+      def empty?
+        callbacks.empty?
+      end
+
+      def append(callback)
+        self.callbacks[callback.filter] ||= []
+        self.callbacks[callback.filter] << callback
+      end
+
+      def [](filter)
+        self.callbacks[filter]
+      end
+    end
+
+    class Callback
+      attr_accessor :filter, :chain_method
+
+      def initialize(filter: , chain_method: , block: )
+        @filter = filter
+        @chain_method = chain_method
+        @block = block
+      end
+    end
+
     # TODO haltしたらcallbackを止める
-    # TODO 複数をチェインできるようにする
     def run_callbacks(kind, &block)
-      chain = get_callbacks(kind) or raise("unknown callback")
-      case chain.filter
-      when :before
+      chains = get_callbacks(kind) or raise("unknown callback")
+      if chains.nil? || chains.empty?
+        return block.call
+      end
+
+      chains[:before]&.each do |chain|
         send chain.chain_method
-        block.call
-      when :after
-        block.call
+      end
+      result = block.call
+      chains[:after]&.each do |chain|
         send chain.chain_method
-      else
-        raise("unknown filter")
       end
-    end
 
-    # def __run_callbacks__(name, &block)
-    #   puts "called"
-    # end
+      return result
+    end
 
     def get_callbacks(kind) # :nodoc:
-      ProconBypassMan::Callbacks::M.__callbacks[kind.to_sym]
-    end
+      # classに直接moduleをincludeしている場合
+      if defined?(self.class.__callbacks) && !self.class.respond_to?(:callbacks)
+        return self.class.__callbacks[kind.to_sym]
+      end
 
-    def set_callbacks(name, callbacks) # :nodoc:
-      send "_#{name}_callbacks=", callbacks
-      ProconBypassMan::Callbacks::M.__callbacks[kind.to_sym] = callbacks
+      list =
+        if self.class.callbacks.nil?
+          []
+        else
+          self.class.callbacks.flat_map { |callback_mod|
+            callback_mod.__callbacks && callback_mod.__callbacks[kind.to_sym]
+          }.compact
+        end
+      if(self.class.respond_to?(:__callbacks) && chain = self.class.__callbacks[kind.to_sym])
+        list << chain
+      end
+      table = {}
+      table[:before] = list.flat_map { |x| x[:before] }.compact
+      table[:after] = list.flat_map { |x| x[:after] }.compact
+      table
     end
   end
 end

data/lib/procon_bypass_man/support/can_over_process.rb

@@ -0,0 +1,60 @@
+require 'drb/drb'
+
+# NOTE マスタープロセスでstart_distributed_object!をコールする必要がある
+#      forkをしたらそのさきでDRb.start_serviceをコールする必要がある
+module ProconBypassMan::CanOverProcess
+  PROTOCOL = "drbunix".freeze
+
+  def self.extended(mod)
+    mod.singleton_class.attr_accessor :drb_server, :drb_server_thread
+  end
+
+  # @return [void]
+  def start_distributed_object!
+    return unless enable?
+
+    FileUtils.rm_rf(socket_file_path) if File.exist?(socket_file_path)
+    begin
+      self.drb_server = DRb.start_service(socket_path, distributed_class.new, safe_level: 1)
+    rescue Errno::EADDRINUSE => e
+      ProconBypassMan.logger.error e
+      raise
+    end
+
+    self.drb_server_thread =
+      Thread.new do
+        DRb.thread.join
+      end
+  end
+  alias start! start_distributed_object!
+
+  # @return [void]
+  def shutdown_distributed_object
+    if self.drb_server
+      self.drb_server_thread&.kill
+      self.drb_server_thread = nil
+      self.drb_server.stop_service
+    end
+  end
+  alias shutdown shutdown_distributed_object
+
+  # @return [Boolean]
+  def enable?
+    raise NotImplementedError
+  end
+
+  # @return [String]
+  def socket_file_path
+    raise NotImplementedError
+  end
+
+  # @return [any]
+  def distributed_class
+    raise NotImplementedError
+  end
+
+  # @return [String]
+  def socket_path
+    "#{PROTOCOL}:#{socket_file_path}".freeze
+  end
+end

data/lib/procon_bypass_man/support/gc.rb

@@ -0,0 +1,8 @@
+class ProconBypassMan::GC
+  def self.stop_gc_in(&block)
+    ::GC.disable
+    result = block.call
+    ::GC.enable
+    return result
+  end
+end

data/lib/procon_bypass_man/support/http_client.rb

@@ -26,14 +26,15 @@ module ProconBypassMan
       end
     end
 
-    def initialize(path: , server_pool: , retry_on_connection_error: false)
-      @server_pool = server_pool
-      @uri = URI.parse("#{server_pool.server}#{path}")
+    def initialize(path: , server: , retry_on_connection_error: false)
+      @server = server
+      @uri = URI.parse("#{server}#{path}")
       @retry_on_connection_error = retry_on_connection_error
     end
 
     def get
       handle_request do
+        ProconBypassMan.logger.info "[HTTP] GET #{@uri}"
         response = HttpRequest::Get.request!(
           uri: @uri,
         )
@@ -44,6 +45,7 @@ module ProconBypassMan
     def post(request_body: )
       handle_request do
         body = {}.merge!(request_body)
+        ProconBypassMan.logger.info "[HTTP] POST #{@uri}"
         response = HttpRequest::Post.request!(
           uri: @uri,
           request_body: body,
@@ -57,6 +59,7 @@ module ProconBypassMan
         body = {
           hostname: `hostname`.chomp,
         }.merge!(request_body)
+        ProconBypassMan.logger.info "[HTTP] PUT #{@uri}"
         response = HttpRequest::Put.request!(
           uri: @uri,
           request_body: body,
@@ -76,14 +79,13 @@ module ProconBypassMan
           return response.body
         end
       else
-        @server_pool.next!
         ProconBypassMan.logger.error("#{@uri}から200以外(#{response.code})が帰ってきました. #{response.body}")
       end
     end
 
     def handle_request
       raise "need block" unless block_given?
-      if @server_pool.server.nil?
+      if @server.nil?
         ProconBypassMan.logger.info('送信先が未設定なのでスキップしました')
         return
       end
@@ -94,6 +96,10 @@ module ProconBypassMan
         sleep(10)
         retry
       end
+    rescue Timeout::Error
+      ProconBypassMan.logger.error(e)
+      sleep(10)
+      retry
     rescue => e
       puts e
       ProconBypassMan.logger.error(e)
@@ -102,5 +108,5 @@ module ProconBypassMan
 end
 
 if $0 == __FILE__
-  ProconBypassMan::HttpClient.new(path: '/', server_pool: nil, retry_on_connection_error: false).get(response_body: '')
+  ProconBypassMan::HttpClient.new(path: '/', server: nil, retry_on_connection_error: false).get(response_body: '')
 end