From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: Redisplay slower in Emacs 28 than Emacs 27 Date: Tue, 08 Dec 2020 00:47:14 +0100 Message-ID: <87im9d5gcd.fsf@gnus.org> References: <877dptiro7.fsf@gnus.org> <87pn3lhcdd.fsf@gnus.org> <878sa9hbe2.fsf@gnus.org> <877dptfvae.fsf@gnus.org> <83czzl8qwu.fsf@gnu.org> <87sg8h78s8.fsf@gnus.org> <87h7ox71xc.fsf@gnus.org> <874kkx6zwj.fsf@gnus.org> <87zh2p5ksl.fsf@gnus.org> <87r1o15ifl.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33067"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Gregory Heytings Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Dec 08 00:50:19 2020 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 1kmQGo-0008Ts-Vr for ged-emacs-devel@m.gmane-mx.org; Tue, 08 Dec 2020 00:50:18 +0100 Original-Received: from localhost ([::1]:37036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmQGn-0000PN-SM for ged-emacs-devel@m.gmane-mx.org; Mon, 07 Dec 2020 18:50:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmQDz-0007Nk-FO for emacs-devel@gnu.org; Mon, 07 Dec 2020 18:47:24 -0500 Original-Received: from quimby.gnus.org ([2a01:4f9:2b:f0f::2]:33244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmQDx-00011X-43; Mon, 07 Dec 2020 18:47:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=utLf/uHPqs0a/B+JkQnciNtcOXNRCaWgIZKmFruGNM0=; b=AmHQ4wdqYhSqlUJU1wxMSWIGaS LAEHenRc6vE4RmhL949gTllskyN9u/75+R4yqV/vBoA69xjd10WkFEYRthkvkh+ynxF/LtA+4T4c+ HZmaFeCWj15qLrtqmDyyj41/P1YTP1cmHYCHPIXZvOZDtq541P2SnDxj/SFjv1sBya5E=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmQDr-0003AD-Ub; Tue, 08 Dec 2020 00:47:19 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAElBMVEVdUkghHhyNdFS+ nGzTson///8s83NKAAAAAWJLR0QF+G/pxwAAAAd0SU1FB+QMBxcrMFDmXrwAAAG2SURBVDjLzZLR meMgDIQBbwESaQCDC0gQBeRs+q/pRgKTvfu2gOUFW78ljUZ2jkrzjpkdTs6CO+B6OgOIE+KhiHhS DJAoHAaCCwGxnXIuBpCogDeXkZNepHE5XQ4iu7Yo+kmuzwXyAEGqSO/9JNzfABRJkwbAeYJiIJSa C+L94oLIZaDu0ISvJWuKgT6AZ7JYR43uNxlALgVFG/eeiizQBtAEdH50H4fc0K7kIdYS8EXfyRVT BcATXJinYUJXVFUTOBLazOCvyjmnos3rApohCmpKE2yWcOEJjupCkgsjw8hbM9hWdYNIsxJnZ7t0 bhNdBxUANZk52TIdNCfbX8N0/wIdw8d6zIQJoEor+dhlJnBgSgq69t4fvb94nRQCAAanFIdWPWS/ WHLm7RlllXI09GrveMZ+PSfwkaMCfY8nfUrlhze9WmHDr1HuUudjN6BWI3j0D3gZUEePNyzyt9b4 HqUgql3+2xCUTFbl/0CdAKrIdvoBT3MLIN6OrwyzUfd66W+9ergxiAE42P4Mq9DBaxN/g2OfgAZQ Rwx8jUqxKvAGKJ+v1YMAzGR72T+qUMov8NP5neAvJRR4KnmHdJ8AAAAldEVYdGRhdGU6Y3JlYXRl ADIwMjAtMTItMDdUMjM6NDM6NDcrMDA6MDCmEfOmAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIwLTEy LTA3VDIzOjQzOjQ3KzAwOjAw10xLGgAAAABJRU5ErkJggg== X-Now-Playing: Neil Young's _The Times_: "Little Wing" In-Reply-To: (Gregory Heytings's message of "Mon, 07 Dec 2020 23:09:10 +0000") Received-SPF: pass client-ip=2a01:4f9:2b:f0f::2; envelope-from=larsi@gnus.org; helo=quimby.gnus.org 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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" Xref: news.gmane.io gmane.emacs.devel:260536 Archived-At: Gah, I left some debugging in the previous patch. This one, then: diff --git a/lisp/image.el b/lisp/image.el index 9ebb603086..4b6710e4a3 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -679,8 +679,10 @@ image-search-load-path (setq path (cdr path))) (if found filename))) +(defvar find-image--cache (make-hash-table :test #'equal)) + ;;;###autoload -(defun find-image (specs) +(defun find-image (specs &optional cache) "Find an image, choosing one of a list of image specifications. SPECS is a list of image specifications. @@ -698,23 +700,28 @@ find-image The image is looked for in `image-load-path'. Image files should not be larger than specified by `max-image-size'." - (let (image) - (while (and specs (null image)) - (let* ((spec (car specs)) - (type (plist-get spec :type)) - (data (plist-get spec :data)) - (file (plist-get spec :file)) - found) - (when (image-type-available-p type) - (cond ((stringp file) - (if (setq found (image-search-load-path file)) - (setq image - (cons 'image (plist-put (copy-sequence spec) - :file found))))) - ((not (null data)) - (setq image (cons 'image spec))))) - (setq specs (cdr specs)))) - image)) + (or (and cache + (gethash specs find-image--cache)) + (let ((orig-specs specs) + image) + (while (and specs (null image)) + (let* ((spec (car specs)) + (type (plist-get spec :type)) + (data (plist-get spec :data)) + (file (plist-get spec :file)) + found) + (when (image-type-available-p type) + (cond ((stringp file) + (if (setq found (image-search-load-path file)) + (setq image + (cons 'image (plist-put (copy-sequence spec) + :file found))))) + ((not (null data)) + (setq image (cons 'image spec))))) + (setq specs (cdr specs)))) + (when cache + (setf (gethash orig-specs find-image--cache) image)) + image))) ;;;###autoload -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no