diff options
author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-04 16:29:03 +0000 |
---|---|---|
committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-04 16:29:03 +0000 |
commit | 8efdbaeb2b9503c06fe479f415f72ece57b250c4 (patch) | |
tree | f46a8ef393c5bb1940aadd048f70f159c55d0285 | |
parent | 15ef70dc59e865e21e7a5c79914dfd8120da00b8 (diff) | |
download | ruby-8efdbaeb2b9503c06fe479f415f72ece57b250c4.tar.gz ruby-8efdbaeb2b9503c06fe479f415f72ece57b250c4.tar.xz ruby-8efdbaeb2b9503c06fe479f415f72ece57b250c4.zip |
* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
the socket whose last-access-time is oldest. (and add new one)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/drb/drb.rb | 11 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon Jul 5 01:20:17 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close + the socket whose last-access-time is oldest. (and add new one) + Sun Jul 4 12:24:50 2004 Kouhei Sutou <kou@cozmixng.org> * lib/rss/rss.rb: added copyright header. diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 829b9cb91..8919a946b 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1080,11 +1080,14 @@ module DRb return succ, result ensure - @mutex.synchronize do - if @pool.size > POOL_SIZE or ! succ - conn.close if conn + if conn + if succ + @mutex.synchronize do + @pool.unshift(conn) + @pool.pop.close while @pool.size > POOL_SIZE + end else - @pool.unshift(conn) + conn.close end end end |