procon_bypass_man 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dddf32b941507a57c7b2c5656879e132132f51eefcd64f29788567c81566c235
-  data.tar.gz: e3649afcdb4877b41c6d05754ed77176d46a1fcc46a3d45751e15b1c91f6a23d
+  metadata.gz: 556a827cf03895e4212aa4c524963ca7efd24499c2ea14edff2d692bc3e1e63f
+  data.tar.gz: bf7cf5a735fffa13e1ff99c259a329a4c6981be755440477884ece0246188f21
 SHA512:
-  metadata.gz: 231bb01ab26c17cdd6d044030a71479dfd1016d05e353de537e3ecd3978f5f4d23b2d8c4058e4f86cadbd555e3762e6124f7cb36920df2544c306e154d568bfe
-  data.tar.gz: 8ae5c0a6b510d9b6dc22eb54fbf748e21e9b2b90671f00dc197baad2f90d00473ba4ee64f6ff148e7a200498df8f22edd738281979ab5e1240233a6bbc9e349b
+  metadata.gz: 7bdfd9d2c5bee033c8f6a1f87acebcf3374e353c0ea4d373c76f86ee33b87b248665b087276998f20dee9f0d1258ab2c7c49906cc55b94b51a5e35d84712da5c
+  data.tar.gz: 176ac515a48935df2953c36fb747e09be71c31f7850b09397e338bc0685b5da25bcd7ff81795d235287f2a5870fcdec3fec5aa9334e12ba90ca26662fe8807e7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.3.0] - 2022-9-9
+* 表示入力機能を一時的に削除しました #185
+* バイパス処理中の小さなラグがほぼなくなりました #185
+    * バイパス処理をマルチプロセスで行うようにしたのでGCによる停止時間がほぼなくなったため
+
 ## [0.2.3] - 2022-8-27
 * プロコンのラグ具合をpbm-cloudに送信し、グラフで見れるようになりました #158
 * 非同期ジョブをmasterプロセス経由で実行するようになりました #191

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    procon_bypass_man (0.2.3)
+    procon_bypass_man (0.3.0)
       action_cable_client
+      blue_green_process
       pbmenv (>= 0.1.9)
       sorted_set
 
@@ -18,6 +19,7 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
+    blue_green_process (0.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
@@ -78,7 +80,7 @@ GEM
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    set (1.0.2)
+    set (1.0.3)
     sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)

data/README.md

@@ -3,9 +3,7 @@
 
 [![Ruby](https://github.com/splaplapla/procon_bypass_man/actions/workflows/ruby.yml/badge.svg?branch=master)](https://github.com/splaplapla/procon_bypass_man/actions/workflows/ruby.yml)
 
-* Switchに繋いだプロコンを連射機にしたり、ボタンのリマップをしたり、マクロを実行できる、Raspberry Pi上で動かすツールです
-    * 設定ファイルはrubyスクリプトで記述します
-* 特定のタイトルに特化した振る舞いにしたい時は各プラグインを使ってください
+* Nintendo Switch Proコントローラーを連射機などにするRaspberry Pi上で動かすコンバータです
 * ドキュメントは [getting_started.md](docs/getting_started.md) にまとめています
 * https://pbm-cloud.herokuapp.com を使うと、webだけで運用が可能です
 
@@ -14,44 +12,17 @@
 
 https://user-images.githubusercontent.com/1664497/171327108-f12f56a5-fc36-48da-95a5-65e976553a20.mov
 
-<!--
-![image](https://user-images.githubusercontent.com/1664497/123414210-942f6980-d5ee-11eb-8192-955bd9e37e0b.png)
-```
-@startuml
-ProController \-\-> (PBM): ZR押しっぱなし
-Switch <-- (PBM): ZR連打
-@enduml
-```
--->
-
 ## 使うハードウェア
-* プロコン
+* Nintendo Switch Proコントローラー
 * Switch本体とドック
-* Raspberry Pi4 Model B/4GB(Raspberry Pi OS (32-bit))
+* Raspberry Pi4 (Raspberry Pi OS)
     * 他のシリーズは未確認です
-        * zeroは非対応
 * データ通信が可能なUSBケーブル
 
 ## 使うソフトウェア
 * ruby 2.5 以上
 
-## Usage
-* USBガジェットモードで起動するRaspberry Pi4を用意する
-  * https://github.com/splaplapla/procon_bypass_man/blob/master/docs/setup_raspi.md
-* Raspberry Pi4 でprocon_bypass_manを実行するための準備
-  * rubyのインストール
-    * sudo apt-get install rbenv
-    * git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
-    * rbenv install 3.0.1
-  * gem install pbmenv
-  * sudo [pbmenv](https://github.com/splaplapla/pbmenv) install latest
-* Raspberry Pi4 でprocon_bypass_manを実行する
-  * cd /usr/share/pbm/current
-  * sudo /home/pi/.rbenv/versions/3.0.1/bin/ruby app.rb
-  * 動いたのを確認したらserviceとして登録にするなどしてください
-    * [serviceとして登録する方法](https://github.com/splaplapla/procon_bypass_man/tree/master/project_template#systemd%E3%82%92%E4%BD%BF%E3%81%A3%E3%81%A6%E3%82%B5%E3%83%BC%E3%83%93%E3%82%B9%E3%81%AB%E7%99%BB%E9%8C%B2%E3%81%99%E3%82%8B%E6%96%B9%E6%B3%95)
-
-## Plugins
+## プラグイン
 * https://github.com/splaplapla/procon_bypass_man-splatoon2
 
 ## FAQ
@@ -109,6 +80,13 @@ sudo kill -USR2 `cat ./pbm_pid`
 * githubのreleaseを作成する
 -->
 
+## Raspberry Pi4のセットアップを代行します
+* Raspberry Pi4を開発者である私の家に配送してくれれば、セットアップを代行します。セットアップが終わり次第送り返します
+* 使い方に関しては、https://pbm-cloud.herokuapp.com ですべて完結するので、Linuxの知識は不要です
+* 何か問題が起きた時はリモートログインでサポート可能です
+* 希望者はDiscordの `kawagu#7684` にDMを送ってください
+* お金はかかりません
+
 ## 開発を支援してくれる人を募集しています
 * https://jiikko.fanbox.cc/
 * procon_bypassの運営・開発・サーバー費用に充てさせていただきます。また、問い合わせに優先して対応します。

data/docs/getting_started.md

@@ -3,6 +3,7 @@
 * [はじめに](#はじめに)
     * [procon_bypass_manで解決したいこと](#procon_bypass_manで解決したいこと)
     * [procon_bypass_manでできること](#procon_bypass_manでできること)
+* [セットアップを代行できます](#セットアップを代行できます)
 * [セットアップ](#セットアップ)
   * [ラズベリーパイのセットアップ](#ラズベリーパイのセットアップ)
   * [procon_bypass_manのインストール](#procon_bypass_manのインストール)
@@ -45,6 +46,13 @@
 * 入力表示
   * https://github.com/splaplapla/switch-procon-input-viewer
 
+## セットアップを代行できます
+* Raspberry Pi4を開発者である私の家に配送してくれれば、セットアップを代行します。セットアップが終わり次第送り返します
+* 使い方に関しては、https://pbm-cloud.herokuapp.com ですべて完結するので、Linuxの知識は不要です
+* 何か問題が起きた時はリモートログインでサポート可能です
+* 希望者はDiscordの `kawagu#7684` にDMを送ってください
+* お金はかかりません
+
 ## セットアップ
 ### ラズベリーパイのセットアップ
 

data/docs/setup_raspi_by_mitamae.md

@@ -38,7 +38,6 @@ sudo /home/pi/.rbenv/versions/3.0.1/bin/ruby app.rb
  use_pbmenv: true
  session_id: s_c6f36422-c20f-4a04-a446-b4a235c2face
  device_id: d_8b0c90d8-90*************************
- bypass_mode: normal(5)
  ----
 ```
 

data/lib/procon_bypass_man/bypass/bypass_command.rb

@@ -30,11 +30,6 @@ class ProconBypassMan::BypassCommand
     cycle_sleep = ProconBypassMan::CycleSleep.new(cycle_interval: 1, execution_cycle: ProconBypassMan.config.bypass_mode.gadget_to_procon_interval)
 
     t1 = Thread.new do
-      if ProconBypassMan.config.bypass_mode.mode == ProconBypassMan::BypassMode::TYPE_AGGRESSIVE
-        ProconBypassMan.logger.info "TYPE_AGGRESSIVEなのでThread1を終了します"
-        next
-      end
-
       bypass = ProconBypassMan::Bypass::SwitchToProcon.new(gadget: @gadget, procon: @procon)
       loop do
         break if $will_terminate_token
@@ -58,22 +53,32 @@ class ProconBypassMan::BypassCommand
     # シビア
     t2 = Thread.new do
       bypass = ProconBypassMan::Bypass::ProconToSwitch.new(gadget: @gadget, procon: @procon)
+      process = BlueGreenProcess.new(worker_instance: bypass, max_work: 200)
       loop do
         if $will_terminate_token
           if $will_terminate_token == WILL_TERMINATE_TOKEN::TERMINATE
             bypass.direct_connect_switch_via_bluetooth
+            process.shutdown
           end
           break
         end
 
-        bypass.run
+        process.work
+
+        process_switching_time_before_work = BlueGreenProcess.performance.process_switching_time_before_work
+        if process_switching_time_before_work > 0.1
+          ProconBypassMan.logger.info("slow process_switching_time_before_work: #{process_switching_time_before_work}")
+        end
+
       rescue EOFError => e
         ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します. #{e.full_message}")
         Process.kill "TERM", Process.ppid
+        process.shutdown
         break
       rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN => e
         ProconBypassMan::SendErrorCommand.execute(error: "Proconが切断されました。終了処理を開始します2. #{e.full_message}")
         Process.kill "TERM", Process.ppid
+        process.shutdown
         break
       end
     end

data/lib/procon_bypass_man/bypass/procon_to_switch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "procon_bypass_man/bypass/bypass_command"
 
 class ProconBypassMan::Bypass::ProconToSwitch
@@ -7,12 +9,13 @@ class ProconBypassMan::Bypass::ProconToSwitch
   class CouldNotReadFromProconError < StandardError; end
   class CouldNotWriteToSwitchError < StandardError; end
 
-  define_callbacks :run
-  set_callback :run, :after, :log_after_run
+  define_callbacks :work
+  set_callback :work, :after, :log_after_run
 
-  register_callback_module(ProconBypassMan::ProconDisplay::BypassHook)
+  # マルチプロセス化したので一旦無効にする
+  # register_callback_module(ProconBypassMan::ProconDisplay::BypassHook)
 
-  attr_accessor :gadget, :procon, :bypass_value, :procon_binary_queue
+  attr_accessor :gadget, :procon, :bypass_value
 
   def initialize(gadget: , procon: )
     self.gadget = gadget
@@ -21,20 +24,18 @@ class ProconBypassMan::Bypass::ProconToSwitch
 
   # @raise [Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT]
   # @return [void]
-  def run
+  def work(*)
     ProconBypassMan::Procon::PerformanceMeasurement.measure do |measurement|
       self.bypass_value = ProconBypassMan::Bypass::BypassValue.new(nil)
 
-      next(run_callbacks(:run) {
+      next(run_callbacks(:work) {
         next(false) if $will_terminate_token
 
         raw_output = nil
         measurement.record_read_time do
           begin
-            ProconBypassMan::GC.stop_gc_in do
-              return(false) if $will_terminate_token
-              raw_output = self.procon.read_nonblock(64)
-            end
+            return(false) if $will_terminate_token
+            raw_output = self.procon.read_nonblock(64)
           rescue IO::EAGAINWaitReadable
             sleep(0.002)
             retry
@@ -42,36 +43,32 @@ class ProconBypassMan::Bypass::ProconToSwitch
             return(false) if $will_terminate_token
             raise
           end
+
+          self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_output)
         end
 
-        self.bypass_value.binary = ProconBypassMan::Domains::InboundProconBinary.new(binary: raw_output)
-
-        result = ProconBypassMan::GC.stop_gc_in do
-          result = measurement.record_write_time do
-            begin
-              ProconBypassMan::Retryable.retryable(tries: 5, on_no_retry: [Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT]) do
-                begin
-                  # 終了処理を希望されているのでブロックを無視してメソッドを抜けてOK
-                  return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
-                  self.gadget.write_nonblock(
-                    ProconBypassMan::Processor.new(bypass_value.binary).process
-                  )
-                  next(true)
-                rescue IO::EAGAINWaitReadable
-                  return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
-                  measurement.record_write_error
-                  raise CouldNotWriteToSwitchError
-                rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT => e
-                  return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
-                  raise
-                end
+        result = measurement.record_write_time do
+          begin
+            ProconBypassMan::Retryable.retryable(tries: 5, on_no_retry: [Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT]) do
+              begin
+                # 終了処理を希望されているのでブロックを無視してメソッドを抜けてOK
+                return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
+                self.gadget.write_nonblock(
+                  ProconBypassMan::Processor.new(bypass_value.binary).process
+                )
+                next(true)
+              rescue IO::EAGAINWaitReadable
+                return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
+                measurement.record_write_error
+                raise CouldNotWriteToSwitchError
+              rescue Errno::EIO, Errno::ENODEV, Errno::EPROTO, IOError, Errno::ESHUTDOWN, Errno::ETIMEDOUT => e
+                return(false) if $will_terminate_token # rubocop:disable Lint/NoReturnInBeginEndBlocks
+                raise
               end
-            rescue CouldNotWriteToSwitchError
-              next(false)
             end
+          rescue CouldNotWriteToSwitchError
+            next(false)
           end
-
-          next(result)
         end
 
         next(result)
@@ -94,14 +91,9 @@ class ProconBypassMan::Bypass::ProconToSwitch
   private
 
   def log_after_run
+    return unless ProconBypassMan.config.verbose_bypass_log
     return unless bypass_value.to_text
 
-    if ProconBypassMan.config.verbose_bypass_log
-      ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
-    else
-      ProconBypassMan.cache.fetch key: 'bypass_log', expires_in: 1 do
-        ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
-      end
-    end
+    ProconBypassMan.logger.debug { "<<< #{bypass_value.to_text}" }
   end
 end

data/lib/procon_bypass_man/bypass/switch_to_procon.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "procon_bypass_man/bypass/bypass_command"
 
 class ProconBypassMan::Bypass::SwitchToProcon

data/lib/procon_bypass_man/commands/print_boot_message_command.rb

@@ -13,7 +13,6 @@ class ProconBypassMan::PrintBootMessageCommand
       @table[:use_pbmenv] = !(!!`which pbmenv`.empty?)
       @table[:session_id] = ProconBypassMan.session_id
       @table[:device_id] = ProconBypassMan.device_id
-      @table[:bypass_mode] = ProconBypassMan.config.bypass_mode.to_s
       @table[:never_exit_accidentally] = ProconBypassMan.config.never_exit_accidentally
       @table[:uname] = `uname -a`.chomp
 
@@ -43,7 +42,6 @@ class ProconBypassMan::PrintBootMessageCommand
       use_pbmenv: #{@table[:use_pbmenv]}
       session_id: #{ProconBypassMan.session_id}
       device_id: #{ProconBypassMan.device_id.gsub(/.{25}$/, "*"*25)}
-      bypass_mode: #{ProconBypassMan.config.bypass_mode}
       ----
       EOF
     end

data/lib/procon_bypass_man/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::Configuration
   module ClassMethods
     def root
@@ -70,6 +72,7 @@ class ProconBypassMan::Configuration
     end
   end
 
+  # NOTE 不具合の原因は修正済みなので可変である必要は無くなった。削除したいが各端末内の設定ファイルに存在している場合があるのでしばらく残す
   def bypass_mode=(value)
     @bypass_mode = ProconBypassMan::BypassMode.new(
       mode: value[:mode],

data/lib/procon_bypass_man/procon/analog_stick_manipulator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::Procon::AnalogStickManipulator
   attr_accessor :manipulated_abs_x, :manipulated_abs_y
 

data/lib/procon_bypass_man/procon/layer_changer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::Procon::LayerChanger
   # @param [ProconBypassMan::Domains::ProcessingProconBinary] binary
   def initialize(binary: )

data/lib/procon_bypass_man/procon/macro.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::Procon::Macro
   class BaseNestedStep
     def initialize(value)

data/lib/procon_bypass_man/procon/macro_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::Procon::MacroBuilder
   class SubjectMerger
     def self.merge(subjects)

data/lib/procon_bypass_man/procon/macro_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::Procon::MacroRegistry
   PRESETS = {
     null: [],

data/lib/procon_bypass_man/procon/performance_measurement/measurements_summarizer.rb

@@ -20,37 +20,54 @@ class ProconBypassMan::Procon::PerformanceMeasurement::MeasurementsSummarizer
   end
 
   # @return [PerformanceMetric]
+  # NOTE 中央値の表示価値が低いのでコメントアウト
   def summarize
-    sorted_write_time = @spans.map(&:write_time).sort
-    sorted_read_time = @spans.map(&:read_time).sort
-    gc_count = @spans.map(&:gc_count).sum
-    gc_time = @spans.map(&:gc_time).sum
 
-    sorted_time_taken = @spans.select(&:succeed).map(&:time_taken).sort
-    sorted_interval_from_previous_succeed = @spans.select(&:succeed).map(&:interval_from_previous_succeed).sort
+    write_time_max = 0
+    read_time_max = 0
+    time_taken_max = 0
+    interval_from_previous_succeed_max = 0
+    @spans.each do |span|
+      # NOTE @spans.map(&:write_time).sort.last と同じことだけど、処理コストを軽くするためにループを共通化する
+      write_time_max = span.write_time if write_time_max < span.write_time
+      read_time_max = span.read_time if write_time_max < span.read_time
+      time_taken_max = span.time_taken if span.succeed && time_taken_max < span.time_taken
+      interval_from_previous_succeed_max = span.interval_from_previous_succeed if span.succeed && interval_from_previous_succeed_max < span.interval_from_previous_succeed
+    end
 
-    interval_from_previous_succeed_max = sorted_interval_from_previous_succeed.last || 0
-    interval_from_previous_succeed_p50 = percentile(sorted_list: sorted_interval_from_previous_succeed , percentile: 0.50)
+    # NOTE 今はGCを無効にしており、集計するまでもないのでコメントアウトにする. 今後GCを有効にしたバイパスをするかもしれないので残しておく
+    gc_count = 0 # @spans.map(&:gc_count).sum
+    gc_time = 0 # @spans.map(&:gc_time).sum
 
-    write_time_max = sorted_write_time.last || 0
-    write_time_p50 = percentile(sorted_list: sorted_write_time , percentile: 0.50)
+    # sorted_interval_from_previous_succeed = @spans.select(&:succeed).map(&:interval_from_previous_succeed).sort
+    # interval_from_previous_succeed_max = sorted_interval_from_previous_succeed.last || 0
+    interval_from_previous_succeed_p50 = 0 # percentile(sorted_list: sorted_interval_from_previous_succeed , percentile: 0.50)
 
-    read_time_max = sorted_read_time.last || 0
-    read_time_p50 = percentile(sorted_list: sorted_read_time , percentile: 0.50)
+    # sorted_read_time = @spans.map(&:read_time).sort
+    read_time_p50 = 0 # percentile(sorted_list: sorted_read_time , percentile: 0.50)
+    # read_time_max = sorted_read_time.last || 0
 
-    time_taken_p50 = percentile(sorted_list: sorted_time_taken, percentile: 0.50)
-    time_taken_p95 = percentile(sorted_list: sorted_time_taken, percentile: 0.95)
-    time_taken_p99 = percentile(sorted_list: sorted_time_taken, percentile: 0.99)
-    time_taken_max = sorted_time_taken.last || 0
+    # sorted_write_time = @spans.map(&:write_time).sort
+    write_time_p50 = 0 # percentile(sorted_list: sorted_write_time , percentile: 0.50)
+    # write_time_max = sorted_write_time.last || 0
 
-    total_read_error_count = @spans.map(&:read_error_count).sum
-    total_write_error_count = @spans.map(&:write_error_count).sum
-    succeed_rate =
-      if @spans.length.zero?
-        0
-      else
-        succeed_rate = (sorted_time_taken.length / @spans.length.to_f).floor(3)
-      end
+    # sorted_time_taken = @spans.select(&:succeed).map(&:time_taken).sort
+    time_taken_p50 = 0 # percentile(sorted_list: sorted_time_taken, percentile: 0.50)
+    time_taken_p95 = 0 # percentile(sorted_list: sorted_time_taken, percentile: 0.95)
+    time_taken_p99 = 0 # percentile(sorted_list: sorted_time_taken, percentile: 0.99)
+    # time_taken_max = sorted_time_taken.last || 0
+
+    # NOTE webに表示していないのでコメントアウト. デバッグ時に見ることがあるので残しておく
+    total_read_error_count = 0 # @spans.map(&:read_error_count).sum
+    total_write_error_count = 0 # @spans.map(&:write_error_count).sum
+
+    # succeed_rate =
+    #   if @spans.length.zero?
+    #     0
+    #   else
+    #     succeed_rate = (sorted_time_taken.length / @spans.length.to_f).floor(3)
+    #   end
+    succeed_rate = 1 # Switchへの書き込みに失敗した時にretryしているので100%になるようになってる. succeedの個数をカウントコストを減らすためにハードコード
 
     PerformanceMetric.new(interval_from_previous_succeed_max,
                           interval_from_previous_succeed_p50,

data/lib/procon_bypass_man/procon/performance_measurement/span_transfer_buffer.rb

@@ -34,6 +34,6 @@ class ProconBypassMan::Procon::PerformanceMeasurement::SpanTransferBuffer
   end
 
   def max_buffer
-    200
+    50
   end
 end

data/lib/procon_bypass_man/procon/performance_measurement.rb

@@ -45,6 +45,13 @@ module ProconBypassMan::Procon::PerformanceMeasurement
     end
   end
 
+  # 全部送ると負荷になるので適当にまびく
+  def self.is_not_measure_with_random_or_if_fast(span: )
+    return false if span.time_taken > 0.1
+    return true if rand(20) != 0 # 19/20は捨てる
+    return false
+  end
+
   # measureをして、measureの結果をためる
   # @return [Boolean] 成功したか. テスト時に戻り値を使いたい
   def self.measure(&bypass_process_block)
@@ -63,6 +70,8 @@ module ProconBypassMan::Procon::PerformanceMeasurement
       span.succeed = bypass_process_block.call(span)
     }.floor(3)
 
+    return if is_not_measure_with_random_or_if_fast(span: span)
+
     if span.succeed
       ProconBypassMan::Procon::PerformanceMeasurement::LastBypassAt.touch do |interval_from_previous_succeed|
         span.interval_from_previous_succeed = interval_from_previous_succeed.floor(3)
@@ -79,11 +88,9 @@ module ProconBypassMan::Procon::PerformanceMeasurement
       end
     end
 
-    ProconBypassMan::GC.stop_gc_in do
-      # measureするたびにperform_asyncしているとjob queueが詰まるのでbufferingしている
-      ProconBypassMan::Procon::PerformanceMeasurement::SpanTransferBuffer.instance.push_and_run_block_if_buffer_over(span) do |spans|
-        ProconBypassMan::ProconPerformanceSpanTransferJob.perform_async(spans.dup)
-      end
+    # measureするたびにperform_asyncしているとjob queueが詰まるのでbufferingしている
+    ProconBypassMan::Procon::PerformanceMeasurement::SpanTransferBuffer.instance.push_and_run_block_if_buffer_over(span) do |spans|
+      ProconBypassMan::ProconPerformanceSpanTransferJob.perform_async(spans)
     end
     return span.succeed
   end

data/lib/procon_bypass_man/procon/suppress_rumble.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::SuppressRumble
   # @param [String] binary
   def initialize(binary: )

data/lib/procon_bypass_man/procon/user_operation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ボタンを押しているか判断するクラス。バイナリの書き換えはしない
 class ProconBypassMan::Procon::UserOperation
   attr_reader :binary

data/lib/procon_bypass_man/procon/value_objects/analog_stick.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::Procon::AnalogStick
   attr_accessor :neutral_position
   attr_writer :bin_x, :bin_y

data/lib/procon_bypass_man/procon/value_objects/binary/inbound_procon_binary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # proconから取得したばかりのバイナリ
 class ProconBypassMan::Domains::InboundProconBinary < ProconBypassMan::Domains::Binary::Base
   include ProconBypassMan::Domains::HasImmutableBinary

data/lib/procon_bypass_man/procon/value_objects/binary/processing_procon_binary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # バイナリの書き換えのみをする
 class ProconBypassMan::Domains::ProcessingProconBinary < ProconBypassMan::Domains::Binary::Base
   include ProconBypassMan::Domains::HasMutableBinary

data/lib/procon_bypass_man/procon/value_objects/rumble_binary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ProconBypassMan::RumbleBinary
   # @param [String] binary
   def initialize(binary: )

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
@@ -25,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!
@@ -41,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]
@@ -54,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
@@ -97,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
@@ -110,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
@@ -146,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/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.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/support/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ProconBypassMan
   module CallbacksRegisterable
     attr_accessor :callbacks
@@ -93,9 +95,14 @@ module ProconBypassMan
         return self.class.__callbacks[kind.to_sym]
       end
 
-      list = self.class.callbacks.flat_map { |callback_mod|
-        callback_mod.__callbacks && callback_mod.__callbacks[kind.to_sym]
-      }.compact
+      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

data/lib/procon_bypass_man/support/http_client.rb

@@ -34,6 +34,7 @@ module ProconBypassMan
 
     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,

data/lib/procon_bypass_man/support/renice_command.rb

@@ -0,0 +1,17 @@
+module ProconBypassMan
+  class ReniceCommand
+    def self.change_priority(to: , pid: )
+      cmd =
+        case to
+        when :high
+          "renice -n -20 -p #{pid}"
+        when :low
+          "renice -n 20 -p #{pid}"
+        else
+          raise "unknown priority"
+        end
+      ProconBypassMan.logger.debug { "[SHELL] #{cmd}" }
+      `#{cmd}`
+    end
+  end
+end

data/lib/procon_bypass_man/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProconBypassMan
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/procon_bypass_man.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "logger"
 require 'yaml'
 require "json"
@@ -10,6 +12,7 @@ require "ext/em_pure_ruby"
 require "ext/module"
 require "resolv-replace"
 require "pbmenv"
+require "blue_green_process"
 
 require_relative "procon_bypass_man/version"
 
@@ -38,6 +41,7 @@ require_relative "procon_bypass_man/support/cycle_sleep"
 require_relative "procon_bypass_man/support/can_over_process"
 require_relative "procon_bypass_man/support/gc"
 require_relative "procon_bypass_man/support/retryable"
+require_relative "procon_bypass_man/support/renice_command"
 require_relative "procon_bypass_man/procon_display"
 require_relative "procon_bypass_man/background"
 require_relative "procon_bypass_man/commands"
@@ -149,7 +153,7 @@ module ProconBypassMan
 
   # @return [void]
   def self.initialize_pbm
-    `renice -n 20 -p #{$$}`
+    ProconBypassMan::ReniceCommand.change_priority(to: :low, pid: $$)
     ProconBypassMan::Background::JobQueue.start!
     ProconBypassMan::Websocket::Client.start!
     # TODO ProconBypassMan::DrbObjects.start_all! みたいな感じで書きたい
@@ -173,18 +177,27 @@ module ProconBypassMan
 
   # @return [void]
   def self.after_fork_on_bypass_process
-    `renice -n -20 -p #{$$}`
+    ProconBypassMan::ReniceCommand.change_priority(to: :high, pid: $$)
     ::GC.start
     DRb.start_service if defined?(DRb)
-    ProconBypassMan::RemoteMacroReceiver.start!
-    ProconBypassMan::ProconDisplay::Server.start!
+    # GC対策することによって一時的に削除した機能
+    # ProconBypassMan::ProconDisplay::Server.start!
+
+    DRb.start_service if defined?(DRb)
+    BlueGreenProcess.configure do |config|
+      config.after_fork = -> {
+        DRb.start_service if defined?(DRb)
+        ProconBypassMan::RemoteMacroReceiver.start!
+        BlueGreenProcess.config.logger = ProconBypassMan.logger
+      }
+      config.shared_variables = [:buttons, :current_layer_key]
+    end
   end
 
   # @return [void]
   def self.terminate_pbm
     FileUtils.rm_rf(ProconBypassMan.pid_path)
     FileUtils.rm_rf(ProconBypassMan.digest_path)
-    ProconBypassMan::Background::JobQueue.shutdown
     ProconBypassMan::RemoteMacro::QueueOverProcess.shutdown
     ProconBypassMan::Procon::PerformanceMeasurement::QueueOverProcess.shutdown
     self.worker&.shutdown

data/procon_bypass_man.gemspec

@@ -28,9 +28,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "pbmenv", ">= 0.1.9" # Pbmenv.installでのenable_pbm_cloudに依存している
+  spec.add_dependency "pbmenv", ">= 0.1.9" # enable_pbm_cloud連携機能でPbmenv.installを使っている.
   spec.add_dependency "action_cable_client"
   spec.add_dependency "sorted_set"
+  spec.add_dependency "blue_green_process"
+  # spec.add_dependency "blue_green_process"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/project_template/app.rb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.2.3'
+    gem 'procon_bypass_man', '0.3.0'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1
@@ -49,9 +49,6 @@ ProconBypassMan.configure do |config|
 
   # 接続に成功したらコントローラーのHOME LEDを光らせるか
   config.enable_home_led_on_connect = true
-
-  # 操作が高頻度で固まるときは、 gadget_to_procon_interval の数値を大きくしてください
-  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 10 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

data/project_template/app.rb.erb

@@ -12,7 +12,7 @@ begin
   gemfile do
     source 'https://rubygems.org'
     git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-    gem 'procon_bypass_man', '0.2.3'
+    gem 'procon_bypass_man', '0.3.0'
   end
 rescue Bundler::Source::Git::GitCommandError => e
   retry_count_on_git_command_error = retry_count_on_git_command_error + 1
@@ -54,9 +54,6 @@ ProconBypassMan.configure do |config|
 
   # 接続に成功したらコントローラーのHOME LEDを光らせるか
   config.enable_home_led_on_connect = true
-
-  # 操作が高頻度で固まるときは、 gadget_to_procon_interval の数値を大きくしてください
-  config.bypass_mode = { mode: :normal, gadget_to_procon_interval: 10 }
 end
 
 ProconBypassMan.run(setting_path: "/usr/share/pbm/current/setting.yml")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procon_bypass_man
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - jiikko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbmenv
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: blue_green_process
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A programmable converter for Nintendo Switch Pro Controller
 email:
 - n905i.1214@gmail.com
@@ -232,6 +246,7 @@ files:
 - lib/procon_bypass_man/support/on_memory_cache.rb
 - lib/procon_bypass_man/support/procon_performance_http_client.rb
 - lib/procon_bypass_man/support/remote_macro_http_client.rb
+- lib/procon_bypass_man/support/renice_command.rb
 - lib/procon_bypass_man/support/report_http_client.rb
 - lib/procon_bypass_man/support/retryable.rb
 - lib/procon_bypass_man/support/safe_timeout.rb