Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-30 13:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't abuse nsAutoLock in single-exit nsSocketTransport::Process and PR_Unlock

Browse Source 
and relock it in subroutines -- this causes false deadlock-detection positives.
Also comment module callouts with lock held.
This commit is contained in:
brendan%mozilla.org 1999-09-08 06:17:20 +00:00
parent cb10224da9
commit f3bfcd687b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netwerk/base/src/nsSocketTransport.cpp
View File

@ -284,7 +284,7 @@ nsresult nsSocketTransport::Process(PRInt16 aSelectFlags)
// Enter the socket transport lock...
// This lock protects access to socket transport member data...
//
nsAutoLock aLock(mLock);
PR_Lock(mLock);
PR_LOG(gSocketLog, PR_LOG_DEBUG,
("+++ Entering nsSocketTransport::Process() [this=%x].\t"
@ -490,6 +490,7 @@ nsresult nsSocketTransport::Process(PRInt16 aSelectFlags)
"CurrentState = %d\n\n",
this, rv, mCurrentState));
PR_Unlock(mLock);
return rv;
}
@ -1433,6 +1434,7 @@ nsSocketTransport::AsyncRead(PRUint32 startPosition, PRInt32 readCount,
}
#else
if (NS_SUCCEEDED(rv) && !mReadPipeIn) {
// XXXbe calling out of module with a lock held...
rv = NS_NewPipe(getter_AddRefs(mReadPipeIn),
getter_AddRefs(mReadPipeOut),
this, // nsIPipeObserver
@ -1591,6 +1593,7 @@ nsSocketTransport::OpenInputStream(PRUint32 startPosition, PRInt32 readCount,
NS_IF_ADDREF(*result);
}
#else
// XXXbe calling out of module with a lock held...
rv = NS_NewPipe(getter_AddRefs(mReadPipeIn),
getter_AddRefs(mReadPipeOut),
this, // nsIPipeObserver
@ -1655,6 +1658,7 @@ nsSocketTransport::OpenOutputStream(PRUint32 startPosition, nsIOutputStream* *re
rv = NS_NewPipe(getter_AddRefs(in), getter_AddRefs(out),
MAX_IO_BUFFER_SIZE, MAX_IO_BUFFER_SIZE, PR_TRUE, this);
#else
// XXXbe calling out of module with a lock held...
rv = NS_NewPipe(getter_AddRefs(in), getter_AddRefs(out),
this, // nsIPipeObserver
NS_SOCKET_TRANSPORT_SEGMENT_SIZE,