[libvirt] [PATCH 28/47] vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteBps

[Fabiano Fidêncio]

On Tue, Sep 18, 2018 at 5:45 PM, Pavel Hrdina <phrdina at redhat.com> wrote:

> Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
>

Reviewed-by: Fabiano Fidêncio <fidencio at 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 08b8387fba..ab50342dbb 100644
> --- a/src/util/vircgroup.c
> +++ b/src/util/vircgroup.c
> @@ -1437,19 +1437,7 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
>                                  const char *path,
>                                  unsigned long long wbps)
>  {
> -    VIR_AUTOFREE(char *) str = NULL;
> -    VIR_AUTOFREE(char *) blkstr = NULL;
> -
> -    if (!(blkstr = virCgroupGetBlockDevString(path)))
> -        return -1;
> -
> -    if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0)
> -        return -1;
> -
> -    return virCgroupSetValueStr(group,
> -                               VIR_CGROUP_CONTROLLER_BLKIO,
> -                               "blkio.throttle.write_bps_device",
> -                               str);
> +    VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWriteBps, -1, path,
> wbps);
>  }
>
>
> @@ -1531,25 +1519,7 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
>                                  const char *path,
>                                  unsigned long long *wbps)
>  {
> -    VIR_AUTOFREE(char *) str = NULL;
> -
> -    if (virCgroupGetValueForBlkDev(group,
> -                                   VIR_CGROUP_CONTROLLER_BLKIO,
> -                                   "blkio.throttle.write_bps_device",
> -                                   path,
> -                                   &str) < 0)
> -        return -1;
> -
> -    if (!str) {
> -        *wbps = 0;
> -    } else if (virStrToLong_ull(str, NULL, 10, wbps) < 0) {
> -        virReportError(VIR_ERR_INTERNAL_ERROR,
> -                       _("Unable to parse '%s' as an integer"),
> -                       str);
> -        return -1;
> -    }
> -
> -    return 0;
> +    VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWriteBps, -1, path,
> wbps);
>  }
>
>  /**
> diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h
> index 3ec9a95327..b59462d6ab 100644
> --- a/src/util/vircgroupbackend.h
> +++ b/src/util/vircgroupbackend.h
> @@ -192,6 +192,16 @@ typedef int
>                                      const char *path,
>                                      unsigned long long *rbps);
>
> +typedef int
> +(*virCgroupSetBlkioDeviceWriteBpsCB)(virCgroupPtr group,
> +                                     const char *path,
> +                                     unsigned long long wbps);
> +
> +typedef int
> +(*virCgroupGetBlkioDeviceWriteBpsCB)(virCgroupPtr group,
> +                                     const char *path,
> +                                     unsigned long long *wbps);
> +
>  struct _virCgroupBackend {
>      virCgroupBackendType type;
>
> @@ -228,6 +238,8 @@ struct _virCgroupBackend {
>      virCgroupGetBlkioDeviceWriteIopsCB getBlkioDeviceWriteIops;
>      virCgroupSetBlkioDeviceReadBpsCB setBlkioDeviceReadBps;
>      virCgroupGetBlkioDeviceReadBpsCB getBlkioDeviceReadBps;
> +    virCgroupSetBlkioDeviceWriteBpsCB setBlkioDeviceWriteBps;
> +    virCgroupGetBlkioDeviceWriteBpsCB getBlkioDeviceWriteBps;
>  };
>  typedef struct _virCgroupBackend virCgroupBackend;
>  typedef virCgroupBackend *virCgroupBackendPtr;
> diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
> index 2c19e6147a..4f6d20e31f 100644
> --- a/src/util/vircgroupv1.c
> +++ b/src/util/vircgroupv1.c
> @@ -1329,6 +1329,54 @@ virCgroupV1GetBlkioDeviceReadBps(virCgroupPtr
> group,
>  }
>
>
> +static int
> +virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group,
> +                                  const char *path,
> +                                  unsigned long long wbps)
> +{
> +    VIR_AUTOFREE(char *) str = NULL;
> +    VIR_AUTOFREE(char *) blkstr = NULL;
> +
> +    if (!(blkstr = virCgroupGetBlockDevString(path)))
> +        return -1;
> +
> +    if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0)
> +        return -1;
> +
> +    return virCgroupSetValueStr(group,
> +                                VIR_CGROUP_CONTROLLER_BLKIO,
> +                                "blkio.throttle.write_bps_device",
> +                                str);
> +}
> +
> +
> +static int
> +virCgroupV1GetBlkioDeviceWriteBps(virCgroupPtr group,
> +                                  const char *path,
> +                                  unsigned long long *wbps)
> +{
> +    VIR_AUTOFREE(char *) str = NULL;
> +
> +    if (virCgroupGetValueForBlkDev(group,
> +                                   VIR_CGROUP_CONTROLLER_BLKIO,
> +                                   "blkio.throttle.write_bps_device",
> +                                   path,
> +                                   &str) < 0)
> +        return -1;
> +
> +    if (!str) {
> +        *wbps = 0;
> +    } else if (virStrToLong_ull(str, NULL, 10, wbps) < 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,
>
> @@ -1363,6 +1411,8 @@ virCgroupBackend virCgroupV1Backend = {
>      .getBlkioDeviceWriteIops = virCgroupV1GetBlkioDeviceWriteIops,
>      .setBlkioDeviceReadBps = virCgroupV1SetBlkioDeviceReadBps,
>      .getBlkioDeviceReadBps = virCgroupV1GetBlkioDeviceReadBps,
> +    .setBlkioDeviceWriteBps = virCgroupV1SetBlkioDeviceWriteBps,
> +    .getBlkioDeviceWriteBps = virCgroupV1GetBlkioDeviceWriteBps,
>  };
>
>
> --
> 2.17.1
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180920/a2147da1/attachment-0001.htm>