From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.bugs Subject: bug#39133: 28.0.50; Emacs slowdown on special char Date: Fri, 24 Jan 2020 16:41:40 +0100 Message-ID: References: <83lfqa5aa2.fsf@gnu.org> <83r2004rqn.fsf@gnu.org> <8336c5rw5t.fsf@gnu.org> <83y2txq8fw.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="90792"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 39133@debbugs.gnu.org, lg.zevlg@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 24 16:42:11 2020 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 1iv163-000Naa-QD for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 24 Jan 2020 16:42:11 +0100 Original-Received: from localhost ([::1]:43792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iv162-0002nC-VA for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 24 Jan 2020 10:42:10 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56495) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iv15v-0002iO-Vt for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 10:42:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iv15u-0002u0-HB for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 10:42:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48680) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iv15u-0002tl-D7 for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 10:42:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iv15u-0006WE-9N for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 10:42:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Jan 2020 15:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39133 X-GNU-PR-Package: emacs Original-Received: via spool by 39133-submit@debbugs.gnu.org id=B39133.157988051025041 (code B ref 39133); Fri, 24 Jan 2020 15:42:02 +0000 Original-Received: (at 39133) by debbugs.gnu.org; 24 Jan 2020 15:41:50 +0000 Original-Received: from localhost ([127.0.0.1]:54653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv15h-0006Vp-L3 for submit@debbugs.gnu.org; Fri, 24 Jan 2020 10:41:49 -0500 Original-Received: from mail-wr1-f44.google.com ([209.85.221.44]:39233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv15g-0006Vc-Fd for 39133@debbugs.gnu.org; Fri, 24 Jan 2020 10:41:48 -0500 Original-Received: by mail-wr1-f44.google.com with SMTP id y11so2514223wrt.6 for <39133@debbugs.gnu.org>; Fri, 24 Jan 2020 07:41:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :mime-version; bh=MxRtJ5zkmV7F0mG5yJOHOZfAPdVKXFN4ExIr8PvBivg=; b=ACj0cFOGR9ci3P3tseMun2JhegRmUXZx4hxYN1/5PK1+D+pYzwMglPhoZfGthFN/me IJFcRANDowru7RRBgaVXLF+DBT8elgBHI2dTMYh8W9qYvqmVUzmkBd66NkUEB7OK/+nS FU639qGP8BxuIdWH9Ml/Ob/lVq6kpIPvNZxaeec5I/sF2j3QI2EoyB7IVR5kz39xbiMi Hoe01lldfE/z+SKEXzebOtSCOgoX7ITNT7bZfJkjDihSMnyW0RWS4U+hCXQL+NPCz/4s 6/W9MXUK/2UKaeisBEaJJMzNbM0xCiAseUceTE0yH7PRybIs7quEy+FwI97LeYJ+IFk4 iYgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version; bh=MxRtJ5zkmV7F0mG5yJOHOZfAPdVKXFN4ExIr8PvBivg=; b=XVohFwfuILq5c7l9z/LL70VIbdz6eHQ1jWZ3l6UGf9ZIstlIp56UDLv0TAvxqE67xA h/l5K/PofxEoBN3JjRcaSOBKk4HKSLwnq2qavJLDt2wKs2u2u/ADgEdIMvFpkF16huow 6F0JiKnxpCOxq9GZpT0MpExviYlaGje2ZLzw8TCq67Zg02ksxZEO1/e+43ipdmQImYyK ogRbhEdr498gGsEVnzcy04C2QJNqJqwAfMQftbBjyvj5kJu0FyV7pFjPGlfPM8JQa9a5 LAdM3LJTMNEGL2T6CTwtbheQFg8kw781iutI71vOzSz3vUZotvLeUDZov8JFUX+GVosf dMGQ== X-Gm-Message-State: APjAAAXIwjlLfRNpN4IfbUDi1JbNpxBL8ZOHrToVAZz2SCa8K5o4BqUc pO+deLNoJd+aKbZZf5RVFLM= X-Google-Smtp-Source: APXvYqw4Kbqfiub5zaEkRNVmIJLzxWC6R4Jj0LbIEPLt4QHg6MYN56F+GD8O7dBTHEf93IyUwUOKuw== X-Received: by 2002:adf:f103:: with SMTP id r3mr4905441wro.295.1579880502605; Fri, 24 Jan 2020 07:41:42 -0800 (PST) Original-Received: from rpluim-mac ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id a9sm6966767wmm.15.2020.01.24.07.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 07:41:41 -0800 (PST) In-Reply-To: (Robert Pluim's message of "Fri, 24 Jan 2020 14:50:10 +0100") 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: 209.51.188.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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:175230 Archived-At: --=-=-= Content-Type: text/plain >>>>> On Fri, 24 Jan 2020 14:50:10 +0100, Robert Pluim said: Robert> Yes, I worked that out. A simple crash, for once :-) --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Don-t-attempt-to-cache-glyph-metrics-for-FONT_INVALI.patch >From 667f47abecc13e8a47181f338e727d95e57a6354 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Fri, 24 Jan 2020 14:11:44 +0100 Subject: [PATCH] Don't attempt to cache glyph metrics for FONT_INVALID_CODE This was causing massive slowdown in redisplay when eg #xfe0f (VARIATION SELECTOR-16) was present, as the cache ended up very large, unused, and being recreated on every call to font_fill_lglyph_metrics (Bug#39133). * src/composite.c (fill_gstring_body): Hoist FONT_OBJECT_P check out of loop. Calculate glyph code and check for FONT_INVALID_CODE before calling font_fill_lglyph_metrics. Pass glyph code to it. * src/font.c (font_fill_lglyph_metrics): Add code parameter, move glyph code calculation up the call stack into fill_gstring_body. * src/font.h: Adjust font_fill_lglyph_metrics prototype. --- src/composite.c | 18 ++++++++++++++---- src/font.c | 4 +--- src/font.h | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/composite.c b/src/composite.c index 53e6930b5f..364d5c9316 100644 --- a/src/composite.c +++ b/src/composite.c @@ -818,6 +818,11 @@ fill_gstring_body (Lisp_Object gstring) Lisp_Object header = AREF (gstring, 0); ptrdiff_t len = LGSTRING_CHAR_LEN (gstring); ptrdiff_t i; + struct font *font = NULL; + unsigned int code; + + if (FONT_OBJECT_P (font_object)) + font = XFONT_OBJECT (font_object); for (i = 0; i < len; i++) { @@ -832,10 +837,15 @@ fill_gstring_body (Lisp_Object gstring) LGLYPH_SET_FROM (g, i); LGLYPH_SET_TO (g, i); LGLYPH_SET_CHAR (g, c); - if (FONT_OBJECT_P (font_object)) - { - font_fill_lglyph_metrics (g, font_object); - } + + if (font != NULL) + code = font->driver->encode_char (font, LGLYPH_CHAR (g)); + else + code = FONT_INVALID_CODE; + if (code != FONT_INVALID_CODE) + { + font_fill_lglyph_metrics (g, font, code); + } else { int width = XFIXNAT (CHAR_TABLE_REF (Vchar_width_table, c)); diff --git a/src/font.c b/src/font.c index bb39aef92d..2a45630061 100644 --- a/src/font.c +++ b/src/font.c @@ -4416,10 +4416,8 @@ DEFUN ("clear-font-cache", Fclear_font_cache, Sclear_font_cache, 0, 0, 0, void -font_fill_lglyph_metrics (Lisp_Object glyph, Lisp_Object font_object) +font_fill_lglyph_metrics (Lisp_Object glyph, struct font *font, unsigned int code) { - struct font *font = XFONT_OBJECT (font_object); - unsigned code = font->driver->encode_char (font, LGLYPH_CHAR (glyph)); struct font_metrics metrics; LGLYPH_SET_CODE (glyph, code); diff --git a/src/font.h b/src/font.h index 0561e3c83f..8614e7fa10 100644 --- a/src/font.h +++ b/src/font.h @@ -886,7 +886,7 @@ valid_font_driver (struct font_driver const *d) extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t, ptrdiff_t *, struct window *, struct face *, Lisp_Object); -extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object); +extern void font_fill_lglyph_metrics (Lisp_Object, struct font *, unsigned int); extern Lisp_Object font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val); -- 2.23.0 --=-=-=--