Backed out 1 changesets (bug 1152046) for bustage again on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 24 Sep 2015 08:31:34 +0200
changeset 264145 650795f68df8651439fb0d0f3f96e4e3c5953592
parent 264144 dcbabf6ce1535227cd9c97ad902a903f446e0e87
child 264146 75056331fc4bbc9fedf9e15f5e5c7e21b2bf979b
push id65539
push usercbook@mozilla.com
push dateThu, 24 Sep 2015 06:32:44 +0000
treeherdermozilla-inbound@650795f68df8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1152046
milestone44.0a1
backs outf579176f1c3e406a57fb96eb84336d520cb288e8
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 1 changesets (bug 1152046) for bustage again on a CLOSED TREE Backed out changeset f579176f1c3e (bug 1152046)
netwerk/base/ClosingService.cpp
--- a/netwerk/base/ClosingService.cpp
+++ b/netwerk/base/ClosingService.cpp
@@ -21,17 +21,16 @@ public:
   }
 
   nsRefPtr<mozilla::net::ClosingService> mClosingService;
 };
 
 namespace mozilla {
 namespace net {
 
-#ifndef MOZ_WIDGET_GONK
 static PRIOMethods sTcpUdpPRCloseLayerMethods;
 static PRIOMethods *sTcpUdpPRCloseLayerMethodsPtr = nullptr;
 static PRDescIdentity sTcpUdpPRCloseLayerId;
 
 static PRStatus
 TcpUdpPRCloseLayerClose(PRFileDesc *aFd)
 {
   if (!aFd) {
@@ -64,33 +63,31 @@ TcpUdpPRCloseLayerClose(PRFileDesc *aFd)
     }
   }
 
   layer->secret = nullptr;
   layer->dtor(layer);
   delete closingLayerSecret;
   return status;
 }
-#endif //MOZ_WIDGET_GONK
 
 ClosingService* ClosingService::sInstance = nullptr;
 
 ClosingService::ClosingService()
   : mShutdown(false)
   , mMonitor("ClosingService.mMonitor")
 {
   MOZ_ASSERT(!sInstance,
              "multiple ClosingService instances!");
 }
 
 // static
 void
 ClosingService::Start()
 {
-#ifndef MOZ_WIDGET_GONK
   if (!sTcpUdpPRCloseLayerMethodsPtr) {
     sTcpUdpPRCloseLayerId =  PR_GetUniqueIdentity("TCP and UDP PRClose layer");
     PR_ASSERT(PR_INVALID_IO_LAYER != sTcpUdpPRCloseLayerId);
 
     sTcpUdpPRCloseLayerMethods = *PR_GetDefaultIOMethods();
     sTcpUdpPRCloseLayerMethods.close = TcpUdpPRCloseLayerClose;
     sTcpUdpPRCloseLayerMethodsPtr = &sTcpUdpPRCloseLayerMethods;
   }
@@ -99,17 +96,16 @@ ClosingService::Start()
     ClosingService* service = new ClosingService();
     if (NS_SUCCEEDED(service->StartInternal())) {
       NS_ADDREF(service);
       sInstance = service;
     } else {
       delete service;
     }
   }
-#endif
 }
 
 nsresult
 ClosingService::StartInternal()
 {
   mThread = PR_CreateThread(PR_USER_THREAD, ThreadFunc, this,
                             PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD,
                             PR_JOINABLE_THREAD, 32 * 1024);
@@ -118,22 +114,16 @@ ClosingService::StartInternal()
   }
   return NS_OK;
 }
 
 // static
 nsresult
 ClosingService::AttachIOLayer(PRFileDesc *aFd)
 {
-#ifdef MOZ_WIDGET_GONK
-
-  return NS_OK;
-
-#else
-
   if (!sTcpUdpPRCloseLayerMethodsPtr) {
     return NS_OK;
   }
 
   PRFileDesc * layer;
   PRStatus     status;
 
   layer = PR_CreateIOLayerStub(sTcpUdpPRCloseLayerId,
@@ -148,18 +138,16 @@ ClosingService::AttachIOLayer(PRFileDesc
 
   status = PR_PushIOLayer(aFd, PR_NSPR_IO_LAYER, layer);
 
   if (status == PR_FAILURE) {
     delete secret;
     PR_DELETE(layer);
   }
   return NS_OK;
-
-#endif //MOZ_WIDGET_GONK
 }
 
 void
 ClosingService::PostRequest(PRFileDesc *aFd)
 {
   mozilla::MonitorAutoLock mon(mMonitor);
 
   // Check if shutdown is called.
@@ -178,24 +166,22 @@ ClosingService::PostRequest(PRFileDesc *
     mon.Notify();
   }
 }
 
 // static
 void
 ClosingService::Shutdown()
 {
-#ifndef MOZ_WIDGET_GONK
   MOZ_ASSERT(NS_IsMainThread());
 
   if (sInstance) {
     sInstance->ShutdownInternal();
     NS_RELEASE(sInstance);
   }
-#endif //MOZ_WIDGET_GONK
 }
 
 void
 ClosingService::ShutdownInternal()
 {
   {
     mozilla::MonitorAutoLock mon(mMonitor);
     mShutdown = true;