Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1717414 - [profiler] Add a new property to network markers to report the new channel id for redirection processes r=gerald

Browse Source 
Then this will make it possible in the UI to relate the redirected
request with its redirection.

With this patch a debug build of Firefox will crash when a redirection
happens, but the next patch will fix this.

Differential Revision: https://phabricator.services.mozilla.com/D118467
This commit is contained in:
Julien Wajsberg 2021-06-23 16:03:49 +00:00
parent ae397ac3a1
commit 3dcc5b5fe6
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/profiler/core/platform.cpp
View File

@ -5822,7 +5822,7 @@ void profiler_add_network_marker(
const mozilla::net::TimingStruct* aTimings,
UniquePtr<ProfileChunkedBuffer> aSource,
const Maybe<nsDependentCString>& aContentType, nsIURI* aRedirectURI,
uint32_t aRedirectFlags) {
uint32_t aRedirectFlags, uint64_t aRedirectChannelId) {
if (!profiler_can_accept_markers()) {
return;
}
@ -5856,7 +5856,8 @@ void profiler_add_network_marker(
int32_t aPri, int64_t aCount, net::CacheDisposition aCacheDisposition,
const net::TimingStruct& aTimings,
const ProfilerString8View& aRedirectURI,
const ProfilerString8View& aContentType, uint32_t aRedirectFlags) {
const ProfilerString8View& aContentType, uint32_t aRedirectFlags,
int64_t aRedirectChannelId) {
// This payload still streams a startTime and endTime property because it
// made the migration to MarkerTiming on the front-end easier.
aWriter.TimeProperty("startTime", aStart);
@ -5881,7 +5882,13 @@ void profiler_add_network_marker(
aWriter.BoolProperty(
"isHttpToHttpsRedirect",
aRedirectFlags & nsIChannelEventSink::REDIRECT_STS_UPGRADE);
MOZ_ASSERT(
aRedirectChannelId != 0,
"aRedirectChannelId should be non-zero for a redirected request");
aWriter.IntProperty("redirectId", aRedirectChannelId);
}
aWriter.StringProperty("requestMethod", aRequestMethod);
if (aContentType.Length() != 0) {
@ -5968,7 +5975,7 @@ void profiler_add_network_marker(
aRequestMethod, aType, aPriority, aCount, aCacheDisposition,
aTimings ? *aTimings : scEmptyNetTimingStruct, redirect_spec,
aContentType ? ProfilerString8View(*aContentType) : ProfilerString8View(),
aRedirectFlags);
aRedirectFlags, aRedirectChannelId);
}
bool profiler_add_native_allocation_marker(int64_t aSize,

3
tools/profiler/public/GeckoProfiler.h
View File

@ -492,7 +492,8 @@ void profiler_add_network_marker(
const mozilla::net::TimingStruct* aTimings = nullptr,
mozilla::UniquePtr<mozilla::ProfileChunkedBuffer> aSource = nullptr,
const mozilla::Maybe<nsDependentCString>& aContentType = mozilla::Nothing(),
nsIURI* aRedirectURI = nullptr, uint32_t aRedirectFlags = 0);
nsIURI* aRedirectURI = nullptr, uint32_t aRedirectFlags = 0,
uint64_t aRedirectChannelId = 0);
enum TracingKind {
TRACING_EVENT,

22
tools/profiler/tests/gtest/GeckoProfiler.cpp
View File

@ -936,6 +936,7 @@ TEST(GeckoProfiler, Markers)
/* const mozilla::Maybe<nsDependentCString>& aContentType =
mozilla::Nothing() */
/* nsIURI* aRedirectURI = nullptr */
/* uint64_t aRedirectChannelId = 0 */
);
profiler_add_network_marker(
@ -957,7 +958,8 @@ TEST(GeckoProfiler, Markers)
/* const mozilla::Maybe<nsDependentCString>& aContentType =
mozilla::Nothing() */
Some(nsDependentCString("text/html")),
/* nsIURI* aRedirectURI = nullptr */ nullptr);
/* nsIURI* aRedirectURI = nullptr */ nullptr,
/* uint64_t aRedirectChannelId = 0 */ 0);
nsCOMPtr<nsIURI> redirectURI;
ASSERT_TRUE(NS_SUCCEEDED(
@ -983,7 +985,8 @@ TEST(GeckoProfiler, Markers)
mozilla::Nothing(),
/* nsIURI* aRedirectURI = nullptr */ redirectURI,
/* uint32_t aRedirectFlags = 0 */
nsIChannelEventSink::REDIRECT_TEMPORARY);
nsIChannelEventSink::REDIRECT_TEMPORARY,
/* uint64_t aRedirectChannelId = 0 */ 103);
profiler_add_network_marker(
/* nsIURI* aURI */ uri,
@ -1006,7 +1009,8 @@ TEST(GeckoProfiler, Markers)
mozilla::Nothing(),
/* nsIURI* aRedirectURI = nullptr */ redirectURI,
/* uint32_t aRedirectFlags = 0 */
nsIChannelEventSink::REDIRECT_PERMANENT);
nsIChannelEventSink::REDIRECT_PERMANENT,
/* uint64_t aRedirectChannelId = 0 */ 104);
profiler_add_network_marker(
/* nsIURI* aURI */ uri,
@ -1028,7 +1032,8 @@ TEST(GeckoProfiler, Markers)
mozilla::Nothing() */
mozilla::Nothing(),
/* nsIURI* aRedirectURI = nullptr */ redirectURI,
/* uint32_t aRedirectFlags = 0 */ nsIChannelEventSink::REDIRECT_INTERNAL);
/* uint32_t aRedirectFlags = 0 */ nsIChannelEventSink::REDIRECT_INTERNAL,
/* uint64_t aRedirectChannelId = 0 */ 105);
profiler_add_network_marker(
/* nsIURI* aURI */ uri,
@ -1051,7 +1056,8 @@ TEST(GeckoProfiler, Markers)
mozilla::Nothing(),
/* nsIURI* aRedirectURI = nullptr */ redirectURI,
/* uint32_t aRedirectFlags = 0 */ nsIChannelEventSink::REDIRECT_INTERNAL |
nsIChannelEventSink::REDIRECT_STS_UPGRADE);
nsIChannelEventSink::REDIRECT_STS_UPGRADE,
/* uint64_t aRedirectChannelId = 0 */ 106);
MOZ_RELEASE_ASSERT(profiler_add_marker(
"Text in main thread with stack", geckoprofiler::category::OTHER,
@ -1428,6 +1434,7 @@ TEST(GeckoProfiler, Markers)
EXPECT_TRUE(payload["RedirectURI"].isNull());
EXPECT_TRUE(payload["redirectType"].isNull());
EXPECT_TRUE(payload["isHttpToHttpsRedirect"].isNull());
EXPECT_TRUE(payload["redirectId"].isNull());
EXPECT_TRUE(payload["contentType"].isNull());
} else if (nameString == "Load 2: http://mozilla.org/") {
@ -1445,6 +1452,7 @@ TEST(GeckoProfiler, Markers)
EXPECT_TRUE(payload["RedirectURI"].isNull());
EXPECT_TRUE(payload["redirectType"].isNull());
EXPECT_TRUE(payload["isHttpToHttpsRedirect"].isNull());
EXPECT_TRUE(payload["redirectId"].isNull());
EXPECT_EQ_JSON(payload["contentType"], String, "text/html");
} else if (nameString == "Load 3: http://mozilla.org/") {
@ -1463,6 +1471,7 @@ TEST(GeckoProfiler, Markers)
"http://example.com/");
EXPECT_EQ_JSON(payload["redirectType"], String, "Temporary");
EXPECT_EQ_JSON(payload["isHttpToHttpsRedirect"], Bool, false);
EXPECT_EQ_JSON(payload["redirectId"], Int64, 103);
EXPECT_TRUE(payload["contentType"].isNull());
} else if (nameString == "Load 4: http://mozilla.org/") {
@ -1481,6 +1490,7 @@ TEST(GeckoProfiler, Markers)
"http://example.com/");
EXPECT_EQ_JSON(payload["redirectType"], String, "Permanent");
EXPECT_EQ_JSON(payload["isHttpToHttpsRedirect"], Bool, false);
EXPECT_EQ_JSON(payload["redirectId"], Int64, 104);
EXPECT_TRUE(payload["contentType"].isNull());
} else if (nameString == "Load 5: http://mozilla.org/") {
@ -1499,6 +1509,7 @@ TEST(GeckoProfiler, Markers)
"http://example.com/");
EXPECT_EQ_JSON(payload["redirectType"], String, "Internal");
EXPECT_EQ_JSON(payload["isHttpToHttpsRedirect"], Bool, false);
EXPECT_EQ_JSON(payload["redirectId"], Int64, 105);
EXPECT_TRUE(payload["contentType"].isNull());
} else if (nameString == "Load 6: http://mozilla.org/") {
@ -1519,6 +1530,7 @@ TEST(GeckoProfiler, Markers)
"http://example.com/");
EXPECT_EQ_JSON(payload["redirectType"], String, "Internal");
EXPECT_EQ_JSON(payload["isHttpToHttpsRedirect"], Bool, true);
EXPECT_EQ_JSON(payload["redirectId"], Int64, 106);
EXPECT_TRUE(payload["contentType"].isNull());
} else if (nameString == "Text in main thread with stack") {