External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Parse RSS into ullp

Browse Source 
It is used to fill an unsigned long long anyway and if it is negative
than there is really an issue somewhere.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Martin Kletzander 2023-03-31 14:39:34 +02:00
parent a7ee9eac83
commit e940cac98e
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_driver.c
View File

@ -9937,7 +9937,7 @@ qemuDomainMemoryStatsInternal(virDomainObj *vm,
{
int ret = -1;
long rss;
unsigned long long rss;
if (virDomainObjCheckActive(vm) < 0)
return -1;

17
src/util/virprocess.c
View File

@ -23,6 +23,7 @@
#include <config.h>
#include <fcntl.h>
#include <limits.h>
#include <signal.h>
#ifndef WIN32
# include <sys/wait.h>
@ -1739,7 +1740,7 @@ virProcessGetStatInfo(unsigned long long *cpuTime,
unsigned long long *userTime,
unsigned long long *sysTime,
int *lastCpu,
long *vm_rss,
unsigned long long *vm_rss,
pid_t pid,
pid_t tid)
{
@ -1748,14 +1749,16 @@ virProcessGetStatInfo(unsigned long long *cpuTime,
unsigned long long stime = 0;
const unsigned long long jiff2nsec = 1000ull * 1000ull * 1000ull /
(unsigned long long) sysconf(_SC_CLK_TCK);
long rss = 0;
const long pagesize = virGetSystemPageSizeKB();
unsigned long long rss = 0;
int cpu = 0;
if (!proc_stat ||
virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_UTIME], NULL, 10, &utime) < 0 ||
virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10, &stime) < 0 ||
virStrToLong_l(proc_stat[VIR_PROCESS_STAT_RSS], NULL, 10, &rss) < 0 ||
virStrToLong_i(proc_stat[VIR_PROCESS_STAT_PROCESSOR], NULL, 10, &cpu) < 0) {
virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_RSS], NULL, 10, &rss) < 0 ||
virStrToLong_i(proc_stat[VIR_PROCESS_STAT_PROCESSOR], NULL, 10, &cpu) < 0 ||
rss > ULLONG_MAX / pagesize) {
VIR_WARN("cannot parse process status data");
}
@ -1771,10 +1774,10 @@ virProcessGetStatInfo(unsigned long long *cpuTime,
*lastCpu = cpu;
if (vm_rss)
*vm_rss = rss * virGetSystemPageSizeKB();
*vm_rss = rss * pagesize;
VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld",
VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%lld",
(int) pid, tid, utime, stime, cpu, rss);
return 0;
@ -1851,7 +1854,7 @@ virProcessGetStatInfo(unsigned long long *cpuTime,
unsigned long long *userTime,
unsigned long long *sysTime,
int *lastCpu,
long *vm_rss,
unsigned long long *vm_rss,
pid_t pid G_GNUC_UNUSED,
pid_t tid G_GNUC_UNUSED)
{

2
src/util/virprocess.h
View File

@ -198,7 +198,7 @@ int virProcessGetStatInfo(unsigned long long *cpuTime,
unsigned long long *userTime,
unsigned long long *sysTime,
int *lastCpu,
long *vm_rss,
unsigned long long *vm_rss,
pid_t pid,
pid_t tid);
int virProcessGetSchedInfo(unsigned long long *cpuWait,