| Message ID | 20240613150127.1361931-6-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qga: clean up command source locations and conditionals | expand |
On 13/6/24 17:01, Daniel P. Berrangé wrote: > The qmp_guest_{diskstats,cpustats} command impls in > commands-posix.c are surrounded by '#ifdef __linux__' so should > instead live in commands-linux.c > > This also removes a "#ifdef CONFIG_LINUX" that was nested inside > a "#ifdef __linux__". > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > qga/commands-linux.c | 195 ++++++++++++++++++++++++++++++++++++++++++ > qga/commands-posix.c | 199 ------------------------------------------- > 2 files changed, 195 insertions(+), 199 deletions(-) Easy to review using 'git-diff --color-moved=dimmed-zebra'. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> On Thu, Jun 13, 2024 at 6:02 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > The qmp_guest_{diskstats,cpustats} command impls in > commands-posix.c are surrounded by '#ifdef __linux__' so should > instead live in commands-linux.c > > This also removes a "#ifdef CONFIG_LINUX" that was nested inside > a "#ifdef __linux__". > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > qga/commands-linux.c | 195 ++++++++++++++++++++++++++++++++++++++++++ > qga/commands-posix.c | 199 ------------------------------------------- > 2 files changed, 195 insertions(+), 199 deletions(-) > > diff --git a/qga/commands-linux.c b/qga/commands-linux.c > index 084e6c9e85..c0e8bd4062 100644 > --- a/qga/commands-linux.c > +++ b/qga/commands-linux.c > @@ -1594,3 +1594,198 @@ int64_t > qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp) > > return processed; > } > + > +#define MAX_NAME_LEN 128 > +static GuestDiskStatsInfoList *guest_get_diskstats(Error **errp) > +{ > + GuestDiskStatsInfoList *head = NULL, **tail = &head; > + const char *diskstats = "/proc/diskstats"; > + FILE *fp; > + size_t n; > + char *line = NULL; > + > + fp = fopen(diskstats, "r"); > + if (fp == NULL) { > + error_setg_errno(errp, errno, "open(\"%s\")", diskstats); > + return NULL; > + } > + > + while (getline(&line, &n, fp) != -1) { > + g_autofree GuestDiskStatsInfo *diskstatinfo = NULL; > + g_autofree GuestDiskStats *diskstat = NULL; > + char dev_name[MAX_NAME_LEN]; > + unsigned int ios_pgr, tot_ticks, rq_ticks, wr_ticks, dc_ticks, > fl_ticks; > + unsigned long rd_ios, rd_merges_or_rd_sec, rd_ticks_or_wr_sec, > wr_ios; > + unsigned long wr_merges, rd_sec_or_wr_ios, wr_sec; > + unsigned long dc_ios, dc_merges, dc_sec, fl_ios; > + unsigned int major, minor; > + int i; > + > + i = sscanf(line, "%u %u %s %lu %lu %lu" > + "%lu %lu %lu %lu %u %u %u %u" > + "%lu %lu %lu %u %lu %u", > + &major, &minor, dev_name, > + &rd_ios, &rd_merges_or_rd_sec, &rd_sec_or_wr_ios, > + &rd_ticks_or_wr_sec, &wr_ios, &wr_merges, &wr_sec, > + &wr_ticks, &ios_pgr, &tot_ticks, &rq_ticks, > + &dc_ios, &dc_merges, &dc_sec, &dc_ticks, > + &fl_ios, &fl_ticks); > + > + if (i < 7) { > + continue; > + } > + > + diskstatinfo = g_new0(GuestDiskStatsInfo, 1); > + diskstatinfo->name = g_strdup(dev_name); > + diskstatinfo->major = major; > + diskstatinfo->minor = minor; > + > + diskstat = g_new0(GuestDiskStats, 1); > + if (i == 7) { > + diskstat->has_read_ios = true; > + diskstat->read_ios = rd_ios; > + diskstat->has_read_sectors = true; > + diskstat->read_sectors = rd_merges_or_rd_sec; > + diskstat->has_write_ios = true; > + diskstat->write_ios = rd_sec_or_wr_ios; > + diskstat->has_write_sectors = true; > + diskstat->write_sectors = rd_ticks_or_wr_sec; > + } > + if (i >= 14) { > + diskstat->has_read_ios = true; > + diskstat->read_ios = rd_ios; > + diskstat->has_read_sectors = true; > + diskstat->read_sectors = rd_sec_or_wr_ios; > + diskstat->has_read_merges = true; > + diskstat->read_merges = rd_merges_or_rd_sec; > + diskstat->has_read_ticks = true; > + diskstat->read_ticks = rd_ticks_or_wr_sec; > + diskstat->has_write_ios = true; > + diskstat->write_ios = wr_ios; > + diskstat->has_write_sectors = true; > + diskstat->write_sectors = wr_sec; > + diskstat->has_write_merges = true; > + diskstat->write_merges = wr_merges; > + diskstat->has_write_ticks = true; > + diskstat->write_ticks = wr_ticks; > + diskstat->has_ios_pgr = true; > + diskstat->ios_pgr = ios_pgr; > + diskstat->has_total_ticks = true; > + diskstat->total_ticks = tot_ticks; > + diskstat->has_weight_ticks = true; > + diskstat->weight_ticks = rq_ticks; > + } > + if (i >= 18) { > + diskstat->has_discard_ios = true; > + diskstat->discard_ios = dc_ios; > + diskstat->has_discard_merges = true; > + diskstat->discard_merges = dc_merges; > + diskstat->has_discard_sectors = true; > + diskstat->discard_sectors = dc_sec; > + diskstat->has_discard_ticks = true; > + diskstat->discard_ticks = dc_ticks; > + } > + if (i >= 20) { > + diskstat->has_flush_ios = true; > + diskstat->flush_ios = fl_ios; > + diskstat->has_flush_ticks = true; > + diskstat->flush_ticks = fl_ticks; > + } > + > + diskstatinfo->stats = g_steal_pointer(&diskstat); > + QAPI_LIST_APPEND(tail, diskstatinfo); > + diskstatinfo = NULL; > + } > + free(line); > + fclose(fp); > + return head; > +} > + > +GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp) > +{ > + return guest_get_diskstats(errp); > +} > + > +GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) > +{ > + GuestCpuStatsList *head = NULL, **tail = &head; > + const char *cpustats = "/proc/stat"; > + int clk_tck = sysconf(_SC_CLK_TCK); > + FILE *fp; > + size_t n; > + char *line = NULL; > + > + fp = fopen(cpustats, "r"); > + if (fp == NULL) { > + error_setg_errno(errp, errno, "open(\"%s\")", cpustats); > + return NULL; > + } > + > + while (getline(&line, &n, fp) != -1) { > + GuestCpuStats *cpustat = NULL; > + GuestLinuxCpuStats *linuxcpustat; > + int i; > + unsigned long user, system, idle, iowait, irq, softirq, steal, > guest; > + unsigned long nice, guest_nice; > + char name[64]; > + > + i = sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", > + name, &user, &nice, &system, &idle, &iowait, &irq, > &softirq, > + &steal, &guest, &guest_nice); > + > + /* drop "cpu 1 2 3 ...", get "cpuX 1 2 3 ..." only */ > + if ((i == EOF) || strncmp(name, "cpu", 3) || (name[3] == '\0')) { > + continue; > + } > + > + if (i < 5) { > + slog("Parsing cpu stat from %s failed, see \"man proc\"", > cpustats); > + break; > + } > + > + cpustat = g_new0(GuestCpuStats, 1); > + cpustat->type = GUEST_CPU_STATS_TYPE_LINUX; > + > + linuxcpustat = &cpustat->u.q_linux; > + linuxcpustat->cpu = atoi(&name[3]); > + linuxcpustat->user = user * 1000 / clk_tck; > + linuxcpustat->nice = nice * 1000 / clk_tck; > + linuxcpustat->system = system * 1000 / clk_tck; > + linuxcpustat->idle = idle * 1000 / clk_tck; > + > + if (i > 5) { > + linuxcpustat->has_iowait = true; > + linuxcpustat->iowait = iowait * 1000 / clk_tck; > + } > + > + if (i > 6) { > + linuxcpustat->has_irq = true; > + linuxcpustat->irq = irq * 1000 / clk_tck; > + linuxcpustat->has_softirq = true; > + linuxcpustat->softirq = softirq * 1000 / clk_tck; > + } > + > + if (i > 8) { > + linuxcpustat->has_steal = true; > + linuxcpustat->steal = steal * 1000 / clk_tck; > + } > + > + if (i > 9) { > + linuxcpustat->has_guest = true; > + linuxcpustat->guest = guest * 1000 / clk_tck; > + } > + > + if (i > 10) { > + linuxcpustat->has_guest = true; > + linuxcpustat->guest = guest * 1000 / clk_tck; > + linuxcpustat->has_guestnice = true; > + linuxcpustat->guestnice = guest_nice * 1000 / clk_tck; > + } > + > + QAPI_LIST_APPEND(tail, cpustat); > + } > + > + free(line); > + fclose(fp); > + return head; > +} > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 98aafc45f3..5da60e65ab 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -1195,205 +1195,6 @@ GuestMemoryBlockInfo > *qmp_guest_get_memory_block_info(Error **errp) > return info; > } > > -#define MAX_NAME_LEN 128 > -static GuestDiskStatsInfoList *guest_get_diskstats(Error **errp) > -{ > -#ifdef CONFIG_LINUX > - GuestDiskStatsInfoList *head = NULL, **tail = &head; > - const char *diskstats = "/proc/diskstats"; > - FILE *fp; > - size_t n; > - char *line = NULL; > - > - fp = fopen(diskstats, "r"); > - if (fp == NULL) { > - error_setg_errno(errp, errno, "open(\"%s\")", diskstats); > - return NULL; > - } > - > - while (getline(&line, &n, fp) != -1) { > - g_autofree GuestDiskStatsInfo *diskstatinfo = NULL; > - g_autofree GuestDiskStats *diskstat = NULL; > - char dev_name[MAX_NAME_LEN]; > - unsigned int ios_pgr, tot_ticks, rq_ticks, wr_ticks, dc_ticks, > fl_ticks; > - unsigned long rd_ios, rd_merges_or_rd_sec, rd_ticks_or_wr_sec, > wr_ios; > - unsigned long wr_merges, rd_sec_or_wr_ios, wr_sec; > - unsigned long dc_ios, dc_merges, dc_sec, fl_ios; > - unsigned int major, minor; > - int i; > - > - i = sscanf(line, "%u %u %s %lu %lu %lu" > - "%lu %lu %lu %lu %u %u %u %u" > - "%lu %lu %lu %u %lu %u", > - &major, &minor, dev_name, > - &rd_ios, &rd_merges_or_rd_sec, &rd_sec_or_wr_ios, > - &rd_ticks_or_wr_sec, &wr_ios, &wr_merges, &wr_sec, > - &wr_ticks, &ios_pgr, &tot_ticks, &rq_ticks, > - &dc_ios, &dc_merges, &dc_sec, &dc_ticks, > - &fl_ios, &fl_ticks); > - > - if (i < 7) { > - continue; > - } > - > - diskstatinfo = g_new0(GuestDiskStatsInfo, 1); > - diskstatinfo->name = g_strdup(dev_name); > - diskstatinfo->major = major; > - diskstatinfo->minor = minor; > - > - diskstat = g_new0(GuestDiskStats, 1); > - if (i == 7) { > - diskstat->has_read_ios = true; > - diskstat->read_ios = rd_ios; > - diskstat->has_read_sectors = true; > - diskstat->read_sectors = rd_merges_or_rd_sec; > - diskstat->has_write_ios = true; > - diskstat->write_ios = rd_sec_or_wr_ios; > - diskstat->has_write_sectors = true; > - diskstat->write_sectors = rd_ticks_or_wr_sec; > - } > - if (i >= 14) { > - diskstat->has_read_ios = true; > - diskstat->read_ios = rd_ios; > - diskstat->has_read_sectors = true; > - diskstat->read_sectors = rd_sec_or_wr_ios; > - diskstat->has_read_merges = true; > - diskstat->read_merges = rd_merges_or_rd_sec; > - diskstat->has_read_ticks = true; > - diskstat->read_ticks = rd_ticks_or_wr_sec; > - diskstat->has_write_ios = true; > - diskstat->write_ios = wr_ios; > - diskstat->has_write_sectors = true; > - diskstat->write_sectors = wr_sec; > - diskstat->has_write_merges = true; > - diskstat->write_merges = wr_merges; > - diskstat->has_write_ticks = true; > - diskstat->write_ticks = wr_ticks; > - diskstat->has_ios_pgr = true; > - diskstat->ios_pgr = ios_pgr; > - diskstat->has_total_ticks = true; > - diskstat->total_ticks = tot_ticks; > - diskstat->has_weight_ticks = true; > - diskstat->weight_ticks = rq_ticks; > - } > - if (i >= 18) { > - diskstat->has_discard_ios = true; > - diskstat->discard_ios = dc_ios; > - diskstat->has_discard_merges = true; > - diskstat->discard_merges = dc_merges; > - diskstat->has_discard_sectors = true; > - diskstat->discard_sectors = dc_sec; > - diskstat->has_discard_ticks = true; > - diskstat->discard_ticks = dc_ticks; > - } > - if (i >= 20) { > - diskstat->has_flush_ios = true; > - diskstat->flush_ios = fl_ios; > - diskstat->has_flush_ticks = true; > - diskstat->flush_ticks = fl_ticks; > - } > - > - diskstatinfo->stats = g_steal_pointer(&diskstat); > - QAPI_LIST_APPEND(tail, diskstatinfo); > - diskstatinfo = NULL; > - } > - free(line); > - fclose(fp); > - return head; > -#else > - g_debug("disk stats reporting available only for Linux"); > - return NULL; > -#endif > -} > - > -GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp) > -{ > - return guest_get_diskstats(errp); > -} > - > -GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) > -{ > - GuestCpuStatsList *head = NULL, **tail = &head; > - const char *cpustats = "/proc/stat"; > - int clk_tck = sysconf(_SC_CLK_TCK); > - FILE *fp; > - size_t n; > - char *line = NULL; > - > - fp = fopen(cpustats, "r"); > - if (fp == NULL) { > - error_setg_errno(errp, errno, "open(\"%s\")", cpustats); > - return NULL; > - } > - > - while (getline(&line, &n, fp) != -1) { > - GuestCpuStats *cpustat = NULL; > - GuestLinuxCpuStats *linuxcpustat; > - int i; > - unsigned long user, system, idle, iowait, irq, softirq, steal, > guest; > - unsigned long nice, guest_nice; > - char name[64]; > - > - i = sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", > - name, &user, &nice, &system, &idle, &iowait, &irq, > &softirq, > - &steal, &guest, &guest_nice); > - > - /* drop "cpu 1 2 3 ...", get "cpuX 1 2 3 ..." only */ > - if ((i == EOF) || strncmp(name, "cpu", 3) || (name[3] == '\0')) { > - continue; > - } > - > - if (i < 5) { > - slog("Parsing cpu stat from %s failed, see \"man proc\"", > cpustats); > - break; > - } > - > - cpustat = g_new0(GuestCpuStats, 1); > - cpustat->type = GUEST_CPU_STATS_TYPE_LINUX; > - > - linuxcpustat = &cpustat->u.q_linux; > - linuxcpustat->cpu = atoi(&name[3]); > - linuxcpustat->user = user * 1000 / clk_tck; > - linuxcpustat->nice = nice * 1000 / clk_tck; > - linuxcpustat->system = system * 1000 / clk_tck; > - linuxcpustat->idle = idle * 1000 / clk_tck; > - > - if (i > 5) { > - linuxcpustat->has_iowait = true; > - linuxcpustat->iowait = iowait * 1000 / clk_tck; > - } > - > - if (i > 6) { > - linuxcpustat->has_irq = true; > - linuxcpustat->irq = irq * 1000 / clk_tck; > - linuxcpustat->has_softirq = true; > - linuxcpustat->softirq = softirq * 1000 / clk_tck; > - } > - > - if (i > 8) { > - linuxcpustat->has_steal = true; > - linuxcpustat->steal = steal * 1000 / clk_tck; > - } > - > - if (i > 9) { > - linuxcpustat->has_guest = true; > - linuxcpustat->guest = guest * 1000 / clk_tck; > - } > - > - if (i > 10) { > - linuxcpustat->has_guest = true; > - linuxcpustat->guest = guest * 1000 / clk_tck; > - linuxcpustat->has_guestnice = true; > - linuxcpustat->guestnice = guest_nice * 1000 / clk_tck; > - } > - > - QAPI_LIST_APPEND(tail, cpustat); > - } > - > - free(line); > - fclose(fp); > - return head; > -} > > #else /* defined(__linux__) */ > > -- > 2.45.1 > >
diff --git a/qga/commands-linux.c b/qga/commands-linux.c index 084e6c9e85..c0e8bd4062 100644 --- a/qga/commands-linux.c +++ b/qga/commands-linux.c @@ -1594,3 +1594,198 @@ int64_t qmp_guest_set_vcpus(GuestLogicalProcessorList *vcpus, Error **errp) return processed; } + +#define MAX_NAME_LEN 128 +static GuestDiskStatsInfoList *guest_get_diskstats(Error **errp) +{ + GuestDiskStatsInfoList *head = NULL, **tail = &head; + const char *diskstats = "/proc/diskstats"; + FILE *fp; + size_t n; + char *line = NULL; + + fp = fopen(diskstats, "r"); + if (fp == NULL) { + error_setg_errno(errp, errno, "open(\"%s\")", diskstats); + return NULL; + } + + while (getline(&line, &n, fp) != -1) { + g_autofree GuestDiskStatsInfo *diskstatinfo = NULL; + g_autofree GuestDiskStats *diskstat = NULL; + char dev_name[MAX_NAME_LEN]; + unsigned int ios_pgr, tot_ticks, rq_ticks, wr_ticks, dc_ticks, fl_ticks; + unsigned long rd_ios, rd_merges_or_rd_sec, rd_ticks_or_wr_sec, wr_ios; + unsigned long wr_merges, rd_sec_or_wr_ios, wr_sec; + unsigned long dc_ios, dc_merges, dc_sec, fl_ios; + unsigned int major, minor; + int i; + + i = sscanf(line, "%u %u %s %lu %lu %lu" + "%lu %lu %lu %lu %u %u %u %u" + "%lu %lu %lu %u %lu %u", + &major, &minor, dev_name, + &rd_ios, &rd_merges_or_rd_sec, &rd_sec_or_wr_ios, + &rd_ticks_or_wr_sec, &wr_ios, &wr_merges, &wr_sec, + &wr_ticks, &ios_pgr, &tot_ticks, &rq_ticks, + &dc_ios, &dc_merges, &dc_sec, &dc_ticks, + &fl_ios, &fl_ticks); + + if (i < 7) { + continue; + } + + diskstatinfo = g_new0(GuestDiskStatsInfo, 1); + diskstatinfo->name = g_strdup(dev_name); + diskstatinfo->major = major; + diskstatinfo->minor = minor; + + diskstat = g_new0(GuestDiskStats, 1); + if (i == 7) { + diskstat->has_read_ios = true; + diskstat->read_ios = rd_ios; + diskstat->has_read_sectors = true; + diskstat->read_sectors = rd_merges_or_rd_sec; + diskstat->has_write_ios = true; + diskstat->write_ios = rd_sec_or_wr_ios; + diskstat->has_write_sectors = true; + diskstat->write_sectors = rd_ticks_or_wr_sec; + } + if (i >= 14) { + diskstat->has_read_ios = true; + diskstat->read_ios = rd_ios; + diskstat->has_read_sectors = true; + diskstat->read_sectors = rd_sec_or_wr_ios; + diskstat->has_read_merges = true; + diskstat->read_merges = rd_merges_or_rd_sec; + diskstat->has_read_ticks = true; + diskstat->read_ticks = rd_ticks_or_wr_sec; + diskstat->has_write_ios = true; + diskstat->write_ios = wr_ios; + diskstat->has_write_sectors = true; + diskstat->write_sectors = wr_sec; + diskstat->has_write_merges = true; + diskstat->write_merges = wr_merges; + diskstat->has_write_ticks = true; + diskstat->write_ticks = wr_ticks; + diskstat->has_ios_pgr = true; + diskstat->ios_pgr = ios_pgr; + diskstat->has_total_ticks = true; + diskstat->total_ticks = tot_ticks; + diskstat->has_weight_ticks = true; + diskstat->weight_ticks = rq_ticks; + } + if (i >= 18) { + diskstat->has_discard_ios = true; + diskstat->discard_ios = dc_ios; + diskstat->has_discard_merges = true; + diskstat->discard_merges = dc_merges; + diskstat->has_discard_sectors = true; + diskstat->discard_sectors = dc_sec; + diskstat->has_discard_ticks = true; + diskstat->discard_ticks = dc_ticks; + } + if (i >= 20) { + diskstat->has_flush_ios = true; + diskstat->flush_ios = fl_ios; + diskstat->has_flush_ticks = true; + diskstat->flush_ticks = fl_ticks; + } + + diskstatinfo->stats = g_steal_pointer(&diskstat); + QAPI_LIST_APPEND(tail, diskstatinfo); + diskstatinfo = NULL; + } + free(line); + fclose(fp); + return head; +} + +GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp) +{ + return guest_get_diskstats(errp); +} + +GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) +{ + GuestCpuStatsList *head = NULL, **tail = &head; + const char *cpustats = "/proc/stat"; + int clk_tck = sysconf(_SC_CLK_TCK); + FILE *fp; + size_t n; + char *line = NULL; + + fp = fopen(cpustats, "r"); + if (fp == NULL) { + error_setg_errno(errp, errno, "open(\"%s\")", cpustats); + return NULL; + } + + while (getline(&line, &n, fp) != -1) { + GuestCpuStats *cpustat = NULL; + GuestLinuxCpuStats *linuxcpustat; + int i; + unsigned long user, system, idle, iowait, irq, softirq, steal, guest; + unsigned long nice, guest_nice; + char name[64]; + + i = sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", + name, &user, &nice, &system, &idle, &iowait, &irq, &softirq, + &steal, &guest, &guest_nice); + + /* drop "cpu 1 2 3 ...", get "cpuX 1 2 3 ..." only */ + if ((i == EOF) || strncmp(name, "cpu", 3) || (name[3] == '\0')) { + continue; + } + + if (i < 5) { + slog("Parsing cpu stat from %s failed, see \"man proc\"", cpustats); + break; + } + + cpustat = g_new0(GuestCpuStats, 1); + cpustat->type = GUEST_CPU_STATS_TYPE_LINUX; + + linuxcpustat = &cpustat->u.q_linux; + linuxcpustat->cpu = atoi(&name[3]); + linuxcpustat->user = user * 1000 / clk_tck; + linuxcpustat->nice = nice * 1000 / clk_tck; + linuxcpustat->system = system * 1000 / clk_tck; + linuxcpustat->idle = idle * 1000 / clk_tck; + + if (i > 5) { + linuxcpustat->has_iowait = true; + linuxcpustat->iowait = iowait * 1000 / clk_tck; + } + + if (i > 6) { + linuxcpustat->has_irq = true; + linuxcpustat->irq = irq * 1000 / clk_tck; + linuxcpustat->has_softirq = true; + linuxcpustat->softirq = softirq * 1000 / clk_tck; + } + + if (i > 8) { + linuxcpustat->has_steal = true; + linuxcpustat->steal = steal * 1000 / clk_tck; + } + + if (i > 9) { + linuxcpustat->has_guest = true; + linuxcpustat->guest = guest * 1000 / clk_tck; + } + + if (i > 10) { + linuxcpustat->has_guest = true; + linuxcpustat->guest = guest * 1000 / clk_tck; + linuxcpustat->has_guestnice = true; + linuxcpustat->guestnice = guest_nice * 1000 / clk_tck; + } + + QAPI_LIST_APPEND(tail, cpustat); + } + + free(line); + fclose(fp); + return head; +} diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 98aafc45f3..5da60e65ab 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1195,205 +1195,6 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_info(Error **errp) return info; } -#define MAX_NAME_LEN 128 -static GuestDiskStatsInfoList *guest_get_diskstats(Error **errp) -{ -#ifdef CONFIG_LINUX - GuestDiskStatsInfoList *head = NULL, **tail = &head; - const char *diskstats = "/proc/diskstats"; - FILE *fp; - size_t n; - char *line = NULL; - - fp = fopen(diskstats, "r"); - if (fp == NULL) { - error_setg_errno(errp, errno, "open(\"%s\")", diskstats); - return NULL; - } - - while (getline(&line, &n, fp) != -1) { - g_autofree GuestDiskStatsInfo *diskstatinfo = NULL; - g_autofree GuestDiskStats *diskstat = NULL; - char dev_name[MAX_NAME_LEN]; - unsigned int ios_pgr, tot_ticks, rq_ticks, wr_ticks, dc_ticks, fl_ticks; - unsigned long rd_ios, rd_merges_or_rd_sec, rd_ticks_or_wr_sec, wr_ios; - unsigned long wr_merges, rd_sec_or_wr_ios, wr_sec; - unsigned long dc_ios, dc_merges, dc_sec, fl_ios; - unsigned int major, minor; - int i; - - i = sscanf(line, "%u %u %s %lu %lu %lu" - "%lu %lu %lu %lu %u %u %u %u" - "%lu %lu %lu %u %lu %u", - &major, &minor, dev_name, - &rd_ios, &rd_merges_or_rd_sec, &rd_sec_or_wr_ios, - &rd_ticks_or_wr_sec, &wr_ios, &wr_merges, &wr_sec, - &wr_ticks, &ios_pgr, &tot_ticks, &rq_ticks, - &dc_ios, &dc_merges, &dc_sec, &dc_ticks, - &fl_ios, &fl_ticks); - - if (i < 7) { - continue; - } - - diskstatinfo = g_new0(GuestDiskStatsInfo, 1); - diskstatinfo->name = g_strdup(dev_name); - diskstatinfo->major = major; - diskstatinfo->minor = minor; - - diskstat = g_new0(GuestDiskStats, 1); - if (i == 7) { - diskstat->has_read_ios = true; - diskstat->read_ios = rd_ios; - diskstat->has_read_sectors = true; - diskstat->read_sectors = rd_merges_or_rd_sec; - diskstat->has_write_ios = true; - diskstat->write_ios = rd_sec_or_wr_ios; - diskstat->has_write_sectors = true; - diskstat->write_sectors = rd_ticks_or_wr_sec; - } - if (i >= 14) { - diskstat->has_read_ios = true; - diskstat->read_ios = rd_ios; - diskstat->has_read_sectors = true; - diskstat->read_sectors = rd_sec_or_wr_ios; - diskstat->has_read_merges = true; - diskstat->read_merges = rd_merges_or_rd_sec; - diskstat->has_read_ticks = true; - diskstat->read_ticks = rd_ticks_or_wr_sec; - diskstat->has_write_ios = true; - diskstat->write_ios = wr_ios; - diskstat->has_write_sectors = true; - diskstat->write_sectors = wr_sec; - diskstat->has_write_merges = true; - diskstat->write_merges = wr_merges; - diskstat->has_write_ticks = true; - diskstat->write_ticks = wr_ticks; - diskstat->has_ios_pgr = true; - diskstat->ios_pgr = ios_pgr; - diskstat->has_total_ticks = true; - diskstat->total_ticks = tot_ticks; - diskstat->has_weight_ticks = true; - diskstat->weight_ticks = rq_ticks; - } - if (i >= 18) { - diskstat->has_discard_ios = true; - diskstat->discard_ios = dc_ios; - diskstat->has_discard_merges = true; - diskstat->discard_merges = dc_merges; - diskstat->has_discard_sectors = true; - diskstat->discard_sectors = dc_sec; - diskstat->has_discard_ticks = true; - diskstat->discard_ticks = dc_ticks; - } - if (i >= 20) { - diskstat->has_flush_ios = true; - diskstat->flush_ios = fl_ios; - diskstat->has_flush_ticks = true; - diskstat->flush_ticks = fl_ticks; - } - - diskstatinfo->stats = g_steal_pointer(&diskstat); - QAPI_LIST_APPEND(tail, diskstatinfo); - diskstatinfo = NULL; - } - free(line); - fclose(fp); - return head; -#else - g_debug("disk stats reporting available only for Linux"); - return NULL; -#endif -} - -GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp) -{ - return guest_get_diskstats(errp); -} - -GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) -{ - GuestCpuStatsList *head = NULL, **tail = &head; - const char *cpustats = "/proc/stat"; - int clk_tck = sysconf(_SC_CLK_TCK); - FILE *fp; - size_t n; - char *line = NULL; - - fp = fopen(cpustats, "r"); - if (fp == NULL) { - error_setg_errno(errp, errno, "open(\"%s\")", cpustats); - return NULL; - } - - while (getline(&line, &n, fp) != -1) { - GuestCpuStats *cpustat = NULL; - GuestLinuxCpuStats *linuxcpustat; - int i; - unsigned long user, system, idle, iowait, irq, softirq, steal, guest; - unsigned long nice, guest_nice; - char name[64]; - - i = sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", - name, &user, &nice, &system, &idle, &iowait, &irq, &softirq, - &steal, &guest, &guest_nice); - - /* drop "cpu 1 2 3 ...", get "cpuX 1 2 3 ..." only */ - if ((i == EOF) || strncmp(name, "cpu", 3) || (name[3] == '\0')) { - continue; - } - - if (i < 5) { - slog("Parsing cpu stat from %s failed, see \"man proc\"", cpustats); - break; - } - - cpustat = g_new0(GuestCpuStats, 1); - cpustat->type = GUEST_CPU_STATS_TYPE_LINUX; - - linuxcpustat = &cpustat->u.q_linux; - linuxcpustat->cpu = atoi(&name[3]); - linuxcpustat->user = user * 1000 / clk_tck; - linuxcpustat->nice = nice * 1000 / clk_tck; - linuxcpustat->system = system * 1000 / clk_tck; - linuxcpustat->idle = idle * 1000 / clk_tck; - - if (i > 5) { - linuxcpustat->has_iowait = true; - linuxcpustat->iowait = iowait * 1000 / clk_tck; - } - - if (i > 6) { - linuxcpustat->has_irq = true; - linuxcpustat->irq = irq * 1000 / clk_tck; - linuxcpustat->has_softirq = true; - linuxcpustat->softirq = softirq * 1000 / clk_tck; - } - - if (i > 8) { - linuxcpustat->has_steal = true; - linuxcpustat->steal = steal * 1000 / clk_tck; - } - - if (i > 9) { - linuxcpustat->has_guest = true; - linuxcpustat->guest = guest * 1000 / clk_tck; - } - - if (i > 10) { - linuxcpustat->has_guest = true; - linuxcpustat->guest = guest * 1000 / clk_tck; - linuxcpustat->has_guestnice = true; - linuxcpustat->guestnice = guest_nice * 1000 / clk_tck; - } - - QAPI_LIST_APPEND(tail, cpustat); - } - - free(line); - fclose(fp); - return head; -} #else /* defined(__linux__) */
The qmp_guest_{diskstats,cpustats} command impls in commands-posix.c are surrounded by '#ifdef __linux__' so should instead live in commands-linux.c This also removes a "#ifdef CONFIG_LINUX" that was nested inside a "#ifdef __linux__". Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- qga/commands-linux.c | 195 ++++++++++++++++++++++++++++++++++++++++++ qga/commands-posix.c | 199 ------------------------------------------- 2 files changed, 195 insertions(+), 199 deletions(-)