From: Mark Walters Date: Sat, 22 Mar 2014 11:51:06 +0000 (+0000) Subject: [Patch v4 2/8] Make keys of notmuch-tag-formats regexps and use caching X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c6c92799efb0267a8a3435055eeb618d95cc1d6;p=notmuch-archives.git [Patch v4 2/8] Make keys of notmuch-tag-formats regexps and use caching --- diff --git a/21/874270c992917c79a5c4a6756f23682197ba28 b/21/874270c992917c79a5c4a6756f23682197ba28 new file mode 100644 index 000000000..ea81ba141 --- /dev/null +++ b/21/874270c992917c79a5c4a6756f23682197ba28 @@ -0,0 +1,241 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 2526B431FD9 + for ; Sat, 22 Mar 2014 04:51:36 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id YJUJPBYsmaGm for ; + Sat, 22 Mar 2014 04:51:30 -0700 (PDT) +Received: from mail-we0-f170.google.com (mail-we0-f170.google.com + [74.125.82.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 019AD431FC3 + for ; Sat, 22 Mar 2014 04:51:26 -0700 (PDT) +Received: by mail-we0-f170.google.com with SMTP id w61so2284627wes.29 + for ; Sat, 22 Mar 2014 04:51:25 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=EFSKQjZN1z/OWg512QtUAk02B958coxE0/mG1L2Apw0=; + b=Ax+oYVXRxNcxsihfgZqQysA8rydj0GlwauOCJewB5KPjUOikATF6QWFSCWh3EG8Nk0 + 79/EWkBSIET3pf+6f7E9kbUNSngqHq+sahcWsZC+jZTXdRm+2wFxrvLhTE16ZeyorwXm + g+9aOucUmfM0v35ZTIj3RZ152Db98fxn0B3sVRs86N2ovi8C+XPosHglJLlg3dR8WHh1 + SkNkm5yMdLQrpyBJt0b5KQRrvx8cfkPma4VChaSa5Y2kFtvERm2A03prthCDPUOxBT4U + U6OKGRciqfZmCkUUAJpKeYDLm8/FagptnOxj8WSfVPTiWnxuK9UxIPRT5h3THFz03q2W + Oj2A== +X-Received: by 10.180.77.49 with SMTP id p17mr3485871wiw.4.1395489085798; + Sat, 22 Mar 2014 04:51:25 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id uq2sm16881230wjc.5.2014.03.22.04.51.24 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 22 Mar 2014 04:51:25 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org, + amdragon@mit.edu +Subject: [Patch v4 2/8] Make keys of notmuch-tag-formats regexps and use + caching +Date: Sat, 22 Mar 2014 11:51:06 +0000 +Message-Id: <1395489072-19001-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1395489072-19001-1-git-send-email-markwalters1009@gmail.com> +References: <1395489072-19001-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 22 Mar 2014 11:51:36 -0000 + +From: Austin Clements + +This modifies `notmuch-tag-format-tag' to treat the keys of +`notmuch-tag-formats' as (anchored) regexps, rather than literal +strings. This is clearly more flexible, as it allows for prefix +matching, defining a fallback format, etc. This may cause compatibility +problems if people have customized `notmuch-tag-formats' to match tags +that contain regexp specials, but this seems unlikely. + +Regular expression matching has quite a performance hit over string +lookup, so this also introduces a simple cache from exact tags to +formatted strings. The number of unique tags is likely to be quite +small, so this cache should have a high hit rate. In addition to +eliminating the regexp lookup in the common case, this cache stores +fully formatted tags, eliminating the repeated evaluation of potentially +expensive, user-specified formatting code. This makes regexp lookup at +least as fast as assoc for unformatted tags (e.g., inbox) and *faster* +than the current code for formatted tags (e.g., unread): + + inbox (usec) unread (usec) + assoc: 0.4 2.8 + regexp: 3.2 7.2 + regexp+caching: 0.4 0.4 + +(Though even at 7.2 usec, tag formatting is not our top bottleneck.) + +This cache must be explicitly cleared to keep it coherent, so this adds +the appropriate clearing calls. +--- + emacs/notmuch-show.el | 1 + + emacs/notmuch-tag.el | 76 ++++++++++++++++++++++++++++++++++--------------- + emacs/notmuch-tree.el | 1 + + emacs/notmuch.el | 1 + + 4 files changed, 56 insertions(+), 23 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index b8782dd..019f51d 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1145,6 +1145,7 @@ (defun notmuch-show-build-buffer () + ;; Don't track undo information for this buffer + (set 'buffer-undo-list t) + ++ (notmuch-tag-clear-cache) + (erase-buffer) + (goto-char (point-min)) + (save-excursion +diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el +index 41b1687..42c425e 100644 +--- a/emacs/notmuch-tag.el ++++ b/emacs/notmuch-tag.el +@@ -34,17 +34,21 @@ (defcustom notmuch-tag-formats + (notmuch-tag-format-image-data tag (notmuch-tag-star-icon)))) + "Custom formats for individual tags. + +-This gives a list that maps from tag names to lists of formatting +-expressions. The car of each element gives a tag name and the +-cdr gives a list of Elisp expressions that modify the tag. If +-the list is empty, the tag will simply be hidden. Otherwise, +-each expression will be evaluated in order: for the first +-expression, the variable `tag' will be bound to the tag name; for +-each later expression, the variable `tag' will be bound to the +-result of the previous expression. In this way, each expression +-can build on the formatting performed by the previous expression. +-The result of the last expression will displayed in place of the +-tag. ++This is an association list that maps from tag name regexps to ++lists of formatting expressions. The first entry whose car ++regexp-matches a tag will be used to format that tag. The regexp ++is implicitly anchored, so to match a literal tag name, just use ++that tag name (if it contains special regexp characters like ++\".\" or \"*\", these have to be escaped). The cdr of the ++matching entry gives a list of Elisp expressions that modify the ++tag. If the list is empty, the tag will simply be hidden. ++Otherwise, each expression will be evaluated in order: for the ++first expression, the variable `tag' will be bound to the tag ++name; for each later expression, the variable `tag' will be bound ++to the result of the previous expression. In this way, each ++expression can build on the formatting performed by the previous ++expression. The result of the last expression will displayed in ++place of the tag. + + For example, to replace a tag with another string, simply use + that string as a formatting expression. To change the foreground +@@ -56,7 +60,7 @@ (defcustom notmuch-tag-formats + + :group 'notmuch-search + :group 'notmuch-show +- :type '(alist :key-type (string :tag "Tag") ++ :type '(alist :key-type (regexp :tag "Tag") + :extra-offset -3 + :value-type + (radio :format "%v" +@@ -135,18 +139,44 @@ (defun notmuch-tag-tag-icon () + + ") + ++(defvar notmuch-tag--format-cache (make-hash-table :test 'equal) ++ "Cache of tag format lookup. Internal to `notmuch-tag-format-tag'.") ++ ++(defun notmuch-tag-clear-cache () ++ "Clear the internal cache of tag formats." ++ (clrhash notmuch-tag--format-cache)) ++ + (defun notmuch-tag-format-tag (tag) +- "Format TAG by looking into `notmuch-tag-formats'." +- (let ((formats (assoc tag notmuch-tag-formats))) +- (cond +- ((null formats) ;; - Tag not in `notmuch-tag-formats', +- tag) ;; the format is the tag itself. +- ((null (cdr formats)) ;; - Tag was deliberately hidden, +- nil) ;; no format must be returned +- (t ;; - Tag was found and has formats, +- (let ((tag tag)) ;; we must apply all the formats. +- (dolist (format (cdr formats) tag) +- (setq tag (eval format)))))))) ++ "Format TAG by according to `notmuch-tag-formats'. ++ ++Callers must ensure that the tag format cache has been recently cleared ++via `notmuch-tag-clear-cache' before using this function. For example, ++it would be appropriate to clear the cache just prior to filling a ++buffer that uses formatted tags." ++ ++ (let ((formatted (gethash tag notmuch-tag--format-cache 'missing))) ++ (when (eq formatted 'missing) ++ (let* ((formats ++ (save-match-data ++ ;; Don't use assoc-default since there's no way to ++ ;; distinguish a missing key from a present key with a ++ ;; null cdr:. ++ (assoc* tag notmuch-tag-formats ++ :test (lambda (tag key) ++ (and (eq (string-match key tag) 0) ++ (= (match-end 0) (length tag)))))))) ++ (setq formatted ++ (cond ++ ((null formats) ;; - Tag not in `notmuch-tag-formats', ++ tag) ;; the format is the tag itself. ++ ((null (cdr formats)) ;; - Tag was deliberately hidden, ++ nil) ;; no format must be returned ++ (t ;; - Tag was found and has formats, ++ (let ((tag tag)) ;; we must apply all the formats. ++ (dolist (format (cdr formats) tag) ++ (setq tag (eval format))))))) ++ (puthash tag formatted notmuch-tag--format-cache))) ++ formatted)) + + (defun notmuch-tag-format-tags (tags &optional face) + "Return a string representing formatted TAGS." +diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el +index e3aa2cd..c78d9de 100644 +--- a/emacs/notmuch-tree.el ++++ b/emacs/notmuch-tree.el +@@ -881,6 +881,7 @@ (defun notmuch-tree-worker (basic-query &optional query-context target open-targ + (message-arg "--entire-thread")) + (if (equal (car (process-lines notmuch-command "count" search-args)) "0") + (setq search-args basic-query)) ++ (notmuch-tag-clear-cache) + (let ((proc (notmuch-start-notmuch + "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel + "show" "--body=false" "--format=sexp" +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 5cddaac..93a6d8b 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -888,6 +888,7 @@ (defun notmuch-search (&optional query oldest-first target-thread target-line) + (set 'notmuch-search-oldest-first oldest-first) + (set 'notmuch-search-target-thread target-thread) + (set 'notmuch-search-target-line target-line) ++ (notmuch-tag-clear-cache) + (let ((proc (get-buffer-process (current-buffer))) + (inhibit-read-only t)) + (if proc +-- +1.7.10.4 +