wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 846137: Don't call PR_Close() off STS thread r=mcmanus

Browse Source
This commit is contained in:
Randell Jesup 2013-04-09 18:43:07 -04:00
parent ba2e972842
commit 80c0be2694
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
netwerk/base/src/nsSocketTransport2.cpp
View File

@ -1413,14 +1413,49 @@ nsSocketTransport::GetFD_Locked()
return mFD;
}
void
STS_PRCloseOnSocketTransport(PRFileDesc *fd)
{
// FIX - Should use RUN_ON_THREAD once it's generally available
// RUN_ON_THREAD(gSocketTransportService, WrapRunnableNM(&PR_Close, mFD);
class thunkPRClose : public nsRunnable
{
public:
thunkPRClose(PRFileDesc *fd) : mFD(fd) {}
NS_IMETHOD Run() {
PR_Close(mFD);
return NS_OK;
}
private:
PRFileDesc *mFD;
};
if (gSocketTransportService) {
// Can't PR_Close() a socket off STS thread. Thunk it to STS to die
// FIX - Should use RUN_ON_THREAD once it's generally available
// RUN_ON_THREAD(gSocketThread,WrapRunnableNM(&PR_Close, mFD);
gSocketTransportService->Dispatch(new thunkPRClose(fd), NS_DISPATCH_NORMAL);
} else {
// something horrible has happened
NS_ASSERTION(gSocketTransportService, "No STS service");
}
}
void
nsSocketTransport::ReleaseFD_Locked(PRFileDesc *fd)
{
NS_ASSERTION(mFD == fd, "wrong fd");
if (--mFDref == 0) {
SOCKET_LOG(("nsSocketTransport: calling PR_Close [this=%x]\n", this));
PR_Close(mFD);
if (PR_GetCurrentThread() == gSocketThread) {
SOCKET_LOG(("nsSocketTransport: calling PR_Close [this=%x]\n", this));
PR_Close(mFD);
} else {
// Can't PR_Close() a socket off STS thread. Thunk it to STS to die
STS_PRCloseOnSocketTransport(mFD);
}
mFD = nullptr;
}
}