polyphony 0.67 → 0.71

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.67'
+  version: '0.71'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -357,7 +357,7 @@ files:
 - lib/polyphony/core/thread_pool.rb
 - lib/polyphony/core/throttler.rb
 - lib/polyphony/core/timer.rb
-- lib/polyphony/debugger/server.rb
+- lib/polyphony/debugger.rb
 - lib/polyphony/extensions/core.rb
 - lib/polyphony/extensions/debug.rb
 - lib/polyphony/extensions/fiber.rb
@@ -421,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby

data/lib/polyphony/debugger/server.rb

@@ -1,137 +0,0 @@
-# frozen_string_literal: true
-
-require 'polyphony/extensions/debug'
-
-module Polyphony
-  class DebugServer
-    TP_EVENTS = [
-      :line,
-      :call,
-      :return,
-      :b_call,
-      :b_return
-    ]
-    
-    
-    def self.start(socket_path)
-      server = self.new(socket_path)
-      server.start
-    
-      trace = TracePoint.new(*TP_EVENTS) { |tp| server.handle_tp(trace, tp) }
-      trace.enable
-
-      at_exit do
-        puts "program terminated"
-        trace.disable
-        server.stop
-      end
-    end
-
-    def initialize(socket_path)
-      @socket_path = socket_path
-      @fiber = Fiber.current
-      @controller = spin { control_loop }
-      puts "@fiber: #{@fiber.inspect}"
-    end
-
-    def start
-      fiber = Fiber.current
-      @server = spin(:pdbg_server) do
-        puts("Listening on #{@socket_path}")
-        FileUtils.rm(@socket_path) if File.exists?(@socket_path)
-        socket = UNIXServer.new(@socket_path)
-        fiber << :ready
-        id = 0
-        socket.accept_loop do |client|
-          puts "accepted connection"
-          handle_client(client)
-        end
-      end
-      receive
-    end
-
-    def stop
-      @server.terminate
-      @controller.terminate
-    end
-
-    POLYPHONY_LIB_DIR = File.expand_path('../..', __dir__)
-    def handle_client(client)
-      @client = client
-      puts "trace enabled"
-    end
-
-    def control_loop
-      @cmd = :step
-      loop do
-        case @cmd
-        when :step
-          step
-        end
-      end
-    end
-
-    def step
-      tp = nil
-      fiber = nil
-      while true
-        event = receive
-        fiber = event[:fiber]
-        if fiber == @fiber && event[:kind] == :line && event[:path] !~ /#{POLYPHONY_LIB_DIR}/
-          interact_with_client(event)
-          fiber << :ok
-          fiber.__unpark__
-          return
-        end
-          
-        fiber << :ok
-        fiber.__unpark__
-      end
-    rescue => e
-      puts "Uncaught error: #{e.inspect}"
-      @trace&.disable
-      @client = nil
-    end
-
-    def interact_with_client(event)
-      @client.puts event.inspect
-      result = @client.gets&.chomp
-    end
-
-    def handle_tp(trace, tp)
-      return if @in_handle_tp
-
-      process_tp(trace, tp)
-    end
-
-    def process_tp(trace, tp)
-      @in_handle_tp = true
-      if !@client
-        wait_for_client
-      end
-
-      puts "- #{tp.event} #{tp.path}:#{tp.lineno}"
-
-      fiber = Fiber.current
-      fiber.__park__
-
-      @controller << {
-        fiber: fiber,
-        kind: tp.event,
-        path: tp.path,
-        lineno: tp.lineno
-      }
-      receive
-    ensure
-      @in_handle_tp = nil
-    end
-
-    def wait_for_client
-      puts "wait_for_client"
-      sleep 0.1 until @client
-      puts "  got client!"
-      msg = @client.gets
-      @client.puts msg
-    end
-  end
-end