services.cgi: Use new functions to figure out memory usage

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-08-07 15:29:57 +02:00
parent 1392ccfe30
commit 6fa4cdf7e3

View File

@@ -232,17 +232,13 @@ sub isrunningaddon (@) {
my @pid = split(/\s/,$testcmd); my @pid = split(/\s/,$testcmd);
$status .="<td align='center'>$pid[0]</td>"; $status .="<td align='center'>$pid[0]</td>";
my $memory = 0; # Fetch the memory consumption
my $memory = &General::get_memory_consumption(@pid);
foreach (@pid){ # Format memory
chomp($_); $memory = &General::formatBytes($memory);
if (open(FILE, "/proc/$_/statm")){
my $temp = <FILE>; $status .="<td align='right'>$memory</td>";
@memory = split(/ /,$temp);
}
$memory+=$memory[0];
}
$status .="<td align='center'>$memory KB</td>";
}else{ }else{
$status = "<td align='center' width='16%' colspan=2><a href='services.cgi?$pak!start!$service'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>"; $status = "<td align='center' width='16%' colspan=2><a href='services.cgi?$pak!start!$service'><img alt='$Lang::tr{'start'}' title='$Lang::tr{'start'}' src='/images/go-up.png' border='0' /></a></td>";
$status .= "<td class='status is-stopped'>$Lang::tr{'stopped'}</td><td colspan='2'></td>"; $status .= "<td class='status is-stopped'>$Lang::tr{'stopped'}</td><td colspan='2'></td>";