github-migration
/
mongo-ruby-driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed a completely unnecessary mutex.

This commit is contained in:
Kyle Banker 2011-10-07 12:13:18 -04:00
parent 09c8a3838c
commit 118cb18c33
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/mongo/connection.rb
View File

@ -436,10 +436,8 @@ module Mongo
packed_message = message.append!(last_error_message).to_s packed_message = message.append!(last_error_message).to_s
begin begin
sock = checkout_writer sock = checkout_writer
@safe_mutexes[sock].synchronize do send_message_on_socket(packed_message, sock)
send_message_on_socket(packed_message, sock) docs, num_received, cursor_id = receive(sock, last_error_id)
docs, num_received, cursor_id = receive(sock, last_error_id)
end
ensure ensure
checkin(sock) checkin(sock)
end end
@ -467,7 +465,8 @@ module Mongo
# @return [Array] # @return [Array]
# An array whose indexes include [0] documents returned, [1] number of document received, # An array whose indexes include [0] documents returned, [1] number of document received,
# and [3] a cursor_id. # and [3] a cursor_id.
def receive_message(operation, message, log_message=nil, socket=nil, command=false, read=:primary, exhaust=false) def receive_message(operation, message, log_message=nil, socket=nil, command=false,
read=:primary, exhaust=false)
request_id = add_message_headers(message, operation) request_id = add_message_headers(message, operation)
packed_message = message.to_s packed_message = message.to_s
begin begin
@ -488,10 +487,8 @@ module Mongo
end end
result = '' result = ''
@safe_mutexes[sock].synchronize do send_message_on_socket(packed_message, sock)
send_message_on_socket(packed_message, sock) result = receive(sock, request_id, exhaust)
result = receive(sock, request_id, exhaust)
end
ensure ensure
if should_checkin if should_checkin
checkin(sock) checkin(sock)
@ -666,10 +663,6 @@ module Mongo
# Global safe option. This is false by default. # Global safe option. This is false by default.
@safe = opts[:safe] || false @safe = opts[:safe] || false
# Create a mutex when a new key, in this case a socket,
# is added to the hash.
@safe_mutexes = Hash.new { |h, k| h[k] = Mutex.new }
# Condition variable for signal and wait # Condition variable for signal and wait
@queue = ConditionVariable.new @queue = ConditionVariable.new