From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 1/5] location-functions.pl: Use a single script-wide db_handle. Date: Mon, 09 Nov 2020 11:35:15 +0000 Message-ID: In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6166987660699994562==" List-Id: --===============6166987660699994562== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, Thank you Stefan for submitting this patchset. > On 8 Nov 2020, at 19:36, Bernhard Bitsch wrote: >=20 > This means, we stay with the unbalanced memory allocation in (Perl) libloc.= Which leaves a memory leak. Bernhard, could you please elaborate on how this memory leak is still existin= g? I also do not understand what you mean by unbalanced. As far as I understand the code right now, the database is being opened once = and the handle is being stored internally. All functions that are being calle= d will no longer have to hold their own database handle. Therefore the maximu= m amount of handles open is one. >=20 >> Gesendet: Samstag, 07. November 2020 um 19:47 Uhr >> Von: "Stefan Schantl" >> An: development(a)lists.ipfire.org >> Betreff: [PATCH 1/5] location-functions.pl: Use a single script-wide db_ha= ndle. >>=20 >> Create and use a single script-wide database handle for libloc to >> prevent from creating multiple ones. >>=20 >> This helps saving memory, especially on small systems. >>=20 >> Reference #12515. >>=20 >=20 > The error can be produced easily with small memory, but it is present in al= l systems. > Therefore I've posted this solution as work-around only! Did you test this patchset or did you come to your conclusion by only reading= the code? Best, -Michael >=20 > - Bernhard >=20 >=20 >> Signed-off-by: Stefan Schantl >> --- >> config/cfgroot/location-functions.pl | 11 ++++------- >> 1 file changed, 4 insertions(+), 7 deletions(-) >>=20 >> diff --git a/config/cfgroot/location-functions.pl b/config/cfgroot/locatio= n-functions.pl >> index 2cfe7f908..9b1d0bfb5 100644 >> --- a/config/cfgroot/location-functions.pl >> +++ b/config/cfgroot/location-functions.pl >> @@ -55,6 +55,9 @@ our $keyfile =3D "$location_dir/signing-key.pem"; >> # Directory which contains the exported databases. >> our $xt_geoip_db_directory =3D "/usr/share/xt_geoip/"; >>=20 >> +# Create libloc database handle. >> +my $db_handle =3D &init(); >> + >> # >> ## Tiny function to init the location database. >> # >> @@ -86,7 +89,7 @@ sub verify ($) { >> ## Function to the the country code of a given address. >> # >> sub lookup_country_code($$) { >> - my ($db_handle, $address) =3D @_; >> + my ($address) =3D @_; >>=20 >> # Lookup the given address. >> my $country_code =3D &Location::lookup_country_code($db_handle, $address); >> @@ -174,9 +177,6 @@ sub get_full_country_name($) { >>=20 >> # Function to get all available locations. >> sub get_locations() { >> - # Create libloc database handle. >> - my $db_handle =3D &init(); >> - >> # Get locations which are stored in the location database. >> my @database_locations =3D &Location::database_countries($db_handle); >>=20 >> @@ -197,9 +197,6 @@ sub address_has_flags($) { >> # Array to store the flags of the address. >> my @flags; >>=20 >> - # Init libloc database handle. >> - my $db_handle =3D &init(); >> - >> # Loop through the hash of possible network flags. >> foreach my $flag (keys(%network_flags)) { >> # Check if the address has the current flag. >> -- >> 2.20.1 >>=20 >>=20 --===============6166987660699994562==--