From: Matt Lundin <mdl@imapmail.org>
To: Org Mode <emacs-orgmode@gnu.org>
Subject: [PATCH] Optimize org-habit-parse-todo
Date: Wed, 19 Jan 2011 07:39:45 -0500 [thread overview]
Message-ID: <87mxmxys27.fsf@fastmail.fm> (raw)
* lisp/org-habit.el: (org-habit-parse-todo) Don't parse more days than
needed.
When constructing a consistency graph, org-habit (with this patch) will
stop searching for timestamps when the number of matches exceeds the
span of time displayed in the graph. This can produce a significant
speedup in agenda construction, especially for entries with many logbook
entries. Previously, org-habit would parse all logbook timestamps, even
if they numbered in the hundreds.
Before:
org-habit-parse-todo 33 0.7357430000 0.0222952424
After:
org-habit-parse-todo 33 0.11648 0.0035296969
This patch respects the value of org-log-states-order-reversed, but
assumes that users do not frequently change its value (and thus the
order of their log entries).
---
lisp/org-habit.el | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index b174a1f..a05dd1b 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -170,10 +170,18 @@ This list represents a \"habit\" for the rest of this module."
habit-entry scheduled-repeat))
(setq deadline (+ scheduled (- dr-days sr-days))))
(org-back-to-heading t)
- (while (re-search-forward "- State \"DONE\".*\\[\\([^]]+\\)\\]" end t)
- (push (time-to-days
- (org-time-string-to-time (match-string-no-properties 1)))
- closed-dates))
+ (let* ((maxdays (+ org-habit-preceding-days org-habit-following-days))
+ (reversed org-log-states-order-reversed)
+ (search (if reversed 're-search-forward 're-search-backward))
+ (limit (if reversed end (point)))
+ (count 0))
+ (unless reversed (goto-char end))
+ (while (and (funcall search "- State \"DONE\".*\\[\\([^]]+\\)\\]" limit t)
+ (< count maxdays))
+ (push (time-to-days
+ (org-time-string-to-time (match-string-no-properties 1)))
+ closed-dates)
+ (setq count (1+ count))))
(list scheduled sr-days deadline dr-days closed-dates))))
(defsubst org-habit-scheduled (habit)
--
1.7.3.5
next reply other threads:[~2011-01-19 13:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-19 12:39 Matt Lundin [this message]
2011-01-25 6:01 ` [PATCH] Optimize org-habit-parse-todo Carsten Dominik
2011-01-25 6:21 ` Carsten Dominik
2011-01-25 20:03 ` Matt Lundin
2011-01-25 21:59 ` [Accepted] " Carsten Dominik
2011-01-25 21:59 ` [PATCH] " Carsten Dominik
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=87mxmxys27.fsf@fastmail.fm \
--to=mdl@imapmail.org \
--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 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.