On Tue, Sep 18, 2018 at 5:45 PM, Pavel Hrdina <phrdina@redhat.com> wrote:
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
>
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
> ---
> src/util/vircgroup.c | 34 ++-----------------------
> src/util/vircgroupbackend.h | 12 +++++++++
> src/util/vircgroupv1.c | 50 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 64 insertions(+), 32 deletions(-)
>
> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
> index 3fa8aebe04..08b8387fba 100644
> --- a/src/util/vircgroup.c
> +++ b/src/util/vircgroup.c
> @@ -1421,19 +1421,7 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
> const char *path,
> unsigned long long rbps)
> {
> - VIR_AUTOFREE(char *) str = NULL;
> - VIR_AUTOFREE(char *) blkstr = NULL;
> -
> - if (!(blkstr = virCgroupGetBlockDevString(path)))
> - return -1;
> -
> - if (virAsprintf(&str, "%s%llu", blkstr, rbps) < 0)
> - return -1;
> -
> - return virCgroupSetValueStr(group,
> - VIR_CGROUP_CONTROLLER_BLKIO,
> - "blkio.throttle.read_bps_device",
> - str);
> + VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceReadBps, -1, path, rbps);
> }
>
> /**
> @@ -1527,25 +1515,7 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
> const char *path,
> unsigned long long *rbps)
> {
> - VIR_AUTOFREE(char *) str = NULL;
> -
> - if (virCgroupGetValueForBlkDev(group,
> - VIR_CGROUP_CONTROLLER_BLKIO,
> - "blkio.throttle.read_bps_device",
> - path,
> - &str) < 0)
> - return -1;
> -
> - if (!str) {
> - *rbps = 0;
> - } else if (virStrToLong_ull(str, NULL, 10, rbps) < 0) {
> - virReportError(VIR_ERR_INTERNAL_ERROR,
> - _("Unable to parse '%s' as an integer"),
> - str);
> - return -1;
> - }
> -
> - return 0;
> + VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceReadBps, -1, path, rbps);
> }
>
> /**
> diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
> index e19a3820bf..3ec9a95327 100644
> --- a/src/util/vircgroupbackend.h
> +++ b/src/util/vircgroupbackend.h
> @@ -182,6 +182,16 @@ typedef int
> const char *path,
> unsigned int *wiops);
>
> +typedef int
> +(*virCgroupSetBlkioDeviceReadBpsCB)(virCgroupPtr group,
> + const char *path,
> + unsigned long long rbps);
> +
> +typedef int
> +(*virCgroupGetBlkioDeviceReadBpsCB)(virCgroupPtr group,
> + const char *path,
> + unsigned long long *rbps);
> +
> struct _virCgroupBackend {
> virCgroupBackendType type;
>
> @@ -216,6 +226,8 @@ struct _virCgroupBackend {
> virCgroupGetBlkioDeviceReadIopsCB getBlkioDeviceReadIops;
> virCgroupSetBlkioDeviceWriteIopsCB setBlkioDeviceWriteIops;
> virCgroupGetBlkioDeviceWriteIopsCB getBlkioDeviceWriteIops;
> + virCgroupSetBlkioDeviceReadBpsCB setBlkioDeviceReadBps;
> + virCgroupGetBlkioDeviceReadBpsCB getBlkioDeviceReadBps;
> };
> typedef struct _virCgroupBackend virCgroupBackend;
> typedef virCgroupBackend *virCgroupBackendPtr;
> diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
> index feeefc287d..2c19e6147a 100644
> --- a/src/util/vircgroupv1.c
> +++ b/src/util/vircgroupv1.c
> @@ -1281,6 +1281,54 @@ virCgroupV1GetBlkioDeviceWriteIops(virCgroupPtr
> group,
> }
>
>
> +static int
> +virCgroupV1SetBlkioDeviceReadBps(virCgroupPtr group,
> + const char *path,
> + unsigned long long rbps)
> +{
> + VIR_AUTOFREE(char *) str = NULL;
> + VIR_AUTOFREE(char *) blkstr = NULL;
> +
> + if (!(blkstr = virCgroupGetBlockDevString(path)))
> + return -1;
> +
> + if (virAsprintf(&str, "%s%llu", blkstr, rbps) < 0)
> + return -1;
> +
> + return virCgroupSetValueStr(group,
> + VIR_CGROUP_CONTROLLER_BLKIO,
> + "blkio.throttle.read_bps_device",
> + str);
> +}
> +
> +
> +static int
> +virCgroupV1GetBlkioDeviceReadBps(virCgroupPtr group,
> + const char *path,
> + unsigned long long *rbps)
> +{
> + VIR_AUTOFREE(char *) str = NULL;
> +
> + if (virCgroupGetValueForBlkDev(group,
> + VIR_CGROUP_CONTROLLER_BLKIO,
> + "blkio.throttle.read_bps_device",
> + path,
> + &str) < 0)
> + return -1;
> +
> + if (!str) {
> + *rbps = 0;
> + } else if (virStrToLong_ull(str, NULL, 10, rbps) < 0) {
> + virReportError(VIR_ERR_INTERNAL_ERROR,
> + _("Unable to parse '%s' as an integer"),
> + str);
> + return -1;
> + }
> +
> + return 0;
> +}
> +
> +
> virCgroupBackend virCgroupV1Backend = {
> .type = VIR_CGROUP_BACKEND_TYPE_V1,
>
> @@ -1313,6 +1361,8 @@ virCgroupBackend virCgroupV1Backend = {
> .getBlkioDeviceReadIops = virCgroupV1GetBlkioDeviceReadIops,
> .setBlkioDeviceWriteIops = virCgroupV1SetBlkioDeviceWriteIops,
> .getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWriteIops,
> + .setBlkioDeviceReadBps = virCgroupV1SetBlkioDeviceReadBps,
> + .getBlkioDeviceReadBps = virCgroupV1GetBlkioDeviceReadBps,
> };
>
>
> --
> 2.17.1
>
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list