From: Ihor Radchenko <yantar92@posteo.net>
To: Paul Stansell <paulstansell@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [BUG] "Invalid search bound (wrong side of point)" [9.8-pre (release_9.7.16-169-ge87ecf @ ~/.emacs.d/org-mode-git/lisp/)]
Date: Sun, 29 Dec 2024 07:13:01 +0000 [thread overview]
Message-ID: <87seq7vu6a.fsf@localhost> (raw)
In-Reply-To: <CAMJKaZw931WsSaofTLDs67fzvf3ekb=XqD7LHgt3RYYbpQM0Zw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
Paul Stansell <paulstansell@gmail.com> writes:
>> This looks more reasonable.
>> Is this with my patch applied?
>>
>
> Yes, the patch is applied.
Ok. Then, may you try another version of the patch?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v2-0001-org-persist-Fix-mixing-cace-data-from-multiple-Em.patch --]
[-- Type: text/x-patch, Size: 2801 bytes --]
From 13ade2328dcae881296b5d7acc4493022a8895f3 Mon Sep 17 00:00:00 2001
Message-ID: <13ade2328dcae881296b5d7acc4493022a8895f3.1735456333.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Tue, 24 Dec 2024 09:45:42 +0100
Subject: [PATCH v2] org-persist: Fix mixing cace data from multiple Emacs
processes
* lisp/org-persist.el (org-persist--write-elisp-file): When there is a
clash with other Emacs process while writing cache data, discard the
cache to avoid any problem.
(org-persist--refresh-gc-lock):
(org-persist--gc-orphan-p): Bail out when writing fails.
Reported-by: Paul Stansell <paulstansell@gmail.com>
Link: https://orgmode.org/list/YT3PR01MB95943D4DB2E659091A2BDE8DBE2E2@YT3PR01MB9594.CANPRD01.PROD.OUTLOOK.COM
---
lisp/org-persist.el | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 4ff43ad7a5..d2ceb8f90f 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -478,11 +478,12 @@ (defun org-persist--write-elisp-file (file data &optional no-circular pp)
(start-time (float-time)))
(unless (file-exists-p (file-name-directory file))
(make-directory (file-name-directory file) t))
- ;; Force writing even when the file happens to be opened by
- ;; another Emacs process.
+ ;; Discard cache when there is a clash with other Emacs process.
+ ;; This way, we make sure that cache is never mixing data & record
+ ;; from different processes.
(cl-letf (((symbol-function #'ask-user-about-lock)
- ;; FIXME: Emacs 27 does not yet have `always'.
- (lambda (&rest _) t)))
+ (lambda (&rest _)
+ (error "Other Emacs process is writing to cache"))))
(with-temp-file file
(insert ";; -*- mode: lisp-data; -*-\n")
(if pp
@@ -1251,7 +1252,7 @@ (defun org-persist--refresh-gc-lock ()
(when (< (- (float-time (cdr record)) (float-time (current-time)))
org-persist-gc-lock-expiry)
(push record new-alist)))
- (org-persist--write-elisp-file file new-alist)))
+ (ignore-errors (org-persist--write-elisp-file file new-alist))))
(defun org-persist--gc-orphan-p ()
"Return non-nil, when orphan files should be garbage-collected.
@@ -1259,7 +1260,7 @@ (defun org-persist--gc-orphan-p ()
(let* ((file (org-file-name-concat org-persist-directory org-persist-gc-lock-file))
(alist (when (file-exists-p file) (org-persist--read-elisp-file file))))
(setq alist (org-assoc-delete-all before-init-time alist))
- (org-persist--write-elisp-file file alist)
+ (ignore-errors (org-persist--write-elisp-file file alist))
;; Only GC orphan files when there are no active sessions.
(not alist)))
--
2.47.1
[-- Attachment #3: Type: text/plain, Size: 223 bytes --]
--
Ihor Radchenko // yantar92,
Org mode maintainer,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
next prev parent reply other threads:[~2024-12-29 7:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-20 21:30 [BUG] "Invalid search bound (wrong side of point)" [9.8-pre (release_9.7.16-169-ge87ecf @ ~/.emacs.d/org-mode-git/lisp/)] Paul Stansell
2024-12-23 17:16 ` Ihor Radchenko
2024-12-23 18:02 ` Paul Stansell
2024-12-23 18:08 ` Ihor Radchenko
2024-12-23 23:33 ` Paul Stansell
2024-12-24 9:00 ` Ihor Radchenko
2024-12-27 15:27 ` Paul Stansell
2024-12-27 15:41 ` Ihor Radchenko
2024-12-27 16:56 ` Paul Stansell
2024-12-27 17:11 ` Paul Stansell
2024-12-27 18:18 ` Ihor Radchenko
2024-12-27 20:47 ` Paul Stansell
2024-12-28 17:17 ` Paul Stansell
2024-12-29 7:13 ` Ihor Radchenko [this message]
2024-12-29 13:18 ` Paul Stansell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87seq7vu6a.fsf@localhost \
--to=yantar92@posteo.net \
--cc=emacs-orgmode@gnu.org \
--cc=paulstansell@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.