Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1430768 - Refine TFO telemetry. r=mcmanus

Browse Source
This commit is contained in:
Dragana Damjanovic dd.mozilla@gmail.com 2018-01-17 06:47:00 +02:00
parent 74f7da5f13
commit da357cb9bc
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netwerk/base/TCPFastOpenLayer.h
View File

@ -66,6 +66,13 @@ typedef enum {
TFO_BACKUP_CONN, // This is a backup conn, for a halfOpenSock that was used
// TFO.
TFO_INIT_FAILED, // nsHalfOpenSocket::SetupConn failed.
TFO_UNKNOWN_RESOLVING, // There is a high number of TFO_UNKNOWN state reported.
// Let's split them depending on the socket transport state:
// TFO_UNKNOWN_RESOLVING, TFO_UNKNOWN_RESOLVED,
// TFO_UNKNOWN_CONNECTING and TFO_UNKNOWN_CONNECTED..
TFO_UNKNOWN_RESOLVED,
TFO_UNKNOWN_CONNECTING,
TFO_UNKNOWN_CONNECTED,
TFO_FAILED,
TFO_HTTP // TFO is disabled for non-secure connections.
} TFOResult;

4
netwerk/base/nsSocketTransport2.cpp
View File

@ -1563,6 +1563,10 @@ nsSocketTransport::InitiateSocket()
// event in order.
mFastOpenLayerHasBufferedData = TCPFastOpenGetCurrentBufferSize(fd);
MOZ_ASSERT((mFastOpenStatus == TFO_NOT_TRIED) ||
(mFastOpenStatus == TFO_DISABLED) ||
(mFastOpenStatus == TFO_DATA_SENT) ||
(mFastOpenStatus == TFO_TRIED));
mFastOpenCallback->SetFastOpenStatus(mFastOpenStatus);
SOCKET_LOG(("called StartFastOpen - code=%d; fastOpen is %s "
"supported.\n", code,

3
netwerk/protocol/http/nsHttpConnection.cpp
View File

@ -132,11 +132,12 @@ nsHttpConnection::~nsHttpConnection()
if ((mFastOpenStatus != TFO_FAILED) &&
(mFastOpenStatus != TFO_HTTP) &&
((mFastOpenStatus != TFO_DISABLED) ||
(((mFastOpenStatus > TFO_DISABLED_CONNECT) && (mFastOpenStatus < TFO_BACKUP_CONN)) ||
gHttpHandler->UseFastOpen())) {
// TFO_FAILED will be reported in the replacement connection with more
// details.
// Otherwise report only if TFO is enabled and supported.
// If TFO is disabled, report only connections ha cause it to be disabled, e.g. TFO_FAILED_NET_TIMEOUT, etc.
Telemetry::Accumulate(Telemetry::TCP_FAST_OPEN_3, mFastOpenStatus);
}
}

33
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -4426,7 +4426,19 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out)
(out == mBackupStreamOut));
}
nsresult rv = SetupConn(out, false);
if (mFastOpenStatus == TFO_UNKNOWN) {
MOZ_ASSERT(out == mStreamOut);
if (mPrimaryStreamStatus == NS_NET_STATUS_RESOLVING_HOST) {
mFastOpenStatus = TFO_UNKNOWN_RESOLVING;
} else if (mPrimaryStreamStatus == NS_NET_STATUS_RESOLVED_HOST) {
mFastOpenStatus = TFO_UNKNOWN_RESOLVED;
} else if (mPrimaryStreamStatus == NS_NET_STATUS_CONNECTING_TO) {
mFastOpenStatus = TFO_UNKNOWN_CONNECTING;
} else if (mPrimaryStreamStatus == NS_NET_STATUS_CONNECTED_TO) {
mFastOpenStatus = TFO_UNKNOWN_CONNECTED;
}
}
nsresult rv = SetupConn(out, false);
if (mEnt) {
mEnt->mDoNotDestroy = false;
}
@ -4481,6 +4493,7 @@ nsHalfOpenSocket::StartFastOpen()
MOZ_ASSERT(mStreamOut);
MOZ_ASSERT(!mBackupTransport);
MOZ_ASSERT(mEnt);
MOZ_ASSERT(mFastOpenStatus == TFO_UNKNOWN);
LOG(("nsHalfOpenSocket::StartFastOpen [this=%p]\n",
this));
@ -4497,6 +4510,7 @@ nsHalfOpenSocket::StartFastOpen()
CancelBackupTimer();
mFastOpenInProgress = false;
Abandon();
mFastOpenStatus = TFO_INIT_FAILED;
return NS_ERROR_ABORT;
}
@ -4530,6 +4544,7 @@ nsHalfOpenSocket::StartFastOpen()
// The connection is responsible to take care of the halfOpen so we
// need to clean it up.
Abandon();
mFastOpenStatus = TFO_INIT_FAILED;
} else {
LOG(("nsHalfOpenSocket::StartFastOpen [this=%p conn=%p]\n",
this, mConnectionNegotiatingFastOpen.get()));
@ -4576,6 +4591,10 @@ nsHalfOpenSocket::SetFastOpenConnected(nsresult aError, bool aWillRetry)
return;
}
MOZ_ASSERT((mFastOpenStatus == TFO_NOT_TRIED) ||
(mFastOpenStatus == TFO_DATA_SENT) ||
(mFastOpenStatus == TFO_TRIED));
RefPtr<nsHalfOpenSocket> deleteProtector(this);
mEnt->mDoNotDestroy = true;
@ -4635,7 +4654,8 @@ nsHalfOpenSocket::SetFastOpenConnected(nsresult aError, bool aWillRetry)
mSocketTransport->SetSecurityCallbacks(this);
mStreamIn->AsyncWait(nullptr, 0, 0, nullptr);
if (aError == NS_ERROR_CONNECTION_REFUSED) {
if ((aError == NS_ERROR_CONNECTION_REFUSED) ||
(aError == NS_ERROR_PROXY_CONNECTION_REFUSED)) {
mFastOpenStatus = TFO_FAILED_CONNECTION_REFUSED;
} else if (aError == NS_ERROR_NET_TIMEOUT) {
mFastOpenStatus = TFO_FAILED_NET_TIMEOUT;
@ -4817,8 +4837,10 @@ nsHalfOpenSocket::SetupConn(nsIAsyncOutputStream *out,
conn.get(), static_cast<uint32_t>(rv)));
// Set TFO status.
if (mFastOpenStatus == TFO_HTTP) {
conn->SetFastOpenStatus(TFO_HTTP);
if ((mFastOpenStatus == TFO_HTTP) ||
(mFastOpenStatus == TFO_DISABLED) ||
(mFastOpenStatus == TFO_DISABLED_CONNECT)) {
conn->SetFastOpenStatus(mFastOpenStatus);
} else {
conn->SetFastOpenStatus(TFO_INIT_FAILED);
}
@ -4929,7 +4951,8 @@ nsHalfOpenSocket::SetupConn(nsIAsyncOutputStream *out,
}
} else {
conn->SetFastOpenStatus(mFastOpenStatus);
if (mFastOpenStatus != TFO_HTTP) {
if ((mFastOpenStatus != TFO_HTTP) && (mFastOpenStatus != TFO_DISABLED) &&
(mFastOpenStatus != TFO_DISABLED_CONNECT)) {
mFastOpenStatus = TFO_BACKUP_CONN; // Set this to TFO_BACKUP_CONN
// so that if a backup
// connection is established we