firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fixed few my mistakes noted by Claudio

Browse Source
This commit is contained in:
hvlad 2008-03-15 13:46:28 +00:00
parent 9ede115146
commit 5c2300fc65
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/remote/inet.cpp
View File

@ -3482,16 +3482,16 @@ static void unhook_disconnected_ports(rem_port* main_port)
for (rem_port* port = main_port; port; port = port->port_next)
{
Firebird::RefMutexEnsureUnlock portGuard(*port->port_sync);
if (port->port_sync->tryEnter()) {
if (portGuard.tryEnter()) {
if (port->port_state == state_disconnected) {
more = true;
unhook_port(port, port->port_parent);
port->port_sync->leave();
portGuard.leave();
cleanup_port(port);
break;
}
else {
port->port_sync->leave();
portGuard.leave();
}
}
}

12
src/remote/server.cpp
View File

@ -537,7 +537,7 @@ void SRVR_multi_thread( rem_port* main_port, USHORT flags)
}
Firebird::RefMutexEnsureUnlock portGuard(*port->port_sync);
const bool portLocked = port->port_sync->tryEnter();
const bool portLocked = portGuard.tryEnter();
if (portLocked || !dataSize)
{
@ -558,7 +558,7 @@ void SRVR_multi_thread( rem_port* main_port, USHORT flags)
if (request->req_receive.p_operation == op_partial)
{
port->setRecvState(recvState);
port->port_sync->leave();
portGuard.leave();
// gds__log("Partial");
free_request(request);
@ -577,7 +577,7 @@ void SRVR_multi_thread( rem_port* main_port, USHORT flags)
request->req_port = port;
if (portLocked) {
port->port_sync->leave();
portGuard.leave();
}
if (!link_request(port, request))
@ -5286,7 +5286,7 @@ static THREAD_ENTRY_DECLARE loopThread(THREAD_ENTRY_PARAM)
/* Validate port. If it looks ok, process request */
Firebird::RefMutexEnsureUnlock portQueGuard(*request->req_port->port_sync);
Firebird::RefMutexEnsureUnlock portQueGuard(*request->req_port->port_que_sync);
{ // port_sync scope
Firebird::RefMutexGuard portGuard(*request->req_port->port_sync);
@ -5331,7 +5331,7 @@ static THREAD_ENTRY_DECLARE loopThread(THREAD_ENTRY_PARAM)
// port_sync, else we can miss data arrived at time between
// releasing locks and will never handle it. Therefore we
// can't ise MutexLockGuard here
port->port_que_sync->enter();
portQueGuard.enter();
if (port->haveRecvData())
{
SERVER_REQ new_request = alloc_request();
@ -5360,7 +5360,7 @@ static THREAD_ENTRY_DECLARE loopThread(THREAD_ENTRY_PARAM)
} // port_sync scope
if (port) {
port->port_que_sync->leave();
portQueGuard.leave();
}
{ // request_que_mutex scope