From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Lundin Subject: [PATCH] Optimize org-habit-parse-todo Date: Wed, 19 Jan 2011 07:39:45 -0500 Message-ID: <87mxmxys27.fsf@fastmail.fm> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from [140.186.70.92] (port=55895 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PfXnI-0005PR-GU for emacs-orgmode@gnu.org; Wed, 19 Jan 2011 08:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PfXW6-0005Cg-QB for emacs-orgmode@gnu.org; Wed, 19 Jan 2011 07:52:03 -0500 Received: from out1.smtp.messagingengine.com ([66.111.4.25]:45806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PfXW6-0005CZ-MF for emacs-orgmode@gnu.org; Wed, 19 Jan 2011 07:52:02 -0500 Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42]) by gateway1.messagingengine.com (Postfix) with ESMTP id D546B20398 for ; Wed, 19 Jan 2011 07:52:01 -0500 (EST) Received: from archdesk (67-197-63-212.rh2.dyn.cm.comporium.net [67.197.63.212]) by mail.messagingengine.com (Postfix) with ESMTPSA id 8F0C444335F for ; Wed, 19 Jan 2011 07:52:01 -0500 (EST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org Mode * 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