webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

speed.cgi: reduce system load by copying two general-functions.

Browse Source 
include general-functions.pl load and initialize many subfunctions that are not
needed by speed.cgi which was executed very often.
So this reduce the system load significant if webif was open in browser
and ajax-speed display enabled.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2021-10-22 10:05:32 +02:00
parent 6befc952cc
commit 110d4c8106
2 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/cfgroot/general-functions.pl
View File

@@ -53,6 +53,7 @@ sub system_background($) {
}
# Returns the output of a shell command
# if you change this also check speed.cgi that include a local copy for systemload reasons
sub system_output($) {
my @command = @_;
my $pid;
@@ -1227,6 +1228,7 @@ sub firewall_reload() {
}
# Function which will return the used interface for the red network zone (red0, ppp0, etc).
# if you change this also check speed.cgi that include a local copy for systemload reasons
sub get_red_interface() {
open(IFACE, "${General::swroot}/red/iface") or die "Could not open /var/ipfire/red/iface";

46
html/cgi-bin/speed.cgi
View File

@@ -19,7 +19,47 @@
# #
###############################################################################
require '/var/ipfire/general-functions.pl';
###############################################################################
# functions copied from general-functions.pl for speed improvement because #
# loading and initializing the whole general-functions.pl every second create #
# high system load #
###########################################OA##################################
#
# Returns the output of a shell command
sub General__system_output($) {
my @command = @_;
my $pid;
my @output = ();
unless ($pid = open(OUTPUT, "-|")) {
open(STDERR, ">&STDOUT");
exec { ${command[0]} } @command;
die "Could not execute @command: $!";
}
waitpid($pid, 0);
while (<OUTPUT>) {
push(@output, $_);
}
close(OUTPUT);
return @output;
}
#
# Function which will return the used interface for the red network zone (red0, ppp0, etc).
sub General__get_red_interface() {
open(IFACE, "/var/ipfire/red/iface") or die "Could not open /var/ipfire/red/iface";
my $interface = <IFACE>;
close(IFACE);
chomp $interface;
return $interface;
}
#
###############################################################################
my $data_last = $ENV{'QUERY_STRING'};
my $rxb_last = 0;
@@ -38,8 +78,8 @@ foreach $field (@fields) {
}
}
my $interface = &General::get_red_interface();
my @data_now = &General::system_output("ip", "-s", "link", "show", "$interface");
my $interface = &General__get_red_interface();
my @data_now = &General__system_output("ip", "-s", "link", "show", "$interface");
my $lastline;
my $rxb_now = 0;