From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#24548: 25.2.50; Long GC delays with many non-detached markers (PATCH) Date: Fri, 23 Mar 2018 10:22:18 -0400 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1521814881 17812 195.159.176.226 (23 Mar 2018 14:21:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 23 Mar 2018 14:21:21 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 24548@debbugs.gnu.org To: Pip Cet Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 23 15:21:17 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ezNZC-0004TF-Hb for geb-bug-gnu-emacs@m.gmane.org; Fri, 23 Mar 2018 15:21:14 +0100 Original-Received: from localhost ([::1]:38299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNbE-0007yi-OP for geb-bug-gnu-emacs@m.gmane.org; Fri, 23 Mar 2018 10:23:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ezNb1-0007xz-Mi for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2018 10:23:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ezNaw-0004k7-1c for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2018 10:23:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41938) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ezNav-0004jx-TV for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2018 10:23:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ezNav-0005GA-M3 for bug-gnu-emacs@gnu.org; Fri, 23 Mar 2018 10:23:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 23 Mar 2018 14:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24548 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 24548-submit@debbugs.gnu.org id=B24548.152181494320145 (code B ref 24548); Fri, 23 Mar 2018 14:23:01 +0000 Original-Received: (at 24548) by debbugs.gnu.org; 23 Mar 2018 14:22:23 +0000 Original-Received: from localhost ([127.0.0.1]:49829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ezNaI-0005Er-Oz for submit@debbugs.gnu.org; Fri, 23 Mar 2018 10:22:22 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:56374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ezNaG-0005Eg-IS for 24548@debbugs.gnu.org; Fri, 23 Mar 2018 10:22:21 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id w2NEMJ7x004841; Fri, 23 Mar 2018 10:22:19 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id ED88D60223; Fri, 23 Mar 2018 10:22:18 -0400 (EDT) In-Reply-To: (Stefan Monnier's message of "Fri, 23 Mar 2018 09:55:15 -0400") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV6249=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6249> : inlines <6516> : streams <1782036> : uri <2613430> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:144558 Archived-At: > But if we call unchain_collected_markers from within the sweep phase > (e.g. on every buffer we find), `gcmarkbit` should be > sufficient/reliable. Or am I missing something? At least the patch below seems to work as well. Stefan diff --git a/src/alloc.c b/src/alloc.c index da01173fba..369592d70e 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -7095,7 +7091,9 @@ sweep_misc (void) if (!mblk->markers[i].m.u_any.gcmarkbit) { if (mblk->markers[i].m.u_any.type == Lisp_Misc_Marker) - unchain_marker (&mblk->markers[i].m.u_marker); + /* Make sure markers have been unchained from their buffer + in sweep_buffer before we collect them. */ + eassert (!mblk->markers[i].m.u_marker.buffer); else if (mblk->markers[i].m.u_any.type == Lisp_Misc_Finalizer) unchain_finalizer (&mblk->markers[i].m.u_finalizer); #ifdef HAVE_MODULES @@ -7142,6 +7140,23 @@ sweep_misc (void) total_free_markers = num_free; } +/* Remove BUFFER's markers that are due to be swept. This is needed since + we treat BUF_MARKERS and markers's `next' field as weak pointers. */ +static void +unchain_dead_markers (struct buffer *buffer) +{ + struct Lisp_Marker *this, **prev = &BUF_MARKERS (buffer); + + while ((this = *prev)) + if (this->gcmarkbit) + prev = &this->next; + else + { + this->buffer = NULL; + *prev = this->next; + } +} + NO_INLINE /* For better stack traces */ static void sweep_buffers (void) @@ -7160,6 +7175,7 @@ sweep_buffers (void) VECTOR_UNMARK (buffer); /* Do not use buffer_(set|get)_intervals here. */ buffer->text->intervals = balance_intervals (buffer->text->intervals); + unchain_dead_markers (buffer); total_buffers++; bprev = &buffer->next; } @@ -7179,8 +7195,8 @@ gc_sweep (void) sweep_floats (); sweep_intervals (); sweep_symbols (); - sweep_misc (); sweep_buffers (); + sweep_misc (); sweep_vectors (); check_string_bytes (!noninteractive); }