Move qemuGetProcessInfo and qemuGetSchedInfo methods to util and share them
with ch driver.
Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
---
src/libvirt_private.syms | 2 +
src/qemu/qemu_driver.c | 116 ++-------------------------------------
src/util/virprocess.c | 108 ++++++++++++++++++++++++++++++++++++
src/util/virprocess.h | 5 ++
4 files changed, 120 insertions(+), 111 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index da27ee7b53..56adc192cd 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3101,8 +3101,10 @@ virProcessGetAffinity;
virProcessGetMaxMemLock;
virProcessGetNamespaces;
virProcessGetPids;
+virProcessGetSchedInfo;
virProcessGetStartTime;
virProcessGetStat;
+virProcessGetStatInfo;
virProcessGroupGet;
virProcessGroupKill;
virProcessKill;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e444ad2d45..ba3efef42b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1317,113 +1317,6 @@ qemuGetSchedstatDelay(unsigned long long *cpudelay,
return 0;
}
-
-static int
-qemuGetSchedInfo(unsigned long long *cpuWait,
- pid_t pid, pid_t tid)
-{
- g_autofree char *proc = NULL;
- g_autofree char *data = NULL;
- g_auto(GStrv) lines = NULL;
- size_t i;
- double val;
-
- *cpuWait = 0;
-
- /* In general, we cannot assume pid_t fits in int; but /proc parsing
- * is specific to Linux where int works fine. */
- if (tid)
- proc = g_strdup_printf("/proc/%d/task/%d/sched", (int)pid, (int)tid);
- else
- proc = g_strdup_printf("/proc/%d/sched", (int)pid);
- if (!proc)
- return -1;
-
- /* The file is not guaranteed to exist (needs CONFIG_SCHED_DEBUG) */
- if (access(proc, R_OK) < 0) {
- return 0;
- }
-
- if (virFileReadAll(proc, (1<<16), &data) < 0)
- return -1;
-
- lines = g_strsplit(data, "\n", 0);
- if (!lines)
- return -1;
-
- for (i = 0; lines[i] != NULL; i++) {
- const char *line = lines[i];
-
- /* Needs CONFIG_SCHEDSTATS. The second check
- * is the old name the kernel used in past */
- if (STRPREFIX(line, "se.statistics.wait_sum") ||
- STRPREFIX(line, "se.wait_sum")) {
- line = strchr(line, ':');
- if (!line) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Missing separator in sched info '%s'"),
- lines[i]);
- return -1;
- }
- line++;
- while (*line == ' ')
- line++;
-
- if (virStrToDouble(line, NULL, &val) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unable to parse sched info value '%s'"),
- line);
- return -1;
- }
-
- *cpuWait = (unsigned long long)(val * 1000000);
- break;
- }
- }
-
- return 0;
-}
-
-
-static int
-qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss,
- pid_t pid, pid_t tid)
-{
- g_auto(GStrv) proc_stat = virProcessGetStat(pid, tid);
- unsigned long long usertime = 0, systime = 0;
- long rss = 0;
- int cpu = 0;
-
- if (!proc_stat ||
- virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_UTIME], NULL, 10, &usertime) < 0 ||
- virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10, &systime) < 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) {
- VIR_WARN("cannot parse process status data");
- }
-
- /* We got jiffies
- * We want nanoseconds
- * _SC_CLK_TCK is jiffies per second
- * So calculate thus....
- */
- if (cpuTime)
- *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime)
- / (unsigned long long)sysconf(_SC_CLK_TCK);
- if (lastCpu)
- *lastCpu = cpu;
-
- if (vm_rss)
- *vm_rss = rss * virGetSystemPageSizeKB();
-
-
- VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld",
- (int)pid, tid, usertime, systime, cpu, rss);
-
- return 0;
-}
-
-
static int
qemuDomainHelperGetVcpus(virDomainObj *vm,
virVcpuInfoPtr info,
@@ -1463,7 +1356,7 @@ qemuDomainHelperGetVcpus(virDomainObj *vm,
vcpuinfo->number = i;
vcpuinfo->state = VIR_VCPU_RUNNING;
- if (qemuGetProcessInfo(&vcpuinfo->cpuTime,
+ if (virProcessGetStatInfo(&vcpuinfo->cpuTime,
&vcpuinfo->cpu, NULL,
vm->pid, vcpupid) < 0) {
virReportSystemError(errno, "%s",
@@ -1483,7 +1376,7 @@ qemuDomainHelperGetVcpus(virDomainObj *vm,
}
if (cpuwait) {
- if (qemuGetSchedInfo(&(cpuwait[ncpuinfo]), vm->pid, vcpupid) < 0)
+ if (virProcessGetSchedInfo(&(cpuwait[ncpuinfo]), vm->pid, vcpupid) < 0)
return -1;
}
@@ -2626,7 +2519,8 @@ qemuDomainGetInfo(virDomainPtr dom,
}
if (virDomainObjIsActive(vm)) {
- if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) {
+ if (virProcessGetStatInfo(&(info->cpuTime), NULL, NULL,
+ vm->pid, 0) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("cannot read cputime for domain"));
goto cleanup;
@@ -10623,7 +10517,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver,
ret = 0;
}
- if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
+ if (virProcessGetStatInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("cannot get RSS for domain"));
} else {
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 7b0ad9c97b..3be9080b67 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -1764,3 +1764,111 @@ virProcessGetStat(pid_t pid,
return ret;
}
+
+
+int
+virProcessGetStatInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss,
+ pid_t pid, pid_t tid)
+{
+ g_auto(GStrv) proc_stat = virProcessGetStat(pid, tid);
+ unsigned long long usertime = 0, systime = 0;
+ long rss = 0;
+ int cpu = 0;
+
+ if (!proc_stat ||
+ virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_UTIME], NULL, 10,
+ &usertime) < 0
+ || virStrToLong_ullp(proc_stat[VIR_PROCESS_STAT_STIME], NULL, 10,
+ &systime) < 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) {
+ VIR_WARN("cannot parse process status data");
+ }
+
+ /* We got jiffies
+ * We want nanoseconds
+ * _SC_CLK_TCK is jiffies per second
+ * So calculate thus....
+ */
+ if (cpuTime)
+ *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime)
+ / (unsigned long long) sysconf(_SC_CLK_TCK);
+ if (lastCpu)
+ *lastCpu = cpu;
+
+ if (vm_rss)
+ *vm_rss = rss * virGetSystemPageSizeKB();
+
+
+ VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld",
+ (int) pid, tid, usertime, systime, cpu, rss);
+
+ return 0;
+}
+
+int
+virProcessGetSchedInfo(unsigned long long *cpuWait, pid_t pid, pid_t tid)
+{
+ g_autofree char *proc = NULL;
+ g_autofree char *data = NULL;
+
+ g_auto(GStrv) lines = NULL;
+ size_t i;
+ double val;
+
+ *cpuWait = 0;
+
+ /* In general, we cannot assume pid_t fits in int; but /proc parsing
+ * is specific to Linux where int works fine. */
+ if (tid)
+ proc = g_strdup_printf("/proc/%d/task/%d/sched", (int) pid, (int) tid);
+ else
+ proc = g_strdup_printf("/proc/%d/sched", (int) pid);
+ if (!proc)
+ return -1;
+
+ /* The file is not guaranteed to exist (needs CONFIG_SCHED_DEBUG) */
+ if (access(proc, R_OK) < 0) {
+ return 0;
+ }
+
+ if (virFileReadAll(proc, (1 << 16), &data) < 0)
+ return -1;
+
+ lines = g_strsplit(data, "\n", 0);
+ if (!lines)
+ return -1;
+
+ for (i = 0; lines[i] != NULL; i++) {
+ const char *line = lines[i];
+
+ /* Needs CONFIG_SCHEDSTATS. The second check
+ * is the old name the kernel used in past */
+ if (STRPREFIX(line, "se.statistics.wait_sum") ||
+ STRPREFIX(line, "se.wait_sum")) {
+ line = strchr(line, ':');
+ if (!line) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Missing separator in sched info '%s'"),
+ lines[i]);
+ return -1;
+ }
+ line++;
+ while (*line == ' ')
+ line++;
+
+ if (virStrToDouble(line, NULL, &val) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Unable to parse sched info value '%s'"),
+ line);
+ return -1;
+ }
+
+ *cpuWait = (unsigned long long) (val * 1000000);
+ break;
+ }
+ }
+
+ return 0;
+}
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 82b7403964..d9d27c29b8 100644
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -193,3 +193,8 @@ typedef enum {
} virProcessNamespaceFlags;
int virProcessNamespaceAvailable(unsigned int ns);
+
+int virProcessGetStatInfo(unsigned long long *cpuTime, int *lastCpu,
+ long *vm_rss, pid_t pid, pid_t tid);
+int virProcessGetSchedInfo(unsigned long long *cpuWait, pid_t pid,
+ pid_t tid);
--
2.27.0
On 12/10/21 21:34, Praveen K Paladugu wrote:
> Move qemuGetProcessInfo and qemuGetSchedInfo methods to util and share them
> with ch driver.
>
> Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
> ---
> src/libvirt_private.syms | 2 +
> src/qemu/qemu_driver.c | 116 ++-------------------------------------
> src/util/virprocess.c | 108 ++++++++++++++++++++++++++++++++++++
> src/util/virprocess.h | 5 ++
> 4 files changed, 120 insertions(+), 111 deletions(-)
>
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index da27ee7b53..56adc192cd 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -3101,8 +3101,10 @@ virProcessGetAffinity;
> virProcessGetMaxMemLock;
> virProcessGetNamespaces;
> virProcessGetPids;
> +virProcessGetSchedInfo;
> virProcessGetStartTime;
> virProcessGetStat;
> +virProcessGetStatInfo;
> virProcessGroupGet;
> virProcessGroupKill;
> virProcessKill;
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index e444ad2d45..ba3efef42b 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -1463,7 +1356,7 @@ qemuDomainHelperGetVcpus(virDomainObj *vm,
> vcpuinfo->number = i;
> vcpuinfo->state = VIR_VCPU_RUNNING;
>
> - if (qemuGetProcessInfo(&vcpuinfo->cpuTime,
> + if (virProcessGetStatInfo(&vcpuinfo->cpuTime,
> &vcpuinfo->cpu, NULL,
> vm->pid, vcpupid) < 0) {
Indentation.
> virReportSystemError(errno, "%s",
> @@ -1483,7 +1376,7 @@ qemuDomainHelperGetVcpus(virDomainObj *vm,
> }
>
> if (cpuwait) {
> - if (qemuGetSchedInfo(&(cpuwait[ncpuinfo]), vm->pid, vcpupid) < 0)
> + if (virProcessGetSchedInfo(&(cpuwait[ncpuinfo]), vm->pid, vcpupid) < 0)
> return -1;
> }
>
> @@ -2626,7 +2519,8 @@ qemuDomainGetInfo(virDomainPtr dom,
> }
>
> if (virDomainObjIsActive(vm)) {
> - if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) {
> + if (virProcessGetStatInfo(&(info->cpuTime), NULL, NULL,
> + vm->pid, 0) < 0) {
And here too.
> virReportError(VIR_ERR_OPERATION_FAILED, "%s",
> _("cannot read cputime for domain"));
> goto cleanup;
> @@ -10623,7 +10517,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriver *driver,
> ret = 0;
> }
>
> - if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
> + if (virProcessGetStatInfo(NULL, NULL, &rss, vm->pid, 0) < 0) {
> virReportError(VIR_ERR_OPERATION_FAILED, "%s",
> _("cannot get RSS for domain"));
> } else {
> diff --git a/src/util/virprocess.c b/src/util/virprocess.c
> index 7b0ad9c97b..3be9080b67 100644
> --- a/src/util/virprocess.c
> +++ b/src/util/virprocess.c
> @@ -1764,3 +1764,111 @@ virProcessGetStat(pid_t pid,
>
> return ret;
> }
> +
> +
> +int
> +virProcessGetStatInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss,
> + pid_t pid, pid_t tid)
Since you are touching this, it would be nice if these arguments are on
separate lines. This applies here and to the rest of the patches. The
idea behind is that when a new argument is introduced a smaller diff can
be produced, which in turn opens a possibility of less conflicts during
backports.
I'm not going to raise this in the rest of my review.
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Michal
© 2016 - 2026 Red Hat, Inc.