зеркало из https://github.com/mozilla/gecko-dev.git
- Add detection of -fprofile-arcs/-fprofile-generate to configure
- Add a new client.mk target, profiledbuild, which does a profiling build, runs a specified script to generate the profile, and then rebuilds using the profile data. - Add a profiling script for Seamonkey/Firefox that runs a couple cycles of the pageload test, and then does a second start to hit the fastload/history code. Bug 237239, r=dbaron, sr=brendan, a=brendan.
This commit is contained in:
Родитель
6aca51cc71
Коммит
c2b4788fd2
|
@ -0,0 +1,7 @@
|
|||
<html>
|
||||
<script>
|
||||
setTimeout("window.close();", 1000);
|
||||
</script>
|
||||
<body>
|
||||
</body>
|
||||
</html>
|
|
@ -0,0 +1,209 @@
|
|||
#!/usr/bin/perl
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is the Mozilla Browser code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Chris Mcafee <mcafee@netscape.com>
|
||||
# Brian Ryner <bryner@brianryner.com>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
use Cwd;
|
||||
use File::Find ();
|
||||
|
||||
use POSIX qw(sys_wait_h);
|
||||
|
||||
sub kill_process {
|
||||
my ($target_pid) = @_;
|
||||
my $start_time = time;
|
||||
|
||||
# Try to kill and wait 10 seconds, then try a kill -9
|
||||
my $sig;
|
||||
for $sig ('TERM', 'KILL') {
|
||||
print "kill $sig $target_pid\n";
|
||||
kill $sig => $target_pid;
|
||||
my $interval_start = time;
|
||||
while (time - $interval_start < 10) {
|
||||
# the following will work with 'cygwin' perl on win32, but not
|
||||
# with 'MSWin32' (ActiveState) perl
|
||||
my $pid = waitpid($target_pid, POSIX::WNOHANG());
|
||||
if (($pid == $target_pid and POSIX::WIFEXITED($?)) or $pid == -1) {
|
||||
my $secs = time - $start_time;
|
||||
$secs = $secs == 1 ? '1 second' : "$secs seconds";
|
||||
print "Process killed. Took $secs to die.\n";
|
||||
return;
|
||||
}
|
||||
sleep 1;
|
||||
}
|
||||
}
|
||||
die "Unable to kill process: $target_pid";
|
||||
}
|
||||
|
||||
# Stripped down version of fork_and_log().
|
||||
sub system_fork_and_log {
|
||||
# Fork a sub process and log the output.
|
||||
my ($cmd) = @_;
|
||||
|
||||
my $pid = fork; # Fork off a child process.
|
||||
|
||||
unless ($pid) { # child
|
||||
exec { $cmd->[0] } @$cmd;
|
||||
die "Could not exec()";
|
||||
}
|
||||
return $pid;
|
||||
}
|
||||
|
||||
|
||||
sub wait_for_pid {
|
||||
# Wait for a process to exit or kill it if it takes too long.
|
||||
my ($pid, $timeout_secs) = @_;
|
||||
my ($exit_value, $signal_num, $dumped_core, $timed_out) = (0,0,0,0);
|
||||
my $sig_name;
|
||||
my $loop_count;
|
||||
|
||||
die ("Invalid timeout value passed to wait_for_pid()\n")
|
||||
if ($timeout_secs <= 0);
|
||||
|
||||
eval {
|
||||
$loop_count = 0;
|
||||
while (++$loop_count < $timeout_secs) {
|
||||
my $wait_pid = waitpid($pid, POSIX::WNOHANG());
|
||||
# the following will work with 'cygwin' perl on win32, but not
|
||||
# with 'MSWin32' (ActiveState) perl
|
||||
last if ($wait_pid == $pid and POSIX::WIFEXITED($?)) or $wait_pid == -1;
|
||||
sleep 1;
|
||||
}
|
||||
|
||||
$exit_value = $? >> 8;
|
||||
$signal_num = $? >> 127;
|
||||
$dumped_core = $? & 128;
|
||||
if ($loop_count >= $timeout_secs) {
|
||||
die "timeout";
|
||||
}
|
||||
return "done";
|
||||
};
|
||||
|
||||
if ($@) {
|
||||
if ($@ =~ /timeout/) {
|
||||
kill_process($pid);
|
||||
$timed_out = 1;
|
||||
} else { # Died for some other reason.
|
||||
die; # Propagate the error up.
|
||||
}
|
||||
}
|
||||
# $sig_name = $signal_num ? signal_name($signal_num) : '';
|
||||
#
|
||||
# return { timed_out=>$timed_out,
|
||||
# exit_value=>$exit_value,
|
||||
# sig_name=>$sig_name,
|
||||
# dumped_core=>$dumped_core };
|
||||
}
|
||||
|
||||
# System version of run_cmd().
|
||||
sub run_system_cmd {
|
||||
my ($cmd, $timeout_secs) = @_;
|
||||
|
||||
# print_log "cmd = $cmd\n";
|
||||
my $pid = system_fork_and_log($cmd);
|
||||
my $result = wait_for_pid($pid, $timeout_secs);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
#
|
||||
# Given profile directory, find pref file hidden in salt directory.
|
||||
# profile $Settings::MozProfileName must exist before calling this sub.
|
||||
#
|
||||
sub find_pref_file {
|
||||
my $profile_dir = shift;
|
||||
|
||||
# default to *nix
|
||||
my $pref_file = "prefs.js";
|
||||
|
||||
unless (-e $profile_dir) {
|
||||
return; # empty list
|
||||
}
|
||||
|
||||
my $found = undef;
|
||||
my $sub = sub {$pref_file = $File::Find::name, $found++ if $pref_file eq $_};
|
||||
File::Find::find($sub, $profile_dir);
|
||||
unless ($found) {
|
||||
return; # empty list
|
||||
}
|
||||
|
||||
return $pref_file;
|
||||
}
|
||||
|
||||
my $topdir = cwd();
|
||||
|
||||
chdir $ENV{OBJDIR};
|
||||
my $app_name = `grep "MOZ_APP_NAME " config/autoconf.mk | sed "s/.*= //"`;
|
||||
chomp($app_name);
|
||||
|
||||
# On mac, the app directory is the product name with the first
|
||||
# letter capitalized
|
||||
|
||||
my $toolkit = `grep "MOZ_WIDGET_TOOLKIT " config/autoconf.mk |sed "s/.*= //"`;
|
||||
chomp($toolkit);
|
||||
|
||||
if ($toolkit =~ /(mac|cocoa)/) {
|
||||
my $app_dir = uc(substr($app_name, 0, 1)).substr($app_name, 1);
|
||||
chdir "dist/$app_dir.app/Contents/MacOS";
|
||||
} else {
|
||||
chdir "dist/bin";
|
||||
}
|
||||
|
||||
my $bin_suffix = "";
|
||||
if ($toolkit =~ /(windows|os2)/) {
|
||||
$bin_suffix = ".exe";
|
||||
}
|
||||
|
||||
my $old_home = $ENV{HOME};
|
||||
$ENV{HOME} = cwd();
|
||||
|
||||
# Create a profile to test with.
|
||||
run_system_cmd(["./".$app_name.$bin_suffix, "-createProfile", "testprofile"], 45);
|
||||
|
||||
# Add allow_scripts_to_close_windows; this lets us cleanly exit.
|
||||
my $pref_file = find_pref_file(".".$app_name);
|
||||
open PREFS, ">>$pref_file";
|
||||
print PREFS "user_pref(\"dom.allow_scripts_to_close_windows\", true);\n";
|
||||
close PREFS;
|
||||
|
||||
# Run the pageload test.
|
||||
run_system_cmd(["./".$app_name.$bin_suffix, $ENV{PAGELOAD_URL}."/loader.pl?maxcyc=2&delay=500&nocache=0&timeout=30000&auto=1"], 240);
|
||||
|
||||
# Start up again; this will gather data for reading global history and
|
||||
# reading the fastload file.
|
||||
run_system_cmd(["./".$app_name.$bin_suffix, "file://$topdir/build/profile_pageloader.html"], 45);
|
||||
|
||||
chdir $topdir;
|
14
client.mk
14
client.mk
|
@ -740,6 +740,20 @@ depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
|
|||
build:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
|
||||
$(MOZ_MAKE)
|
||||
|
||||
####################################
|
||||
# Profile-feedback build (gcc only)
|
||||
# To use this, you should set the following variables in your mozconfig
|
||||
# mk_add_options PROFILE_GEN_SCRIPT=/path/to/profile-script
|
||||
#
|
||||
# The profile script should exercise the functionality to be included
|
||||
# in the profile feedback.
|
||||
|
||||
profiledbuild:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
|
||||
$(MOZ_MAKE) MOZ_PROFILE_GENERATE=1
|
||||
OBJDIR=${OBJDIR} $(PROFILE_GEN_SCRIPT)
|
||||
$(MOZ_MAKE) clobber_all
|
||||
$(MOZ_MAKE) MOZ_PROFILE_USE=1
|
||||
|
||||
####################################
|
||||
# Other targets
|
||||
|
||||
|
|
|
@ -191,6 +191,9 @@ MOZ_OPTIMIZE = @MOZ_OPTIMIZE@
|
|||
MOZ_OPTIMIZE_FLAGS = @MOZ_OPTIMIZE_FLAGS@
|
||||
MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
|
||||
|
||||
PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
|
||||
PROFILE_USE_CFLAGS = @PROFILE_USE_CFLAGS@
|
||||
|
||||
XCFLAGS = @XCFLAGS@
|
||||
XLDFLAGS = @XLDFLAGS@
|
||||
XLIBS = @XLIBS@
|
||||
|
|
|
@ -477,6 +477,16 @@ DSO_PIC_CFLAGS=-mdynamic-no-pic
|
|||
else
|
||||
DSO_PIC_CFLAGS=
|
||||
endif
|
||||
|
||||
# Enable profile-based feedback for non-PIC objects
|
||||
ifdef MOZ_PROFILE_GENERATE
|
||||
DSO_PIC_CFLAGS += $(PROFILE_GEN_CFLAGS)
|
||||
else
|
||||
ifdef MOZ_PROFILE_USE
|
||||
DSO_PIC_CFLAGS += $(PROFILE_USE_CFLAGS)
|
||||
endif
|
||||
endif
|
||||
|
||||
MKSHLIB=
|
||||
endif
|
||||
|
||||
|
|
32
configure.in
32
configure.in
|
@ -4709,6 +4709,38 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
|
|||
CFLAGS="$_SAVE_CFLAGS"
|
||||
fi
|
||||
|
||||
dnl Test for profiling options
|
||||
dnl Under gcc 3.3, use -fprofile-arcs/-fbranch-probabilities
|
||||
dnl Under gcc 3.4+, use -fprofile-generate/-fprofile-use
|
||||
|
||||
_SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -fprofile-generate"
|
||||
|
||||
AC_MSG_CHECKING([whether C compiler supports -fprofile-generate])
|
||||
AC_TRY_COMPILE([], [return 0;],
|
||||
[ PROFILE_GEN_CFLAGS="-fprofile-generate"
|
||||
result="yes" ], result="no")
|
||||
AC_MSG_RESULT([$result])
|
||||
|
||||
if test $result = "yes"; then
|
||||
PROFILE_USE_CFLAGS="-fprofile-use"
|
||||
else
|
||||
CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
|
||||
AC_MSG_CHECKING([whether C compiler supports -fprofile-arcs])
|
||||
AC_TRY_COMPILE([], [return 0;],
|
||||
[ PROFILE_GEN_CFLAGS="-fprofile-arcs"
|
||||
result="yes" ], result="no")
|
||||
AC_MSG_RESULT([$result])
|
||||
if test $result = "yes"; then
|
||||
PROFILE_USE_CFLAGS="-fbranch-probabilities"
|
||||
fi
|
||||
fi
|
||||
|
||||
CFLAGS="$_SAVE_CFLAGS"
|
||||
|
||||
AC_SUBST(PROFILE_GEN_CFLAGS)
|
||||
AC_SUBST(PROFILE_USE_CFLAGS)
|
||||
|
||||
AC_LANG_CPLUSPLUS
|
||||
|
||||
dnl ========================================================
|
||||
|
|
Загрузка…
Ссылка в новой задаче