Bug 1275054 - Remove expired NETWORK_SESSION_AT_256FD telemetry r=dragana
authorPatrick McManus <mcmanus@ducksong.com>
Mon, 23 May 2016 13:48:18 -0400
changeset 298787 798980ddb780
parent 298786 195c5c599588
child 298788 fd50e33b4e9b
push id30285
push usercbook@mozilla.com
push dateWed, 25 May 2016 13:06:07 +0000
treeherdermozilla-central@d6d4e8417d2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdragana
bugs1275054
milestone49.0a1
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
Bug 1275054 - Remove expired NETWORK_SESSION_AT_256FD telemetry r=dragana
netwerk/base/nsSocketTransportService2.cpp
toolkit/components/telemetry/Histograms.json
--- a/netwerk/base/nsSocketTransportService2.cpp
+++ b/netwerk/base/nsSocketTransportService2.cpp
@@ -241,30 +241,24 @@ nsSocketTransportService::AttachSocket(P
 // limit the number of sockets that can be created by an application.
 // AttachSocket will fail if the limit is exceeded.  consumers should
 // call CanAttachSocket and check the result before creating a socket.
 
 bool
 nsSocketTransportService::CanAttachSocket()
 {
     static bool reported900FDLimit = false;
-    static bool reported256FDLimit = false;
 
     uint32_t total = mActiveCount + mIdleCount;
     bool rv = total < gMaxCount;
 
-    if (mTelemetryEnabledPref) {
-        if (((total >= 900) || !rv) && !reported900FDLimit) {
-            reported900FDLimit = true;
-            Telemetry::Accumulate(Telemetry::NETWORK_SESSION_AT_900FD, true);
-        }
-        if ((total >= 256) && !reported256FDLimit) {
-            reported256FDLimit = true;
-            Telemetry::Accumulate(Telemetry::NETWORK_SESSION_AT_256FD, true);
-        }
+    if (mTelemetryEnabledPref &&
+        (((total >= 900) || !rv) && !reported900FDLimit)) {
+        reported900FDLimit = true;
+        Telemetry::Accumulate(Telemetry::NETWORK_SESSION_AT_900FD, true);
     }
 
     return rv;
 }
 
 nsresult
 nsSocketTransportService::DetachSocket(SocketContext *listHead, SocketContext *sock)
 {
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -2877,23 +2877,16 @@
     "kind": "boolean",
     "description": "The URL path contains !/"
   },
   "URL_PATH_CONTAINS_EXCLAMATION_DOUBLE_SLASH": {
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "The URL path contains !//"
   },
-  "NETWORK_SESSION_AT_256FD": {
-    "expires_in_version": "49",
-    "kind": "boolean",
-    "description": "session exceeded old 256 limit",
-    "bug_numbers": [1260218],
-    "alert_emails": ["necko@mozilla.com"]
-  },
   "NETWORK_SESSION_AT_900FD": {
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "session reached 900 fd limit sockets",
     "bug_numbers": [1260218],
     "alert_emails": ["necko@mozilla.com"]
   },
   "NETWORK_PROBE_MAXCOUNT": {