From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68006: 30.0.50; Image-mode speed Date: Tue, 26 Dec 2023 15:45:11 +0100 Message-ID: <87bkadyqdk.fsf@ledu-giraud.fr> References: <87le9jlfd6.fsf@ledu-giraud.fr> <83wmt3bkla.fsf@gnu.org> <87h6k6lgdy.fsf@ledu-giraud.fr> <83wmt29zfy.fsf@gnu.org> <87il4m6rcx.fsf@ledu-giraud.fr> <83bkae9j11.fsf@gnu.org> Reply-To: Manuel Giraud 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="11578"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 68006@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 26 18:32:19 2023 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 1rIBHu-0002nH-Es for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 26 Dec 2023 18:32:18 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIBHh-00032X-RH; Tue, 26 Dec 2023 12:32:05 -0500 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 1rIBHg-00032B-6E for bug-gnu-emacs@gnu.org; Tue, 26 Dec 2023 12:32:04 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rIBHf-0005Dl-Ux for bug-gnu-emacs@gnu.org; Tue, 26 Dec 2023 12:32:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIBHd-0003aV-Oy for bug-gnu-emacs@gnu.org; Tue, 26 Dec 2023 12:32:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 26 Dec 2023 17:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68006 X-GNU-PR-Package: emacs Original-Received: via spool by 68006-submit@debbugs.gnu.org id=B68006.170361191613779 (code B ref 68006); Tue, 26 Dec 2023 17:32:01 +0000 Original-Received: (at 68006) by debbugs.gnu.org; 26 Dec 2023 17:31:56 +0000 Original-Received: from localhost ([127.0.0.1]:34897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIBHX-0003aA-Jj for submit@debbugs.gnu.org; Tue, 26 Dec 2023 12:31:56 -0500 Original-Received: from ledu-giraud.fr ([51.159.28.247]:11871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIBHV-0003Zz-3I for 68006@debbugs.gnu.org; Tue, 26 Dec 2023 12:31:54 -0500 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=NTymdhPU 4PYbhaMzMQUSgDEcBrbDuJLxfI/NOdnISa8=; h=date:references:in-reply-to: subject:cc:to:from; d=ledu-giraud.fr; b=aFEXtcSRVvHfjwxGwC+Q98Rch/jxzm ic8hps9xC+XFJjBh2S4xADkFd7kFZYndaxGkX7deSQJUELf0mwZNtFDw== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=NTymdhPU4PYbhaMz MQUSgDEcBrbDuJLxfI/NOdnISa8=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=U11NZbeDl9HLIrrnOkL5TBBaXWldke2I7mrQh3 Ye6jhu5fGJuNE5IfjBNCRJGw1GiYpHjItCgoGNCbzDwD+e4AbydQlJUUhTXCxQMVbLbwLP JjO0kPXpBUZ5AcIdD9m9DyCWXvT+D4Wi2UhxXnC7Z2qpjqVB2q6tEjvPXdM8vPAyDS5bEi Puvb/U2MrZ9i/CsUs68gjct4UzC3HxrbMjSL0+oxiSXHXpYOJkXin6mU05RVjiaw7N5ICB CCfDGPrm0Q/OGpr+PkiigzA+fQBWCQmOH3hr4Hc1yH7IfEb7i9su9hnSIPgWrpvw6OUCP8 IyZCjtrWemkFKYchirKQnPeg== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 9dc08124 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 26 Dec 2023 15:45:13 +0100 (CET) In-Reply-To: <83bkae9j11.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 25 Dec 2023 21:30:50 +0200") 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:276915 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Manuel Giraud >> Cc: 68006@debbugs.gnu.org >> Date: Mon, 25 Dec 2023 19:59:10 +0100 >> >> About being sure to display the file on disk, maybe we could call >> 'image-flush' only if the file has changed since its display. WDYT? > > Provided that the check is reliable, I guess so. > > In any case, I think we should be cautious and leave a knob to get > back the old behavior, in case there are some situations we don't > anticipate that need to flush the caches. Hi, What do you think of this? Of course, it will need a NEWS entry but I wanted to polish it first. I have made it opt-in. I have used it a bit the cache could grow fast but I find it quite pleasant to use (for Docview also). --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-some-user-control-on-image-caching.patch >From 4f941c1fe7bc91b121f305b3a3239cf9a3944a6b Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Tue, 26 Dec 2023 15:35:17 +0100 Subject: [PATCH] Add some user control on image caching * lisp/image-mode.el (image-eager-flush): New custom to control image cache flush. (image-toggle-display-image): Flush image upon on file disk change. * src/image.c (Fimage_timestamp): New function to access image display timestamp. --- lisp/image-mode.el | 16 ++++++++++++++-- src/image.c | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index d5ca6348c92..ccea96ecc26 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -93,6 +93,12 @@ image-auto-resize-on-window-resize :version "27.1" :group 'image) +(defcustom image-eager-flush t + "Non-nil means flush image from cache eagerly." + :type 'boolean + :version "30.1" + :group 'image) + (defvar-local image-transform-resize nil "The image resize operation. Non-nil to resize the image upon first display. @@ -954,8 +960,14 @@ image-toggle-display-image (plist-put (cdr image) :width (plist-get (cdr image) :max-width))))) - ;; Discard any stale image data before looking it up again. - (image-flush image) + ;; Discard image data if its file has changed on disk. + (when (or image-eager-flush + (and filename + (time-less-p + (image-timestamp image) + (file-attribute-modification-time + (file-attributes filename))))) + (image-flush image)) (setq image (append image (image-transform-properties image))) (setq props `(display ,image diff --git a/src/image.c b/src/image.c index 651ec0b34e5..3c2697d1e6f 100644 --- a/src/image.c +++ b/src/image.c @@ -1650,6 +1650,30 @@ DEFUN ("image-metadata", Fimage_metadata, Simage_metadata, 1, 2, 0, return ext; } +DEFUN ("image-timestamp", Fimage_timestamp, Simage_timestamp, 1, 2, 0, + doc: /* Return the time in seconds at which the image SPEC was +last displayed. + +FRAME is the frame on which the image was displayed. FRAME nil or +omitted means use the selected frame. */) + (Lisp_Object spec, Lisp_Object frame) +{ + Lisp_Object timestamp; + + timestamp = Qnil; + if (valid_image_p (spec)) + { + struct frame *f = decode_window_system_frame (frame); + ptrdiff_t id = lookup_image (f, spec, -1); + struct image *img = IMAGE_FROM_ID (f, id); + + if (img) + timestamp = make_lisp_time (img->timestamp); + } + + return timestamp; +} + /*********************************************************************** Image type independent image structures @@ -12908,6 +12932,7 @@ syms_of_image (void) defsubr (&Simage_size); defsubr (&Simage_mask_p); defsubr (&Simage_metadata); + defsubr (&Simage_timestamp); defsubr (&Simage_cache_size); defsubr (&Simagep); -- 2.43.0 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=--