From nobody Sun Feb 8 18:10:42 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 1537285642990205.59327006470915; Tue, 18 Sep 2018 08:47:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B8D73091D66; Tue, 18 Sep 2018 15:47:20 +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 3B4E37A429; Tue, 18 Sep 2018 15:47:20 +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 B2861181A13B; Tue, 18 Sep 2018 15:47:19 +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 w8IFkitn012519 for ; Tue, 18 Sep 2018 11:46:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id D757D5D9C7; Tue, 18 Sep 2018 15:46:44 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C90982AE1 for ; Tue, 18 Sep 2018 15:46:41 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 18 Sep 2018 17:45:52 +0200 Message-Id: <96ecfb103999db3c222e3e20dc10cb7fc21d8290.1537285203.git.phrdina@redhat.com> 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 31/47] vircgroup: extract virCgroupV1GetMemoryUsage 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 18 Sep 2018 15:47:21 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: Fabiano Fid=C3=AAncio --- src/util/vircgroup.c | 9 +-------- src/util/vircgroupbackend.h | 5 +++++ src/util/vircgroupv1.c | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 22db0a4bf1..1229959300 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1639,14 +1639,7 @@ virCgroupGetMemoryStat(virCgroupPtr group, int virCgroupGetMemoryUsage(virCgroupPtr group, unsigned long *kb) { - long long unsigned int usage_in_bytes; - int ret; - ret =3D virCgroupGetValueU64(group, - VIR_CGROUP_CONTROLLER_MEMORY, - "memory.usage_in_bytes", &usage_in_bytes); - if (ret =3D=3D 0) - *kb =3D (unsigned long) usage_in_bytes >> 10; - return ret; + VIR_CGROUP_BACKEND_CALL(group, getMemoryUsage, -1, kb); } =20 =20 diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index 5ccda8e044..672fb082c1 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -215,6 +215,10 @@ typedef int unsigned long long *inactiveFile, unsigned long long *unevictable); =20 +typedef int +(*virCgroupGetMemoryUsageCB)(virCgroupPtr group, + unsigned long *kb); + struct _virCgroupBackend { virCgroupBackendType type; =20 @@ -256,6 +260,7 @@ struct _virCgroupBackend { =20 virCgroupSetMemoryCB setMemory; virCgroupGetMemoryStatCB getMemoryStat; + virCgroupGetMemoryUsageCB getMemoryUsage; }; typedef struct _virCgroupBackend virCgroupBackend; typedef virCgroupBackend *virCgroupBackendPtr; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index cfe29649fb..7abb137b81 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1473,6 +1473,21 @@ virCgroupV1GetMemoryStat(virCgroupPtr group, } =20 =20 +static int +virCgroupV1GetMemoryUsage(virCgroupPtr group, + unsigned long *kb) +{ + long long unsigned int usage_in_bytes; + int ret; + ret =3D virCgroupGetValueU64(group, + VIR_CGROUP_CONTROLLER_MEMORY, + "memory.usage_in_bytes", &usage_in_bytes); + if (ret =3D=3D 0) + *kb =3D (unsigned long) usage_in_bytes >> 10; + return ret; +} + + virCgroupBackend virCgroupV1Backend =3D { .type =3D VIR_CGROUP_BACKEND_TYPE_V1, =20 @@ -1512,6 +1527,7 @@ virCgroupBackend virCgroupV1Backend =3D { =20 .setMemory =3D virCgroupV1SetMemory, .getMemoryStat =3D virCgroupV1GetMemoryStat, + .getMemoryUsage =3D virCgroupV1GetMemoryUsage, }; =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list