From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Helmut Eller Newsgroups: gmane.emacs.devel Subject: Re: MPS: hash tables / obarrays Date: Wed, 29 May 2024 14:00:34 +0200 Message-ID: <87plt4keu5.fsf@gmail.com> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18427"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , Emacs Devel To: Gerd =?utf-8?Q?M=C3=B6llmann?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 29 14:01:46 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sCI01-0004ev-BV for ged-emacs-devel@m.gmane-mx.org; Wed, 29 May 2024 14:01:45 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCHz8-0004Bv-BM; Wed, 29 May 2024 08:00:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCHz2-000496-C7 for emacs-devel@gnu.org; Wed, 29 May 2024 08:00:47 -0400 Original-Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCHyz-0006yL-34; Wed, 29 May 2024 08:00:43 -0400 Original-Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a626777f74eso235477466b.3; Wed, 29 May 2024 05:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716984037; x=1717588837; darn=gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=oT2cOq0arig+Gu0iqgEd1yvlOAdWS4US7NnbNG1nw3s=; b=fcVN4uDUNnA4JxqZQQ2/tkOy+xhOe/4uFpZdv2KePKtupcDcBF/DujUX6aKd2F94EK qfS1G4lFCjAzB6c4rKjmArR96qsCObH7GAZmIrBZcMRVYQEyJMJNLExXm9L/NdedgRN0 Av6RgBcpTuIqZufRSrjJurOZnnZg/P9CXspc1rVoQie23m2Mu4vtfk9tpZozqETHVzgK rY+hXQKRJYajzwaaYB40k3lr2N6AL0Mv3jjCf5fZVllpR7pyXfXR4IyKqhH0fkc4iGqP tqTVPnG6+7ZOjxSj2KEVkBWP51ldnC0OhrLaAoUPv0czmvqX2EWarjSAhWB6FhyKweYO Fsaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716984037; x=1717588837; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oT2cOq0arig+Gu0iqgEd1yvlOAdWS4US7NnbNG1nw3s=; b=CTiSNBTbGUnddjxR7j7jSRUF7LTw1XSOi1u0EKnxlPcGa3DrhJ+GL4AN2KIHn9cMC7 FiemOjBHW4TKcNHvLtqWlcfAlCUu/kdUD50m82k1dqv329mMfQCOAzqT/gbVZu7EA9LT OGs0HSD9v7RCtagALbo344jnFZBq615yPLKHyuEffr/66qWmGHAGgkzqMbrF0lijNOEk JLmXq9+POyfqi/GkUOF4T+vqpV1n+FALN3FWEPMrklT83JNUMB6XuiYSRkuRbB4qVG0I LnAd1HwlMRmowF0Yo4mstvMIKKgt64bPdyzWzv/LJFUmrgNINRI5n2cJmu182RVAFUIr 5Vuw== X-Forwarded-Encrypted: i=1; AJvYcCXRBBlJbvB+cZAyGVkP0pmj6K2/YvLzIFVfY5DXFOoetJw9XnD8HLCXLWMOJ2b5SgkoSDquDL8QakghRomzvd0HNXGQ X-Gm-Message-State: AOJu0Yye8AjAg59TLKq7bNe3BKXjQJm0iAsRFBnIWncKUy4JsFXMF/Q+ TiM5quQgOMZ6JNwdKPsUVkSgZ+9SlZxlYbvNWMrjcPY5SVzHUUg4I7r07A== X-Google-Smtp-Source: AGHT+IEskqQBE2GRq1VHkpwNIb4JPVosZbRFznhJh1zbSZhVqCb4IZhia6rb8O8VUFYVPYMlzNpBrQ== X-Received: by 2002:a17:906:6a24:b0:a63:3e99:6565 with SMTP id a640c23a62f3a-a633e996aacmr647122566b.23.1716984036704; Wed, 29 May 2024 05:00:36 -0700 (PDT) Original-Received: from caladan (dial-186004.pool.broadband44.net. [212.46.186.4]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a62c87334fdsm471113066b.179.2024.05.29.05.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 05:00:36 -0700 (PDT) In-Reply-To: ("Gerd =?utf-8?Q?M=C3=B6llman?= =?utf-8?Q?n=22's?= message of "Sun, 19 May 2024 10:38:53 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=eller.helmut@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:319685 Archived-At: --=-=-= Content-Type: text/plain Here are some patches to move the remaining parts of hash tables to MPS. The main advantage is that finalization is not longer needed for hash tables. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-a-igc_make_byte_vec-function.patch >From ee5a5dbd42c4a48d9e0cfe4d5c90fb58be89dbea Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Wed, 29 May 2024 10:07:50 +0200 Subject: [PATCH 1/5] Add a igc_make_byte_vec function This is like igc_make_ptr_vec but for bytes. The header used is IGC_OBJ_STRING_DATA. Perhaps that should be renamed. * src/igc.h (igc_make_byte_vec): New. * src/igc.c (igc_make_byte_vec): Implement it. --- src/igc.c | 8 ++++++++ src/igc.h | 1 + 2 files changed, 9 insertions(+) diff --git a/src/igc.c b/src/igc.c index 4780e68869f..acf8ddbbb4e 100644 --- a/src/igc.c +++ b/src/igc.c @@ -3054,6 +3054,14 @@ alloc_string_data (size_t nbytes, bool clear) return data; } +uintptr_t * +igc_make_byte_vec (size_t nbytes) +{ + mps_addr_t addr = alloc (nbytes, IGC_OBJ_STRING_DATA); + igc_assert (is_aligned (addr)); + return (uintptr_t *)addr; +} + /* Reallocate multibyte STRING data when a single character is replaced. The character is at byte offset BYTE_POS in the string. The character being replaced is CHAR_LEN bytes long, and the diff --git a/src/igc.h b/src/igc.h index 93d27040b6b..bb09210160e 100644 --- a/src/igc.h +++ b/src/igc.h @@ -106,6 +106,7 @@ #define EMACS_IGC_H void *igc_make_ptr_vec (size_t n); void *igc_grow_ptr_vec (void *v, ptrdiff_t *n, ptrdiff_t n_incr_min, ptrdiff_t n_max); Lisp_Object * igc_make_hash_table_vec (size_t n); +uintptr_t *igc_make_byte_vec (size_t nbytes); /* result is word aligned */ struct image_cache *igc_make_image_cache (void); struct interval *igc_make_interval (void); -- 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Use-igc_make_byte_vec-for-hash-tables.patch >From a38b50b84ddd126bf2cdecfce0ba1e878b05c7a9 Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Wed, 29 May 2024 10:12:04 +0200 Subject: [PATCH 2/5] Use igc_make_byte_vec for hash tables This avoids the need for finalization. * src/alloc.c (hash_table_alloc_bytes, hash_table_free_bytes): Delegate to igc_make_byte_vec. * src/igc.c (fix_hash_table): Fix hash, next, and index vectors. (finalize_hash_table): Delete. No longer needed. (finalize_vector, maybe_finalize): Remove finalizers for hash tables. --- src/alloc.c | 8 ++++++++ src/igc.c | 25 +++++-------------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index 8054deca197..f22e0e8dfb0 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -5794,7 +5794,11 @@ hash_table_alloc_bytes (ptrdiff_t nbytes) return NULL; tally_consing (nbytes); hash_table_allocated_bytes += nbytes; +#ifdef HAVE_MPS + void *p = igc_make_byte_vec (nbytes); +#else void *p = xmalloc (nbytes); +#endif return p; } @@ -5804,7 +5808,11 @@ hash_table_free_bytes (void *p, ptrdiff_t nbytes) { tally_consing (-nbytes); hash_table_allocated_bytes -= nbytes; +#ifdef HAVE_MPS + /* let igc handle this */ +#else xfree (p); +#endif } Lisp_Object * diff --git a/src/igc.c b/src/igc.c index acf8ddbbb4e..aad7e9d2779 100644 --- a/src/igc.c +++ b/src/igc.c @@ -1597,6 +1597,9 @@ fix_hash_table (mps_ss_t ss, struct Lisp_Hash_Table *h) // FIXME: weak IGC_FIX12_RAW (ss, &h->key); IGC_FIX12_RAW (ss, &h->value); + IGC_FIX12_RAW (ss, &h->hash); + IGC_FIX12_RAW (ss, &h->next); + IGC_FIX12_RAW (ss, &h->index); } MPS_SCAN_END (ss); return MPS_RES_OK; @@ -2475,21 +2478,6 @@ igc_create_charset_root (void *table, size_t size) root_create_ambig (global_igc, table, (char *) table + size); } -static void -finalize_hash_table (struct Lisp_Hash_Table *h) -{ - if (h->table_size) - { - /* Set the table size to 0 so that we don't further scan a hash - table after it has been finalized. Also, keep in mind that - xfree works with objects in a loaded dump. */ - h->table_size = 0; - xfree (h->index); - xfree (h->next); - xfree (h->hash); - } -} - static void finalize_bignum (struct Lisp_Bignum *n) { @@ -2605,10 +2593,6 @@ finalize_vector (mps_addr_t v) case PVEC_FREE: emacs_abort (); - case PVEC_HASH_TABLE: - finalize_hash_table (v); - break; - case PVEC_BIGNUM: finalize_bignum (v); break; @@ -2670,6 +2654,7 @@ finalize_vector (mps_addr_t v) #ifndef IN_MY_FORK case PVEC_OBARRAY: #endif + case PVEC_HASH_TABLE: case PVEC_SYMBOL_WITH_POS: case PVEC_PROCESS: case PVEC_RECORD: @@ -2746,7 +2731,6 @@ maybe_finalize (mps_addr_t client, enum pvec_type tag) mps_addr_t ref = client_to_base (client); switch (tag) { - case PVEC_HASH_TABLE: case PVEC_BIGNUM: case PVEC_FONT: case PVEC_THREAD: @@ -2765,6 +2749,7 @@ maybe_finalize (mps_addr_t client, enum pvec_type tag) #ifndef IN_MY_FORK case PVEC_OBARRAY: #endif + case PVEC_HASH_TABLE: case PVEC_NORMAL_VECTOR: case PVEC_FREE: case PVEC_MARKER: -- 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0003-No-need-to-fix-the-markers-field-twice.patch >From e382b225ec9de727622ec782597bc47bd2fe2fc0 Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Wed, 29 May 2024 10:15:58 +0200 Subject: [PATCH 3/5] No need to fix the markers field twice * src/igc.c (fix_buffer): --- src/igc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/igc.c b/src/igc.c index aad7e9d2779..591f2fc9f89 100644 --- a/src/igc.c +++ b/src/igc.c @@ -1478,7 +1478,6 @@ fix_buffer (mps_ss_t ss, struct buffer *b) IGC_FIX12_RAW (ss, &b->own_text.intervals); IGC_FIX12_RAW (ss, &b->own_text.markers); IGC_FIX12_RAW (ss, &b->overlays); - IGC_FIX12_RAW (ss, &b->own_text.markers); IGC_FIX12_RAW (ss, &b->base_buffer); if (b->base_buffer) -- 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0004-For-igc-info-include-information-about-leaf-objects.patch >From f8554ce726f683f6720ef2676f8904210206e002 Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Wed, 29 May 2024 10:18:23 +0200 Subject: [PATCH 4/5] For igc-info, include information about leaf objects * src/icg.c (Figc_info): Also walk the leaf pool. --- src/igc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/igc.c b/src/igc.c index 591f2fc9f89..54052375977 100644 --- a/src/igc.c +++ b/src/igc.c @@ -3295,6 +3295,12 @@ DEFUN ("igc-info", Figc_info, Sigc_info, 0, 0, 0, doc : /* */) { res = mps_pool_walk (gc->dflt_pool, dflt_scanx, &st); } + if (res != MPS_RES_OK) + error ("Error %d walking memory", res); + IGC_WITH_PARKED (gc) + { + res = mps_pool_walk (gc->leaf_pool, dflt_scanx, &st); + } if (res != MPS_RES_OK) error ("Error %d walking memory", res); -- 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0005-Return-information-about-the-arena-for-igc-info.patch >From 3ccda8f6174a320544bc8a3752f0d81b8383de2f Mon Sep 17 00:00:00 2001 From: Helmut Eller Date: Wed, 29 May 2024 10:21:04 +0200 Subject: [PATCH 5/5] Return information about the arena for igc-info * src/igc.c (Figc_info): Include mps_arena_committed and other arena related information. --- src/igc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/igc.c b/src/igc.c index 54052375977..f8df5616020 100644 --- a/src/igc.c +++ b/src/igc.c @@ -3319,6 +3319,24 @@ DEFUN ("igc-info", Figc_info, Sigc_info, 0, 0, 0, doc : /* */) make_int (st.pvec[i].nobjs), make_int (st.pvec[i].nwords)); result = Fcons (e, result); } + result = Fcons (list2 (build_string ("pause-time"), + make_float (mps_arena_pause_time (gc->arena))), + result); + result = Fcons (list2 (build_string ("reserved"), + make_int (mps_arena_reserved (gc->arena))), + result); + result = Fcons (list2 (build_string ("spare"), + make_float (mps_arena_spare (gc->arena))), + result); + result = Fcons (list2 (build_string ("spare-committed"), + make_int (mps_arena_spare_committed (gc->arena))), + result); + result = Fcons (list2 (build_string ("commit-limit"), + make_int (mps_arena_commit_limit (gc->arena))), + result); + result = Fcons (list2 (build_string ("committed"), + make_int (mps_arena_committed (gc->arena))), + result); return result; } -- 2.39.2 --=-=-=--