186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

feature: now the openresty build system (./configure) automatically patches the resty command-line utility to use its own nginx binary so that it does not have to compute it at runtime (which is a bit expensive).

Browse Source 
this saves about 10ms (from for total 20ms to 10ms) for resty's startup time, as
measured on a mid-2015 MBP. That's 50% reduction in total startup time!

Signed-off-by: Yichun Zhang (agentzh) <agentzh@gmail.com>
This commit is contained in:
Yichun Zhang (agentzh)
2018-03-18 12:31:16 -07:00
parent f1ad126b75
commit 46a1c7adb3
2 changed files with 96 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
util/configure vendored
View File

@ -332,6 +332,12 @@ if ($platform eq 'msys') {
my $postamble = '';
if ($platform ne 'msys') {
if (!$ngx_sbin) {
$ngx_sbin = "$ngx_prefix/sbin/nginx";
}
}
my $resty_opts = build_resty_opts(\%resty_opts);
if (@ngx_rpaths) {
@ -363,9 +369,6 @@ push @make_install_cmds,
. " \$(DESTDIR)$prefix/site/manifest";
if ($platform ne 'msys') {
if (!$ngx_sbin) {
$ngx_sbin = "$ngx_prefix/sbin/nginx";
}
push @make_install_cmds, "ln -sf $ngx_sbin \$(DESTDIR)$prefix/bin/openresty";
}
@ -1065,6 +1068,38 @@ _EOC_
}
push @make_install_cmds, "cd $root_dir/build/$resty_cli_dir && "
. "$root_dir/build/install bin/* $target_dir";
if ($platform ne 'msys') {
# patch the resty script:
print "patching the resty script with hard-coded nginx binary ",
"path...\n";
my $resty_bin = "$root_dir/build/$resty_cli_dir/bin/resty";
open my $in, $resty_bin
or die "Cannot open $resty_bin for reading: $!\n";
my ($new, $found);
while (<$in>) {
if (/^my \$nginx_path;$/) {
$found = 1;
$new .= qq/my \$nginx_path = '$ngx_sbin';\n/;
} else {
$new .= $_;
}
}
close $in;
if (!$found) {
die "failed to patch $resty_bin: the line 'my \$nginx_path' ",
"was not found.\n";
}
open my $out, ">$resty_bin"
or die "Cannot open $resty_bin for writing: $!\n";
print $out $new;
close $out;
}
}
# configure restydoc indexes