emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Florian Beck <fb@miszellen.de>
To: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Fix massive slowdown in org-id-find
Date: Mon, 30 Mar 2015 22:43:29 +0200	[thread overview]
Message-ID: <877ftydxn2.fsf@sophokles.streitblatt.de> (raw)
In-Reply-To: <877fu5mdng.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Wed, 25 Mar 2015 14:04:35 +0100")

[-- Attachment #1: Type: text/plain, Size: 2328 bytes --]

Hello,

[sorry for the delay, I had some git SNAFUs]

> Could you also send and updated patch containing the VALUE optional
> argument to `org-re-property' and changing modifying only the (re ...)
> line in `org-find-property', with a new profiling?

Seems like this does trick. I don't really understand why, though. The
previous profiling seemed to indicate that most of the time was spent in
`org-entry-get' (that's why I removed it). Anyway, many thanks for
helping me out. Much appreciated.

I attached the new patch.

(let ((time (current-time)))
   (org-id-find "zangwill.nick_2014:aesthetic.judgment")
   (format "%ss" (time-to-seconds (time-subtract (current-time) time))))

--> "0.032598146s"

Here is the profiler report:

- command-execute                                                 215  89%
 - call-interactively                                             215  89%
  - funcall-interactively                                         140  58%
   + execute-extended-command                                      92  38%
   - eval-last-sexp                                                35  14%
    - elisp--eval-last-sexp                                        35  14%
     - eval                                                        35  14%
      - let                                                        35  14%
       - org-id-find                                               35  14%
        - org-id-find-id-in-file                                   35  14%
         - org-find-entry-with-id                                  35  14%
          - org-find-property                                      35  14%
           - save-excursion                                        35  14%
            - let                                                  35  14%
             - catch                                               35  14%
                while                                              35  14%
   + next-line                                                     13   5%
  + byte-code                                                      75  31%
+ redisplay_internal (C function)                                  15   6%
+ timer-event-handler                                              11   4%
+ ...                                                               0   0%

-- 
Florian Beck


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org.el-Allow-searching-for-specific-property-value.patch --]
[-- Type: text/x-diff, Size: 2317 bytes --]

From 389d8cec4406c394f3bf955726823951b014f6aa Mon Sep 17 00:00:00 2001
From: Florian Beck <fb@miszellen.de>
Date: Mon, 30 Mar 2015 22:27:36 +0200
Subject: [PATCH] org.el: Allow searching for specific property value

* lisp/org.el (org-re-property): New optional argument.
(org-find-property): Use it.
---
 lisp/org.el | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index cf37950..4f61123 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6254,7 +6254,7 @@ takes into consideration inlinetasks."
 
 (defvar org-font-lock-keywords nil)
 
-(defsubst org-re-property (property &optional literal allow-null)
+(defsubst org-re-property (property &optional literal allow-null value)
   "Return a regexp matching a PROPERTY line.
 
 When optional argument LITERAL is non-nil, do not quote PROPERTY.
@@ -6262,14 +6262,22 @@ This is useful when PROPERTY is a regexp.  When ALLOW-NULL is
 non-nil, match properties even without a value.
 
 Match group 3 is set to the value when it exists.  If there is no
-value and ALLOW-NULL is non-nil, it is set to the empty string."
+value and ALLOW-NULL is non-nil, it is set to the empty string.
+
+With optional argument VALUE, match only property lines with
+that value; in this case, ALLOW-NULL is ignored.  VALUE is quoted
+unless LITERAL is non-nil."
   (concat
    "^\\(?4:[ \t]*\\)"
    (format "\\(?1::\\(?2:%s\\):\\)"
 	   (if literal property (regexp-quote property)))
-   (if allow-null
-       "\\(?:\\(?3:$\\)\\|[ \t]+\\(?3:.*?\\)\\)\\(?5:[ \t]*\\)$"
-     "[ \t]+\\(?3:[^ \r\t\n]+.*?\\)\\(?5:[ \t]*\\)$")))
+   (cond (value
+	  (format "[ \t]+\\(?3:%s\\)\\(?5:[ \t]*\\)$"
+		  (if literal value (regexp-quote value))))
+	 (allow-null
+	  "\\(?:\\(?3:$\\)\\|[ \t]+\\(?3:.*?\\)\\)\\(?5:[ \t]*\\)$")
+	 (t
+	  "[ \t]+\\(?3:[^ \r\t\n]+.*?\\)\\(?5:[ \t]*\\)$"))))
 
 (defconst org-property-re
   (org-re-property "\\S-+" 'literal t)
@@ -16323,7 +16331,7 @@ part of the buffer."
   (save-excursion
     (goto-char (point-min))
     (let ((case-fold-search t)
-	  (re (org-re-property property nil (not value))))
+	  (re (org-re-property property nil (not value) value)))
       (catch 'exit
 	(while (re-search-forward re nil t)
 	  (when (if value (equal value (org-entry-get (point) property nil t))
-- 
2.1.0


  reply	other threads:[~2015-03-30 21:14 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-23 13:51 [PATCH] Fix massive slowdown in org-id-find Florian Beck
2015-03-23 22:13 ` Nicolas Goaziou
2015-03-24  9:02   ` Sebastien Vauban
2015-03-24 11:05   ` Florian Beck
2015-03-24 22:49     ` Florian Beck
2015-03-25 11:31       ` Jacob Nielsen
2015-03-25 13:04       ` Nicolas Goaziou
2015-03-30 20:43         ` Florian Beck [this message]
2015-03-31 10:01           ` Nicolas Goaziou

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

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=877ftydxn2.fsf@sophokles.streitblatt.de \
    --to=fb@miszellen.de \
    --cc=emacs-orgmode@gnu.org \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).