Bug 1219910 - make gSocketThread a relaxed atomic variable; r=mcmanus

All the places that (re-)declared gSocketThread already included
nsSocketTransportService2.h, so we can safely delete them.
This commit is contained in:
Nathan Froyd 2015-10-29 16:47:23 -04:00
parent 148c129fa3
commit a782e5c73e
5 changed files with 3 additions and 9 deletions

View File

@ -19,8 +19,6 @@
#include <mmsystem.h>
#endif
extern PRThread *gSocketThread;
namespace mozilla {
namespace net {

View File

@ -20,8 +20,6 @@
#include "ScopedNSSTypes.h"
#include "ssl.h"
extern PRThread *gSocketThread;
namespace mozilla {
namespace net {

View File

@ -17,6 +17,7 @@
#include "nsIPrefBranch.h"
#include "nsServiceManagerUtils.h"
#include "nsIObserverService.h"
#include "mozilla/Atomics.h"
#include "mozilla/Services.h"
#include "mozilla/Likely.h"
#include "mozilla/PublicSSL.h"
@ -33,7 +34,7 @@ PRLogModuleInfo *gSocketTransportLog = nullptr;
PRLogModuleInfo *gUDPSocketLog = nullptr;
nsSocketTransportService *gSocketTransportService = nullptr;
PRThread *gSocketThread = nullptr;
Atomic<PRThread*, Relaxed> gSocketThread;
#define SEND_BUFFER_PREF "network.tcp.sendbuffer"
#define KEEPALIVE_ENABLED_PREF "network.tcp.keepalive.enabled"

View File

@ -262,6 +262,6 @@ private:
};
extern nsSocketTransportService *gSocketTransportService;
extern PRThread *gSocketThread;
extern mozilla::Atomic<PRThread*, mozilla::Relaxed> gSocketThread;
#endif // !nsSocketTransportService_h__

View File

@ -37,9 +37,6 @@
#include "mozilla/Telemetry.h"
// defined by the socket transport service while active
extern PRThread *gSocketThread;
namespace mozilla {
namespace net {