From nobody Thu Nov 28 12:44:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1670947550; cv=none; d=zohomail.com; s=zohoarc; b=KzpqcqpUs+7oki2uU7i0EY/YlQglDnk2NLADosSollvP/vYNo5A2T2w4QJJz0TvM7NF2HsAQKGK2FkgtKWt3LQEHKSx4MVnY8uv3MjcUIOJCtz2hmyQ1o9W0WXKxHTa3TOwCe4nc4lRF4rTUX/HA962GMZhoqZbPbdO68BinY70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670947550; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BJICrHCD5+EtD6cNAuaLcaHoi3Y4QOxd31Quuffyc8E=; b=bXExYRs41YQlgf5dCMC5IVcyOT3GJq1J4v9R5JabpPVshITEiJlO9SdpsTbNwOwsg+KANIyW5/IZ6hBXwfe7fUX8W/S659ER9yzAu1gGuolc1FCYKO2kZ/Us4Dh6pZXumu9sHOI8r0XW8k7ccoGXP5POhUTXYeogYJHMKP2/Av4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1670947550396350.207817279775; Tue, 13 Dec 2022 08:05:50 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.460765.718777 (Exim 4.92) (envelope-from ) id 1p57mD-0005lr-Gv; Tue, 13 Dec 2022 16:05:05 +0000 Received: by outflank-mailman (output) from mailman id 460765.718777; Tue, 13 Dec 2022 16:05:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p57mD-0005kB-5d; Tue, 13 Dec 2022 16:05:05 +0000 Received: by outflank-mailman (input) for mailman id 460765; Tue, 13 Dec 2022 16:05:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1p57jR-0001ta-0E for xen-devel@lists.xenproject.org; Tue, 13 Dec 2022 16:02:13 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 80f8ebc9-7aff-11ed-8fd2-01056ac49cbb; Tue, 13 Dec 2022 17:02:11 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A0F6722A34; Tue, 13 Dec 2022 16:02:11 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 742AE138EE; Tue, 13 Dec 2022 16:02:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EqsSGwOimGM2KgAAMHmgww (envelope-from ); Tue, 13 Dec 2022 16:02:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 80f8ebc9-7aff-11ed-8fd2-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1670947331; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BJICrHCD5+EtD6cNAuaLcaHoi3Y4QOxd31Quuffyc8E=; b=GqD+LIQOdzjfPC+SDpaoeScwTRXqeXlaTeTo3jIXIIGlgjSllpCFIXnnyALYgu8nW1LIOo +I3fmyO5fITcT1Rr7/Rv4QkxwJh5B96BmNvGZ9A9O4nP9MtolW/sfwy8cjUklUwmzIybdl inD6R03sVrbzSs/j2lzy2nCbUXlcDik= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH v2 15/19] tools/xenstore: switch hashtable to use the talloc framework Date: Tue, 13 Dec 2022 17:00:41 +0100 Message-Id: <20221213160045.28170-16-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221213160045.28170-1-jgross@suse.com> References: <20221213160045.28170-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1670947551350100001 Content-Type: text/plain; charset="utf-8" Instead of using malloc() and friends, let the hashtable implementation use the talloc framework. This is more consistent with the rest of xenstored and it allows to track memory usage via "xenstore-control memreport". Signed-off-by: Juergen Gross --- tools/xenstore/hashtable.c | 86 ++++++++++++------------------- tools/xenstore/hashtable.h | 3 +- tools/xenstore/xenstored_core.c | 5 +- tools/xenstore/xenstored_domain.c | 2 +- 4 files changed, 39 insertions(+), 57 deletions(-) diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index 299549c51e..3b6745b692 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -6,6 +6,8 @@ #include #include #include +#include +#include "talloc.h" =20 struct entry { @@ -50,7 +52,7 @@ indexFor(unsigned int tablelength, unsigned int hashvalue= ) { =20 /*************************************************************************= ****/ struct hashtable * -create_hashtable(unsigned int minsize, +create_hashtable(const void *ctx, unsigned int minsize, unsigned int (*hashf) (void*), int (*eqf) (void*,void*), unsigned int flags) @@ -66,10 +68,10 @@ create_hashtable(unsigned int minsize, if (primes[pindex] > minsize) { size =3D primes[pindex]; break; } } =20 - h =3D (struct hashtable *)calloc(1, sizeof(struct hashtable)); + h =3D talloc_zero(ctx, struct hashtable); if (NULL =3D=3D h) goto err0; - h->table =3D (struct entry **)calloc(size, sizeof(struct entry *)); + h->table =3D talloc_zero_array(h, struct entry *, size); if (NULL =3D=3D h->table) goto err1; =20 @@ -83,7 +85,7 @@ create_hashtable(unsigned int minsize, return h; =20 err1: - free(h); + talloc_free(h); err0: return NULL; } @@ -115,47 +117,32 @@ hashtable_expand(struct hashtable *h) if (h->primeindex =3D=3D (prime_table_length - 1)) return 0; newsize =3D primes[++(h->primeindex)]; =20 - newtable =3D (struct entry **)calloc(newsize, sizeof(struct entry*)); - if (NULL !=3D newtable) + newtable =3D talloc_realloc(h, h->table, struct entry *, newsize); + if (!newtable) { - /* This algorithm is not 'stable'. ie. it reverses the list - * when it transfers entries between the tables */ - for (i =3D 0; i < h->tablelength; i++) { - while (NULL !=3D (e =3D h->table[i])) { - h->table[i] =3D e->next; - index =3D indexFor(newsize,e->h); + h->primeindex--; + return 0; + } + + h->table =3D newtable; + memset(newtable + h->tablelength, 0, + (newsize - h->tablelength) * sizeof(*newtable)); + for (i =3D 0; i < h->tablelength; i++) { + for (pE =3D &(newtable[i]), e =3D *pE; e !=3D NULL; e =3D *pE) { + index =3D indexFor(newsize,e->h); + if (index =3D=3D i) + { + pE =3D &(e->next); + } + else + { + *pE =3D e->next; e->next =3D newtable[index]; newtable[index] =3D e; } } - free(h->table); - h->table =3D newtable; - } - /* Plan B: realloc instead */ - else=20 - { - newtable =3D (struct entry **) - realloc(h->table, newsize * sizeof(struct entry *)); - if (NULL =3D=3D newtable) { (h->primeindex)--; return 0; } - h->table =3D newtable; - memset(newtable + h->tablelength, 0, - (newsize - h->tablelength) * sizeof(*newtable)); - for (i =3D 0; i < h->tablelength; i++) { - for (pE =3D &(newtable[i]), e =3D *pE; e !=3D NULL; e =3D *pE)= { - index =3D indexFor(newsize,e->h); - if (index =3D=3D i) - { - pE =3D &(e->next); - } - else - { - *pE =3D e->next; - e->next =3D newtable[index]; - newtable[index] =3D e; - } - } - } } + h->tablelength =3D newsize; h->loadlimit =3D (unsigned int) (((uint64_t)newsize * max_load_factor) / 100); @@ -184,7 +171,7 @@ hashtable_insert(struct hashtable *h, void *k, void *v) * element may be ok. Next time we insert, we'll try expanding aga= in.*/ hashtable_expand(h); } - e =3D (struct entry *)calloc(1, sizeof(struct entry)); + e =3D talloc_zero(h, struct entry); if (NULL =3D=3D e) { --(h->entrycount); return 0; } /*oom*/ e->h =3D hash(h,k); index =3D indexFor(h->tablelength,e->h); @@ -238,8 +225,8 @@ hashtable_remove(struct hashtable *h, void *k) h->entrycount--; v =3D e->v; if (h->flags & HASHTABLE_FREE_KEY) - free(e->k); - free(e); + talloc_free(e->k); + talloc_free(e); return v; } pE =3D &(e->next); @@ -280,25 +267,20 @@ void hashtable_destroy(struct hashtable *h) { unsigned int i; - struct entry *e, *f; + struct entry *e; struct entry **table =3D h->table; =20 for (i =3D 0; i < h->tablelength; i++) { - e =3D table[i]; - while (NULL !=3D e) + for (e =3D table[i]; e; e =3D e->next) { - f =3D e; - e =3D e->next; if (h->flags & HASHTABLE_FREE_KEY) - free(f->k); + talloc_free(e->k); if (h->flags & HASHTABLE_FREE_VALUE) - free(f->v); - free(f); + talloc_free(e->v); } } - free(h->table); - free(h); + talloc_free(h); } =20 /* diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 6d65431f96..becec73092 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -9,6 +9,7 @@ struct hashtable; * create_hashtable =20 * @name create_hashtable + * @param ctx talloc context to use for allocations * @param minsize minimum initial size of hashtable * @param hashfunction function for hashing keys * @param key_eq_fn function for determining key equality @@ -22,7 +23,7 @@ struct hashtable; #define HASHTABLE_FREE_KEY (1U << 1) =20 struct hashtable * -create_hashtable(unsigned int minsize, +create_hashtable(const void *ctx, unsigned int minsize, unsigned int (*hashfunction) (void*), int (*key_eq_fn) (void*,void*), unsigned int flags diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_cor= e.c index 6c9d22b8a2..60433265ed 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2419,11 +2419,10 @@ static int keys_equal_fn(void *key1, void *key2) =20 int remember_string(struct hashtable *hash, const char *str) { - char *k =3D malloc(strlen(str) + 1); + char *k =3D talloc_strdup(NULL, str); =20 if (!k) return 0; - strcpy(k, str); return hashtable_insert(hash, k, (void *)1); } =20 @@ -2518,7 +2517,7 @@ void check_store(void) }; =20 /* Don't free values (they are all void *1) */ - reachable =3D create_hashtable(16, hash_from_key_fn, keys_equal_fn, + reachable =3D create_hashtable(NULL, 16, hash_from_key_fn, keys_equal_fn, HASHTABLE_FREE_KEY); if (!reachable) { log("check_store: ENOMEM"); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_d= omain.c index 65e94e3822..4d735a5951 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -929,7 +929,7 @@ void domain_init(int evtfd) int rc; =20 /* Start with a random rather low domain count for the hashtable. */ - domhash =3D create_hashtable(8, domhash_fn, domeq_fn, 0); + domhash =3D create_hashtable(NULL, 8, domhash_fn, domeq_fn, 0); if (!domhash) barf_perror("Failed to allocate domain hashtable"); =20 --=20 2.35.3