Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed deadlock if another thread holds the transport lock when Process is called...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@34783 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
1999-06-11 08:34:21 +00:00
parent 0846133faf
commit 7e5fed03fa
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/netwerk/base/src/nsSocketTransportService.cpp
View File

@@ -205,7 +205,7 @@ nsresult nsSocketTransportService::ProcessWorkQ(void)
// XXX: Need a way to restart the ProcessWorkQ(...) when space becomes
// available in the select set...
//
nsAutoLock lock(mThreadLock);
PR_Lock(mThreadLock);
while (!PR_CLIST_IS_EMPTY(&mWorkQ) &&
(MAX_OPEN_CONNECTIONS > mSelectFDSetCount)) {
nsSocketTransport* transport;
@@ -216,10 +216,16 @@ nsresult nsSocketTransportService::ProcessWorkQ(void)
transport = nsSocketTransport::GetInstance(qp);
PR_REMOVE_AND_INIT_LINK(qp);
// Try to perform the operation...
// Try to perform the operation...
//
// Do not process the transport while holding the transport service
// lock... A deadlock could occur if another thread is holding the
// transport lock and tries to add the transport to the service's WorkQ...
//
// Do not pass any select flags...
PR_Unlock(mThreadLock);
rv = transport->Process(0);
PR_Lock(mThreadLock);
//
// If the operation would block, then add it to the select list for
// later processing when the data arrives...
@@ -230,6 +236,7 @@ nsresult nsSocketTransportService::ProcessWorkQ(void)
// Release the transport object (since it is no longer on the WorkQ).
NS_RELEASE(transport);
}
PR_Unlock(mThreadLock);
return rv;
}