From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH] speed.cgi: reduce system load by copying two general-functions.
Date: Fri, 22 Oct 2021 10:05:32 +0200
Message-ID: <20211022080532.3195-1-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2642561692350446564=="
List-Id: <development.lists.ipfire.org>

--===============2642561692350446564==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

include general-functions.pl load and initialize many subfunctions that are n=
ot
needed by speed.cgi which was executed very ofthen.
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(a)ipfire.org>
---
 config/cfgroot/general-functions.pl |  2 ++
 html/cgi-bin/speed.cgi              | 46 +++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun=
ctions.pl
index f72d6588c..c10a04faa 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -53,6 +53,7 @@ sub system_background($) {
 }
=20
 # Returns the output of a shell command
+# if you change this also check speed.cgi that include a local copy for syst=
emload reasons
 sub system_output($) {
 	my @command =3D @_;
 	my $pid;
@@ -1227,6 +1228,7 @@ sub firewall_reload() {
 }
=20
 # Function which will return the used interface for the red network zone (re=
d0, ppp0, etc).
+# if you change this also check speed.cgi that include a local copy for syst=
emload reasons
 sub get_red_interface() {
=20
 	open(IFACE, "${General::swroot}/red/iface") or die "Could not open /var/ipf=
ire/red/iface";
diff --git a/html/cgi-bin/speed.cgi b/html/cgi-bin/speed.cgi
index b550fda52..651c3c0b3 100644
--- a/html/cgi-bin/speed.cgi
+++ b/html/cgi-bin/speed.cgi
@@ -19,7 +19,47 @@
 #                                                                           =
  #
 ############################################################################=
###
=20
-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 creat=
e #
+# high system load                                                          =
  #
+###########################################OA###############################=
###
+#
+# Returns the output of a shell command
+sub General__system_output($) {
+    my @command =3D @_;
+    my $pid;
+    my @output =3D ();
+
+    unless ($pid =3D 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 (re=
d0, ppp0, etc).
+sub General__get_red_interface() {
+
+     open(IFACE, "/var/ipfire/red/iface") or die "Could not open /var/ipfire=
/red/iface";
+
+     my $interface =3D <IFACE>;
+     close(IFACE);
+     chomp $interface;
+
+     return $interface;
+}
+#
+############################################################################=
###
=20
 my $data_last =3D $ENV{'QUERY_STRING'};
 my $rxb_last =3D 0;
@@ -38,8 +78,8 @@ foreach $field (@fields) {
 	}
 }
=20
-my $interface =3D &General::get_red_interface();
-my @data_now =3D &General::system_output("ip", "-s", "link", "show", "$inter=
face");
+my $interface =3D &General__get_red_interface();
+my @data_now =3D &General__system_output("ip", "-s", "link", "show", "$inter=
face");
=20
 my $lastline;
 my $rxb_now =3D 0;
--=20
2.25.1


--===============2642561692350446564==--