Skip to content

Disable profiling #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
llewelld wants to merge 3 commits into
base: sailfishos-esr78-x86base-jb54983
Choose a base branch
from
Open

Disable profiling #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0276c55
[sailfishos][embedlite] Allow profiling to be disabled in Embedlite. …
llewelld Jul 28, 2021
c725b99
Disable profiling in mozconfig.merqtxulrunner
llewelld Jul 28, 2021
a884fa5
Patch gecko to disable profiling in EmbedLite builds
llewelld Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions embedding/embedlite/EmbedLiteApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ EmbedLiteApp::StartChild(EmbedLiteApp* aApp)
NS_ASSERTION(aApp->mState == STARTING, "Wrong timing");
if (aApp->mEmbedType == EMBED_THREAD) {
char aLocal;
#ifdef MOZ_GECKO_PROFILER
profiler_init(&aLocal);
#endif // MOZ_GECKO_PROFILER

if (!aApp->mListener ||
!aApp->mListener->ExecuteChildThread()) {
Expand Down Expand Up @@ -289,7 +291,9 @@ EmbedLiteApp::StopChildThread()
{
NS_ENSURE_TRUE(mEmbedType == EMBED_THREAD, false);
LOGT("mUILoop:%p, current:%p", mUILoop, MessageLoop::current());
#ifdef MOZ_GECKO_PROFILER
profiler_shutdown();
#endif // MOZ_GECKO_PROFILER

if (!mUILoop || !MessageLoop::current() ||
mUILoop == MessageLoop::current()) {
Expand Down
2 changes: 1 addition & 1 deletion embedding/embedlite/config/mozconfig.merqtxulrunner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ac_add_options --with-app-name=xulrunner-qt5

# disabling for now, since the build fails...
ac_add_options --disable-webrtc
ac_add_options --enable-profiling
ac_add_options --disable-profiling
ac_add_options --disable-dbus
ac_add_options --disable-necko-wifi
ac_add_options --disable-accessibility
26 changes: 26 additions & 0 deletions rpm/0030-sailfishos-gecko-Disable-profiling-for-EmbedLite-bui.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 17cd60006e38c4d2148caa6c9ca5b9ebc1ca005a Mon Sep 17 00:00:00 2001
From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Date: Wed, 28 Jul 2021 16:26:42 +0000
Subject: [PATCH] [sailfishos][gecko] Disable profiling for EmbedLite builds.
JB#54988

---
toolkit/moz.configure | 2 ++
1 file changed, 2 insertions(+)

diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index cdcc219cf10f..ce1284099965 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -78,6 +78,8 @@ def gecko_profiler(target):
if target.os == 'Android':
return target.cpu in ('aarch64', 'arm', 'x86', 'x86_64')
elif target.kernel == 'Linux':
+ if toolkit in ('qt'):
+ return False
return target.cpu in ('aarch64', 'arm', 'x86', 'x86_64', 'mips64')
elif target.kernel == 'FreeBSD':
return target.cpu in ('aarch64', 'x86_64')
--
2.26.2

1 change: 1 addition & 0 deletions rpm/xulrunner-qt5.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Patch26: 0026-Revert-Bug-1333826-Remove-SDK_FILES-SDK_LIBRARY-and-.patch
Patch27: 0027-Revert-Bug-1333826-Remove-the-make-sdk-build-target-.patch
Patch28: 0028-Revert-Bug-1333826-Remove-a-few-references-from-.mk-.patch
Patch29: 0064-sailfishos-gecko-Disable-link-time-optimization-for-.patch
Patch30: 0030-sailfishos-gecko-Disable-profiling-for-EmbedLite-bui.patch
#Patch9: 0009-sailfishos-gecko-Create-EmbedLiteCompositorBridgePar.patch
#Patch10: 0010-sailfishos-gecko-Remove-PuppetWidget-from-TabChild-i.patch
#Patch11: 0011-sailfishos-gecko-Make-TabChild-to-work-with-TabChild.patch
Expand Down