From nobody Sun Feb 8 19:03:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1537285627681241.87481668115583; Tue, 18 Sep 2018 08:47:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 90326CF3C; Tue, 18 Sep 2018 15:47:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C5107EED8; Tue, 18 Sep 2018 15:47:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B1B25181A12F; Tue, 18 Sep 2018 15:47:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8IFkYUj012414 for ; Tue, 18 Sep 2018 11:46:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 71A9B5D9C7; Tue, 18 Sep 2018 15:46:34 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id E905C82AD3 for ; Tue, 18 Sep 2018 15:46:33 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 18 Sep 2018 17:45:43 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 22/47] vircgroup: extract virCgroupV1GetBlkioIoServiced X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 18 Sep 2018 15:47:06 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/util/vircgroup.c | 87 ++-------------------------------- src/util/vircgroupbackend.h | 8 ++++ src/util/vircgroupv1.c | 94 +++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 84 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index cb9f03d488..a9b67f7d53 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1313,90 +1313,9 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group, long long *requests_read, long long *requests_write) { - long long stats_val; - VIR_AUTOFREE(char *) str1 =3D NULL; - VIR_AUTOFREE(char *) str2 =3D NULL; - char *p1 =3D NULL; - char *p2 =3D NULL; - size_t i; - - const char *value_names[] =3D { - "Read ", - "Write " - }; - long long *bytes_ptrs[] =3D { - bytes_read, - bytes_write - }; - long long *requests_ptrs[] =3D { - requests_read, - requests_write - }; - - *bytes_read =3D 0; - *bytes_write =3D 0; - *requests_read =3D 0; - *requests_write =3D 0; - - if (virCgroupGetValueStr(group, - VIR_CGROUP_CONTROLLER_BLKIO, - "blkio.throttle.io_service_bytes", &str1) < 0) - return -1; - - if (virCgroupGetValueStr(group, - VIR_CGROUP_CONTROLLER_BLKIO, - "blkio.throttle.io_serviced", &str2) < 0) - return -1; - - /* sum up all entries of the same kind, from all devices */ - for (i =3D 0; i < ARRAY_CARDINALITY(value_names); i++) { - p1 =3D str1; - p2 =3D str2; - - while ((p1 =3D strstr(p1, value_names[i]))) { - p1 +=3D strlen(value_names[i]); - if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse byte %sstat '%s'"), - value_names[i], - p1); - return -1; - } - - if (stats_val < 0 || - (stats_val > 0 && *bytes_ptrs[i] > (LLONG_MAX - stats_val)= )) - { - virReportError(VIR_ERR_OVERFLOW, - _("Sum of byte %sstat overflows"), - value_names[i]); - return -1; - } - *bytes_ptrs[i] +=3D stats_val; - } - - while ((p2 =3D strstr(p2, value_names[i]))) { - p2 +=3D strlen(value_names[i]); - if (virStrToLong_ll(p2, &p2, 10, &stats_val) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse %srequest stat '%s'"), - value_names[i], - p2); - return -1; - } - - if (stats_val < 0 || - (stats_val > 0 && *requests_ptrs[i] > (LLONG_MAX - stats_v= al))) - { - virReportError(VIR_ERR_OVERFLOW, - _("Sum of %srequest stat overflows"), - value_names[i]); - return -1; - } - *requests_ptrs[i] +=3D stats_val; - } - } - - return 0; + VIR_CGROUP_BACKEND_CALL(group, getBlkioIoServiced, -1, + bytes_read, bytes_write, + requests_read, requests_write); } =20 =20 diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index 2c42227297..90584947fd 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -137,6 +137,13 @@ typedef int (*virCgroupGetBlkioWeightCB)(virCgroupPtr group, unsigned int *weight); =20 +typedef int +(*virCgroupGetBlkioIoServicedCB)(virCgroupPtr group, + long long *bytes_read, + long long *bytes_write, + long long *requests_read, + long long *requests_write); + struct _virCgroupBackend { virCgroupBackendType type; =20 @@ -163,6 +170,7 @@ struct _virCgroupBackend { /* Optional cgroup controller specific callbacks. */ virCgroupSetBlkioWeightCB setBlkioWeight; virCgroupGetBlkioWeightCB getBlkioWeight; + virCgroupGetBlkioIoServicedCB getBlkioIoServiced; }; typedef struct _virCgroupBackend virCgroupBackend; typedef virCgroupBackend *virCgroupBackendPtr; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 380a310589..4b9c03830c 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -956,6 +956,99 @@ virCgroupV1GetBlkioWeight(virCgroupPtr group, } =20 =20 +static int +virCgroupV1GetBlkioIoServiced(virCgroupPtr group, + long long *bytes_read, + long long *bytes_write, + long long *requests_read, + long long *requests_write) +{ + long long stats_val; + VIR_AUTOFREE(char *) str1 =3D NULL; + VIR_AUTOFREE(char *) str2 =3D NULL; + char *p1, *p2; + size_t i; + + const char *value_names[] =3D { + "Read ", + "Write " + }; + long long *bytes_ptrs[] =3D { + bytes_read, + bytes_write + }; + long long *requests_ptrs[] =3D { + requests_read, + requests_write + }; + + *bytes_read =3D 0; + *bytes_write =3D 0; + *requests_read =3D 0; + *requests_write =3D 0; + + if (virCgroupGetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.io_service_bytes", &str1) < 0) + return -1; + + if (virCgroupGetValueStr(group, + VIR_CGROUP_CONTROLLER_BLKIO, + "blkio.throttle.io_serviced", &str2) < 0) + return -1; + + /* sum up all entries of the same kind, from all devices */ + for (i =3D 0; i < ARRAY_CARDINALITY(value_names); i++) { + p1 =3D str1; + p2 =3D str2; + + while ((p1 =3D strstr(p1, value_names[i]))) { + p1 +=3D strlen(value_names[i]); + if (virStrToLong_ll(p1, &p1, 10, &stats_val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse byte %sstat '%s'"), + value_names[i], + p1); + return -1; + } + + if (stats_val < 0 || + (stats_val > 0 && *bytes_ptrs[i] > (LLONG_MAX - stats_val)= )) + { + virReportError(VIR_ERR_OVERFLOW, + _("Sum of byte %sstat overflows"), + value_names[i]); + return -1; + } + *bytes_ptrs[i] +=3D stats_val; + } + + while ((p2 =3D strstr(p2, value_names[i]))) { + p2 +=3D strlen(value_names[i]); + if (virStrToLong_ll(p2, &p2, 10, &stats_val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse %srequest stat '%s'"), + value_names[i], + p2); + return -1; + } + + if (stats_val < 0 || + (stats_val > 0 && *requests_ptrs[i] > (LLONG_MAX - stats_v= al))) + { + virReportError(VIR_ERR_OVERFLOW, + _("Sum of %srequest stat overflows"), + value_names[i]); + return -1; + } + *requests_ptrs[i] +=3D stats_val; + } + } + + return 0; +} + + virCgroupBackend virCgroupV1Backend =3D { .type =3D VIR_CGROUP_BACKEND_TYPE_V1, =20 @@ -980,6 +1073,7 @@ virCgroupBackend virCgroupV1Backend =3D { =20 .setBlkioWeight =3D virCgroupV1SetBlkioWeight, .getBlkioWeight =3D virCgroupV1GetBlkioWeight, + .getBlkioIoServiced =3D virCgroupV1GetBlkioIoServiced, }; =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list