1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drb: simplify shutdown pipe close logic

Browse Source 
IO#close is idempotent, so we don't need to waste bytecode
to check or nil it at shutdown time.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-08-25 02:32:10 +00:00
parent 7710bdd120
commit a48022489f
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/drb/drb.rb
View File

@ -961,14 +961,8 @@ module DRb
end end
def close_shutdown_pipe def close_shutdown_pipe
if @shutdown_pipe_r && !@shutdown_pipe_r.closed?
@shutdown_pipe_r.close
@shutdown_pipe_r = nil
end
if @shutdown_pipe_w && !@shutdown_pipe_w.closed?
@shutdown_pipe_w.close @shutdown_pipe_w.close
@shutdown_pipe_w = nil @shutdown_pipe_r.close
end
end end
private :close_shutdown_pipe private :close_shutdown_pipe
@ -1001,7 +995,7 @@ module DRb
# Graceful shutdown # Graceful shutdown
def shutdown def shutdown
@shutdown_pipe_w.close if @shutdown_pipe_w && !@shutdown_pipe_w.closed? @shutdown_pipe_w.close
end end
# Check to see if this connection is alive. # Check to see if this connection is alive.