Revert "Prefer Process.pid over $$"

This reverts commit 993a252.
ruby-concurrency · Feb 22, 2023 · 8453a46 · 8453a46
1 parent 0c6f5a8
commit 8453a46
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lib/concurrent-ruby/concurrent/async.rb b/lib/concurrent-ruby/concurrent/async.rb
@@ -290,7 +290,7 @@ def initialize(delegate)
         @delegate = delegate
         @queue = []
         @executor = Concurrent.global_io_executor
-        @ruby_pid = Process.pid
+        @ruby_pid = $$
       end
 
       # Delegates method calls to the wrapped object.
@@ -346,9 +346,9 @@ def perform
       end
 
       def reset_if_forked
-        if Process.pid != @ruby_pid
+        if $$ != @ruby_pid
           @queue.clear
-          @ruby_pid = Process.pid
+          @ruby_pid = $$
         end
       end
     end

diff --git a/lib/concurrent-ruby/concurrent/executor/ruby_thread_pool_executor.rb b/lib/concurrent-ruby/concurrent/executor/ruby_thread_pool_executor.rb
@@ -138,7 +138,7 @@ def ns_initialize(opts)
       @completed_task_count = 0
       @largest_length       = 0
       @workers_counter      = 0
-      @ruby_pid             = Process.pid # detects if Ruby has forked
+      @ruby_pid             = $$ # detects if Ruby has forked
 
       @gc_interval  = opts.fetch(:gc_interval, @idletime / 2.0).to_i # undocumented
       @next_gc_time = Concurrent.monotonic_time + @gc_interval
@@ -287,15 +287,15 @@ def ns_prune_pool
     end
 
     def ns_reset_if_forked
-      if Process.pid != @ruby_pid
+      if $$ != @ruby_pid
         @queue.clear
         @ready.clear
         @pool.clear
         @scheduled_task_count = 0
         @completed_task_count = 0
         @largest_length       = 0
         @workers_counter      = 0
-        @ruby_pid             = Process.pid
+        @ruby_pid             = $$
       end
     end
 

diff --git a/lib/concurrent-ruby/concurrent/executor/timer_set.rb b/lib/concurrent-ruby/concurrent/executor/timer_set.rb
@@ -76,7 +76,7 @@ def ns_initialize(opts)
       @task_executor      = Options.executor_from_options(opts) || Concurrent.global_io_executor
       @timer_executor     = SingleThreadExecutor.new
       @condition          = Event.new
-      @ruby_pid           = Process.pid # detects if Ruby has forked
+      @ruby_pid           = $$ # detects if Ruby has forked
     end
 
     # Post the task to the internal queue.
@@ -127,10 +127,10 @@ def ns_shutdown_execution
     end
 
     def ns_reset_if_forked
-      if Process.pid != @ruby_pid
+      if $$ != @ruby_pid
         @queue.clear
         @condition.reset
-        @ruby_pid = Process.pid
+        @ruby_pid = $$
       end
     end