From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.bugs Subject: bug#56682: Fix the long lines font locking related slowdowns Date: Mon, 01 Aug 2022 09:34:18 +0000 Message-ID: References: <837d46mjen.fsf@gnu.org> <8a3eaeef01be5bfaa5ef@heytings.org> <05388e8d8812bfa3695d@heytings.org> <83v8rf5894.fsf@gnu.org> <65cb7c73fd4a999cca00@heytings.org> <8c7321f2f3400a5db9be@heytings.org> <8c7321f2f388e5343475@heytings.org> <6ea376f6-d503-06d8-6d83-50c52b695394@yandex.ru> <8c7321f2f3ac52bfee4b@heytings.org> <8c7321f2f3ec1ef81af9@heytings.org> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2132"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 56682@debbugs.gnu.org, Eli Zaretskii , Dmitry Gutov To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 01 11:35:55 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1oIRq7-0000MD-EJ for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 01 Aug 2022 11:35:55 +0200 Original-Received: from localhost ([::1]:44580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIRq5-0004rn-2r for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 01 Aug 2022 05:35:54 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIRpG-0004rO-Hw for bug-gnu-emacs@gnu.org; Mon, 01 Aug 2022 05:35:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIRpG-0003bG-9g for bug-gnu-emacs@gnu.org; Mon, 01 Aug 2022 05:35:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIRpG-0002N2-5j for bug-gnu-emacs@gnu.org; Mon, 01 Aug 2022 05:35:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Gregory Heytings Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Aug 2022 09:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56682 X-GNU-PR-Package: emacs Original-Received: via spool by 56682-submit@debbugs.gnu.org id=B56682.16593464639006 (code B ref 56682); Mon, 01 Aug 2022 09:35:02 +0000 Original-Received: (at 56682) by debbugs.gnu.org; 1 Aug 2022 09:34:23 +0000 Original-Received: from localhost ([127.0.0.1]:39301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIRoc-0002LC-S7 for submit@debbugs.gnu.org; Mon, 01 Aug 2022 05:34:23 -0400 Original-Received: from heytings.org ([95.142.160.155]:33476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIRoa-0002Kx-TS for 56682@debbugs.gnu.org; Mon, 01 Aug 2022 05:34:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1659346459; bh=DxHHR1DB46tKWHgPxHkdelGyDfR16ZUffBkVGmPcC2c=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=z0TeLssRfre1UciLv+iQrglaJnPXA8ExH9BPv/Nxg3LQOjIQoPcNe/wR4k/PdVRWw suljeZhge4dg3Ds1Rmm0afsRnBMYgwFSeaPkWOSVOzziiGuR/vhghFoRvJWh3O2Sur S28oWSqrXF7ZABXGKoIkgg/ypVEVOeXXMExIl0CbHH7f0ldGk4m+PzdSmLhR+3C2Wl qwaQyv4vYcVbi2I3LW/3zi3nYDddjrhtEfYS/IZGCGtOIV5QMAzcv0HiGtjxyKeX93 QvdqE30je5bt3nI//nxWpo4hgN5VFOSvBobq/zr8did85A3nqKGMn6sBaMt94tQ5x5 8ppV84v7QyIrw== In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:238396 Archived-At: Given your and Dmitry's feedback, I just tried to add an explicit call to (syntax-ppss (point-max)), without narrowing, when the buffer is opened (see below). The problem is that this is, as I said, slow. On my laptop, opening a 1 GB file takes about 6 seconds. The call to syntax-ppss adds 70 seconds, so opening a large file becomes an order of magnitude slower (13 times slower). Which I think is too much for the added benefit. diff --git a/src/buffer.c b/src/buffer.c index a07194aef7..bff6dce1d7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -986,6 +986,7 @@ reset_buffer (register struct buffer *b) b->clip_changed = 0; b->prevent_redisplay_optimizations_p = 1; b->long_line_optimizations_p = 0; + b->long_line_syntax_ppss_done_p = 0; bset_backed_up (b, Qnil); bset_local_minor_modes (b, Qnil); BUF_AUTOSAVE_MODIFF (b) = 0; @@ -2448,6 +2449,7 @@ #define swapfield_(field, type) \ current_buffer->prevent_redisplay_optimizations_p = 1; other_buffer->prevent_redisplay_optimizations_p = 1; swapfield (long_line_optimizations_p, bool_bf); + swapfield (long_line_syntax_ppss_done_p, bool_bf); swapfield (overlays_before, struct Lisp_Overlay *); swapfield (overlays_after, struct Lisp_Overlay *); swapfield (overlay_center, ptrdiff_t); diff --git a/src/buffer.h b/src/buffer.h index 47b4bdf749..3e020f1953 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -686,6 +686,8 @@ #define BVAR(buf, field) ((buf)->field ## _) display optimizations must be used. */ bool_bf long_line_optimizations_p : 1; + bool_bf long_line_syntax_ppss_done_p : 1; + /* List of overlays that end at or before the current center, in order of end-position. */ struct Lisp_Overlay *overlays_before; diff --git a/src/xdisp.c b/src/xdisp.c index 8a19b3bda9..d70ab6f9c1 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4391,6 +4391,13 @@ handle_fontified_prop (struct it *it) if (current_buffer->long_line_optimizations_p) { + if (!current_buffer->long_line_syntax_ppss_done_p) + { + current_buffer->long_line_syntax_ppss_done_p = 1; + specbind (Qinhibit_quit, Qt); + CALLN (Ffuncall, intern ("syntax-ppss"), Fpoint_max ()); + unbind_to (count, Qnil); + } ptrdiff_t begv = it->narrowed_begv ? it->narrowed_begv : BEGV; ptrdiff_t zv = it->narrowed_zv; ptrdiff_t charpos = IT_CHARPOS (*it);