From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C44CC7EE23 for ; Tue, 30 May 2023 08:54:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.540872.842970 (Exim 4.92) (envelope-from ) id 1q3v7p-0002X4-Jl; Tue, 30 May 2023 08:54:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 540872.842970; Tue, 30 May 2023 08:54:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1q3v7p-0002Wx-Gy; Tue, 30 May 2023 08:54:41 +0000 Received: by outflank-mailman (input) for mailman id 540872; Tue, 30 May 2023 08:54:40 +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 1q3v7o-00026J-1b for xen-devel@lists.xenproject.org; Tue, 30 May 2023 08:54:40 +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 9bacd9f4-fec7-11ed-8611-37d641c3527e; Tue, 30 May 2023 10:54:38 +0200 (CEST) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 2218621A40; Tue, 30 May 2023 08:54:38 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 imap1.suse-dmz.suse.de (Postfix) with ESMTPS id E8A4D1341B; Tue, 30 May 2023 08:54:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id g7lhN825dWRUGwAAGKfGzw (envelope-from ); Tue, 30 May 2023 08:54:37 +0000 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: 9bacd9f4-fec7-11ed-8611-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1685436878; 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=Cue6nfogHSgqt5dCa9QFdMWvkgXw8ctS0Aa/J6WXU5g=; b=qqjsGhpBHowB5V3YueMcW3BlkgUPW5ojafkELlWa5hJ9NhvwQ2JKtqqNZNGXR6LezdjgGV 5Wix1+G/kh7I1KgYJPPp1iAZ5fwlVXoVnUqM1FPVl6ooGEFB371Mbyv4tuv9mbhvHo/rBP +p2PCO4IN9PikCRhGelVsmq5PwgmuzQ= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Wei Liu , Julien Grall , Anthony PERARD Subject: [PATCH v3 03/16] tools/xenstore: modify interface of create_hashtable() Date: Tue, 30 May 2023 10:54:05 +0200 Message-Id: <20230530085418.5417-4-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230530085418.5417-1-jgross@suse.com> References: <20230530085418.5417-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The minsize parameter of create_hashtable() doesn't have any real use case for Xenstore, so drop it. For better talloc_report_full() diagnostic output add a name parameter to create_hashtable(). Signed-off-by: Juergen Gross --- V3: - make code more readable (Julien Grall) --- tools/xenstore/hashtable.c | 23 ++++++----------------- tools/xenstore/hashtable.h | 4 ++-- tools/xenstore/xenstored_core.c | 2 +- tools/xenstore/xenstored_domain.c | 4 ++-- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/tools/xenstore/hashtable.c b/tools/xenstore/hashtable.c index dc209158fa..3d2d3a0e22 100644 --- a/tools/xenstore/hashtable.c +++ b/tools/xenstore/hashtable.c @@ -55,39 +55,28 @@ static unsigned int loadlimit(unsigned int pindex) return ((uint64_t)primes[pindex] * MAX_LOAD_PERCENT) / 100; } -struct hashtable *create_hashtable(const void *ctx, unsigned int minsize, +struct hashtable *create_hashtable(const void *ctx, const char *name, unsigned int (*hashf) (const void *), int (*eqf) (const void *, const void *), unsigned int flags) { struct hashtable *h; - unsigned int pindex, size = primes[0]; - - /* Check requested hashtable isn't too large */ - if (minsize > (1u << 30)) return NULL; - - /* Enforce size as prime */ - for (pindex = 0; pindex < PRIME_TABLE_LEN; pindex++) { - if (primes[pindex] > minsize) { - size = primes[pindex]; - break; - } - } h = talloc_zero(ctx, struct hashtable); if (NULL == h) goto err0; - h->table = talloc_zero_array(h, struct entry *, size); + talloc_set_name_const(h, name); + h->table = talloc_zero_array(h, struct entry *, primes[0]); if (NULL == h->table) goto err1; - h->tablelength = size; + h->primeindex = 0; + h->tablelength = primes[h->primeindex]; h->flags = flags; - h->primeindex = pindex; h->entrycount = 0; h->hashfn = hashf; h->eqfn = eqf; - h->loadlimit = loadlimit(pindex); + h->loadlimit = loadlimit(h->primeindex); return h; err1: diff --git a/tools/xenstore/hashtable.h b/tools/xenstore/hashtable.h index 04310783b6..0e1a6f61c2 100644 --- a/tools/xenstore/hashtable.h +++ b/tools/xenstore/hashtable.h @@ -10,7 +10,7 @@ struct hashtable; * @name create_hashtable * @param ctx talloc context to use for allocations - * @param minsize minimum initial size of hashtable + * @param name talloc name of the hashtable * @param hashfunction function for hashing keys * @param key_eq_fn function for determining key equality * @param flags flags HASHTABLE_* @@ -23,7 +23,7 @@ struct hashtable; #define HASHTABLE_FREE_KEY (1U << 1) struct hashtable * -create_hashtable(const void *ctx, unsigned int minsize, +create_hashtable(const void *ctx, const char *name, unsigned int (*hashfunction) (const void *), int (*key_eq_fn) (const void *, const void *), unsigned int flags diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 22df395aac..418790d8d7 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2521,7 +2521,7 @@ void check_store(void) struct check_store_data data; /* Don't free values (they are all void *1) */ - data.reachable = create_hashtable(NULL, 16, hash_from_key_fn, + data.reachable = create_hashtable(NULL, "checkstore", hash_from_key_fn, keys_equal_fn, HASHTABLE_FREE_KEY); if (!data.reachable) { log("check_store: ENOMEM"); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index a641f633a5..a1c91ef3f3 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -1015,7 +1015,7 @@ void domain_init(int evtfd) int rc; /* Start with a random rather low domain count for the hashtable. */ - domhash = create_hashtable(NULL, 8, domhash_fn, domeq_fn, 0); + domhash = create_hashtable(NULL, "domains", domhash_fn, domeq_fn, 0); if (!domhash) barf_perror("Failed to allocate domain hashtable"); @@ -1807,7 +1807,7 @@ struct hashtable *domain_check_acc_init(void) { struct hashtable *domains; - domains = create_hashtable(NULL, 8, domhash_fn, domeq_fn, + domains = create_hashtable(NULL, "domain_check", domhash_fn, domeq_fn, HASHTABLE_FREE_VALUE); if (!domains) return NULL; -- 2.35.3