From nobody Sun Dec 22 05:24:29 2024 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 1534237699477959.2400529265025; Tue, 14 Aug 2018 02:08:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C22D333B9; Tue, 14 Aug 2018 09:08:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 52A5670BAA; Tue, 14 Aug 2018 09:08:17 +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 E40993FCC2; Tue, 14 Aug 2018 09:08:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7E9841v023449 for ; Tue, 14 Aug 2018 05:08:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3EE002022EA0; Tue, 14 Aug 2018 09:08:04 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0D052026D7E for ; Tue, 14 Aug 2018 09:08:03 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 14 Aug 2018 11:07:53 +0200 Message-Id: <20180814090756.20432-5-abologna@redhat.com> In-Reply-To: <20180814090756.20432-1-abologna@redhat.com> References: <20180814090756.20432-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/7] util: Rewrite virHostCPUCountThreadSiblings() 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 14 Aug 2018 09:08:18 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We already have a function which parses thread_siblings_list for a CPU and returns the corresponding bitmap, and a bunch of utility functions that perform operations on bitmaps such as counting the number of set bits: use those to implement the function instead of having an additional ad-hoc parser for thread_siblings. Signed-off-by: Andrea Bolognani --- src/util/virhostcpu.c | 45 +++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c260d603a9..6e79445abc 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -200,35 +200,6 @@ virHostCPUGetStatsFreeBSD(int cpuNum, =20 # define LINUX_NB_CPU_STATS 4 =20 - -static unsigned long -virHostCPUCountThreadSiblings(unsigned int cpu) -{ - unsigned long ret =3D 0; - int rv =3D -1; - char *str =3D NULL; - size_t i; - - rv =3D virFileReadValueString(&str, - "%s/cpu/cpu%u/topology/thread_siblings", - SYSFS_SYSTEM_PATH, cpu); - if (rv =3D=3D -2) { - ret =3D 1; - goto cleanup; - } - if (rv < 0) - goto cleanup; - - for (i =3D 0; str[i] !=3D '\0'; i++) { - if (c_isxdigit(str[i])) - ret +=3D count_one_bits(virHexToBin(str[i])); - } - - cleanup: - VIR_FREE(str); - return ret; -} - int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket) { @@ -289,6 +260,22 @@ virHostCPUGetSiblingsList(unsigned int cpu) return ret; } =20 +static unsigned long +virHostCPUCountThreadSiblings(unsigned int cpu) +{ + virBitmapPtr siblings_map; + unsigned long ret =3D 0; + + if (!(siblings_map =3D virHostCPUGetSiblingsList(cpu))) + goto cleanup; + + ret =3D virBitmapCountBits(siblings_map); + + cleanup: + virBitmapFree(siblings_map); + return ret; +} + /* parses a node entry, returning number of processors in the node and * filling arguments */ static int --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list