From 1c6f5ea68515f8809d0d2f95bab035e9481c7d80 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 19 Feb 2014 20:20:06 +0000 Subject: [PATCH] [PATCH v2 1/7] Make keys of notmuch-tag-formats regexps and use caching --- f2/4f1cf73aff8541b6c753c7ecfd149fdd4748db | 228 ++++++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 f2/4f1cf73aff8541b6c753c7ecfd149fdd4748db diff --git a/f2/4f1cf73aff8541b6c753c7ecfd149fdd4748db b/f2/4f1cf73aff8541b6c753c7ecfd149fdd4748db new file mode 100644 index 000000000..7e3090bc8 --- /dev/null +++ b/f2/4f1cf73aff8541b6c753c7ecfd149fdd4748db @@ -0,0 +1,228 @@ +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 A9D62431FD7 + for ; Wed, 19 Feb 2014 12:20:44 -0800 (PST) +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 znDtdC0MIKF7 for ; + Wed, 19 Feb 2014 12:20:39 -0800 (PST) +Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com + [74.125.82.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + B58FB431FBD for ; Wed, 19 Feb 2014 12:20:33 -0800 + (PST) +Received: by mail-wg0-f47.google.com with SMTP id k14so745581wgh.2 + for ; Wed, 19 Feb 2014 12:20:31 -0800 (PST) +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=400vgAVsKSjcDn7RluxqJMmbNbKI+Wu6OskJ/JDeyWU=; + b=qdbWOFe1ErxnSCGe95XI91SIl9e1xO/tgttvBO38CZ3fiOaUDDL2ohy9tpOgSKhjL7 + J5Kcaw0S1Wt54w2yMpPI5DvmWWQOgw9SFuBr2CmJ4YWWbGz7Qjz671GiPSHw/RRjtbXj + +wP81HCu1U8x8TjtXBcHaMNw2kHDKbCOZyUHVp3feO+FA1ktnygvs+oty5yhu1zLECE2 + hBF/C7nEvAzfQC2k0sjGuvkUI8Hrr6Ipkybit51fPl91cZCXaEYUiDVPBfibrbXajfpH + S5xv8mGCEIeYpjjMyejOB0I+x1vzPZc+FcO8oyOEY/tUaTDAeAeIP1/D7NfpC4wBETQW + MxOg== +X-Received: by 10.194.110.41 with SMTP id hx9mr30734009wjb.28.1392841230963; + Wed, 19 Feb 2014 12:20:30 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id fo6sm4686478wib.7.2014.02.19.12.20.29 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Wed, 19 Feb 2014 12:20:30 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2 1/7] Make keys of notmuch-tag-formats regexps and use + caching +Date: Wed, 19 Feb 2014 20:20:06 +0000 +Message-Id: <1392841212-8494-2-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1392841212-8494-1-git-send-email-markwalters1009@gmail.com> +References: <1392841212-8494-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: Wed, 19 Feb 2014 20:20:44 -0000 + +From: Austin Clements + +This patch switches notmuch-tag-formats to use regexps with caching +for performance. + +We have to clear the cache somehow on changes to notmuch-tag-formats. +This version takes the simplest approach: search/show/tree all clear +the cache whenever they start loading. + +We cannot use assoc-default since there's no way to distinguish a +missing key from a present key with a null cdr: thus, we use assoc* +from cl instead. + +Performance-wise, the caching of regexp lookup makes this at least as +fast as the previous code using assoc (see +id:1392226351-31440-1-git-send-email-amdragon@mit.edu for timing +details). +--- + emacs/notmuch-show.el | 1 + + emacs/notmuch-tag.el | 70 +++++++++++++++++++++++++++++++++--------------- + emacs/notmuch-tree.el | 1 + + emacs/notmuch.el | 1 + + 4 files changed, 51 insertions(+), 22 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 1ac80ca..4bddf6c 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1145,6 +1145,7 @@ function is used." + ;; 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 908e7ad..47e0205 100644 +--- a/emacs/notmuch-tag.el ++++ b/emacs/notmuch-tag.el +@@ -28,23 +28,39 @@ + (require 'crm) + (require 'notmuch-lib) + ++;; (notmuch-tag-clear-cache will be called by the defcustom ++;; notmuch-tag-formats, so it has to be defined first.) ++ ++(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. ++ ++This must be called after changes to `notmuch-tag-formats'." ++ (clrhash notmuch-tag--format-cache)) ++ + (defcustom notmuch-tag-formats + '(("unread" (propertize tag 'face '(:foreground "red"))) + ("flagged" (propertize tag 'face '(:foreground "blue")) + (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 +72,7 @@ with images." + + :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" +@@ -137,16 +153,26 @@ This can be used with `notmuch-tag-format-image-data'." + + (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)))))))) ++ (let ((formatted (gethash tag notmuch-tag--format-cache 'missing))) ++ (when (eq formatted 'missing) ++ (let* ((formats ++ (save-match-data ++ (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 4f2ac02..a106e09 100644 +--- a/emacs/notmuch-tree.el ++++ b/emacs/notmuch-tree.el +@@ -881,6 +881,7 @@ the same as for the function notmuch-tree." + (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 0471750..0c767f7 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -888,6 +888,7 @@ the configured default sort order." + (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.9.1 + -- 2.26.2