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 1085266 - NetworkActivityMonitor PRIOMethods changed to be static, because not attached nsUDPSockets were crashing if SocketTransportService had been shut down. A small fix to nsUDPSocket destructor has been added. r=michal

Browse Source
This commit is contained in:
Dragana Damjanovic 2014-11-04 01:23:00 -05:00
parent 98b659a4de
commit dff98602de
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
netwerk/base/src/NetworkActivityMonitor.cpp
View File

@ -175,10 +175,12 @@ private:
};
NetworkActivityMonitor * NetworkActivityMonitor::gInstance = nullptr;
static PRDescIdentity sNetActivityMonitorLayerIdentity;
static PRIOMethods sNetActivityMonitorLayerMethods;
static PRIOMethods *sNetActivityMonitorLayerMethodsPtr = nullptr;
NetworkActivityMonitor::NetworkActivityMonitor()
: mLayerIdentity(PR_INVALID_IO_LAYER)
, mBlipInterval(PR_INTERVAL_NO_TIMEOUT)
: mBlipInterval(PR_INTERVAL_NO_TIMEOUT)
{
MOZ_COUNT_CTOR(NetworkActivityMonitor);
@ -224,17 +226,21 @@ NetworkActivityMonitor::Shutdown()
nsresult
NetworkActivityMonitor::Init_Internal(int32_t blipInterval)
{
mLayerIdentity = PR_GetUniqueIdentity("network activity monitor layer");
mLayerMethods = *PR_GetDefaultIOMethods();
mLayerMethods.connect = nsNetMon_Connect;
mLayerMethods.read = nsNetMon_Read;
mLayerMethods.write = nsNetMon_Write;
mLayerMethods.writev = nsNetMon_Writev;
mLayerMethods.recv = nsNetMon_Recv;
mLayerMethods.send = nsNetMon_Send;
mLayerMethods.recvfrom = nsNetMon_RecvFrom;
mLayerMethods.sendto = nsNetMon_SendTo;
mLayerMethods.acceptread = nsNetMon_AcceptRead;
if (!sNetActivityMonitorLayerMethodsPtr) {
sNetActivityMonitorLayerIdentity =
PR_GetUniqueIdentity("network activity monitor layer");
sNetActivityMonitorLayerMethods = *PR_GetDefaultIOMethods();
sNetActivityMonitorLayerMethods.connect = nsNetMon_Connect;
sNetActivityMonitorLayerMethods.read = nsNetMon_Read;
sNetActivityMonitorLayerMethods.write = nsNetMon_Write;
sNetActivityMonitorLayerMethods.writev = nsNetMon_Writev;
sNetActivityMonitorLayerMethods.recv = nsNetMon_Recv;
sNetActivityMonitorLayerMethods.send = nsNetMon_Send;
sNetActivityMonitorLayerMethods.recvfrom = nsNetMon_RecvFrom;
sNetActivityMonitorLayerMethods.sendto = nsNetMon_SendTo;
sNetActivityMonitorLayerMethods.acceptread = nsNetMon_AcceptRead;
sNetActivityMonitorLayerMethodsPtr = &sNetActivityMonitorLayerMethods;
}
mBlipInterval = PR_MillisecondsToInterval(blipInterval);
// Set the last notification times to time that has just expired, so any
@ -254,8 +260,8 @@ NetworkActivityMonitor::AttachIOLayer(PRFileDesc *fd)
PRFileDesc * layer;
PRStatus status;
layer = PR_CreateIOLayerStub(gInstance->mLayerIdentity,
&gInstance->mLayerMethods);
layer = PR_CreateIOLayerStub(sNetActivityMonitorLayerIdentity,
sNetActivityMonitorLayerMethodsPtr);
if (!layer) {
return NS_ERROR_FAILURE;
}

2
netwerk/base/src/NetworkActivityMonitor.h
View File

@ -36,8 +36,6 @@ private:
void PostNotification(Direction direction);
static NetworkActivityMonitor * gInstance;
PRDescIdentity mLayerIdentity;
PRIOMethods mLayerMethods;
PRIntervalTime mBlipInterval;
PRIntervalTime mLastNotificationTime[2];
};

5
netwerk/base/src/nsUDPSocket.cpp
View File

@ -274,7 +274,10 @@ nsUDPSocket::nsUDPSocket()
nsUDPSocket::~nsUDPSocket()
{
Close(); // just in case :)
if (mFD) {
PR_Close(mFD);
mFD = nullptr;
}
MOZ_COUNT_DTOR(nsUDPSocket);
}