From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/59340 Path: main.gmane.org!not-for-mail From: Nelson Ferreira Newsgroups: gmane.emacs.gnus.general,gmane.emacs.devel Subject: Re: [PATCH] Load spam-stat hashtable only when there are changes in the disk file Date: Sun, 05 Dec 2004 16:41:44 -0500 Organization: - none - Message-ID: References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: sea.gmane.org 1102282970 8591 80.91.229.6 (5 Dec 2004 21:42:50 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 5 Dec 2004 21:42:50 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: ding-owner+M7880@lists.math.uh.edu Sun Dec 05 22:42:43 2004 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13] ident=mail) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Cb49T-0000j9-00 for ; Sun, 05 Dec 2004 22:42:43 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu ident=lists) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1Cb490-0005uQ-00; Sun, 05 Dec 2004 15:42:14 -0600 Original-Received: from util2.math.uh.edu ([129.7.128.23]) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1Cb48r-0005tw-00 for ding@lists.math.uh.edu; Sun, 05 Dec 2004 15:42:05 -0600 Original-Received: from justine.libertine.org ([66.139.78.221] ident=postfix) by util2.math.uh.edu with esmtp (Exim 4.30) id 1Cb48m-0000P8-JE for ding@lists.math.uh.edu; Sun, 05 Dec 2004 15:42:00 -0600 Original-Received: from main.gmane.org (main.gmane.org [80.91.229.2]) by justine.libertine.org (Postfix) with ESMTP id 5F6353A0036 for ; Sun, 5 Dec 2004 15:41:59 -0600 (CST) Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1Cb48k-0007kV-00 for ; Sun, 05 Dec 2004 22:41:58 +0100 Original-Received: from pool-68-237-71-238.ny325.east.verizon.net ([68.237.71.238]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Dec 2004 22:41:58 +0100 Original-Received: from nelson.ferreira by pool-68-237-71-238.ny325.east.verizon.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 05 Dec 2004 22:41:58 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-To: ding@gnus.org Original-Lines: 103 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: pool-68-237-71-238.ny325.east.verizon.net User-Agent: Gnus/5.110003 (No Gnus v0.3) XEmacs/21.5 (chestnut, linux) Cancel-Lock: sha1:opdVxpGJKl36/Y/zHvs2NKyg41o= Precedence: bulk Original-Sender: ding-owner@lists.math.uh.edu Xref: main.gmane.org gmane.emacs.gnus.general:59340 gmane.emacs.devel:30719 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:59340 --=-=-= "Nelson" == Nelson Ferreira writes: Nelson> This patch prevents spam-stat from doing unnecessary loads Nelson> of the hashtable to memory. Nelson> 2004-12-05 Nelson Ferreira Nelson> * spam-stat.el (spam-stat-save): Load the hashtable from Nelson> disk only Nelson> if there is no hashtable in memory or file Nelson> modification time is newer than cached timestamp. My coding-system settings made the ChangeLog diff to ruin the iso-2022-7 coding. Here is a correct patch. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=gnus-spam-stat.el.patch Content-Description: Load spam-stat hashtable only when there are changes in the disk file Index: lisp/ChangeLog =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v retrieving revision 7.554 diff -u -u -b -r7.554 ChangeLog --- lisp/ChangeLog 3 Dec 2004 15:58:17 -0000 7.554 +++ lisp/ChangeLog 5 Dec 2004 21:40:55 -0000 @@ -1,3 +1,9 @@ +2004-12-05 Nelson Ferreira + + * spam-stat.el (spam-stat-save): Load the hashtable from disk only + if there is no hashtable in memory or file modification time is + newer than cached timestamp. + 2004-12-03 Reiner Steib * gnus-sum.el (gnus-summary-limit-to-recipient): Implement Index: lisp/spam-stat.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/spam-stat.el,v retrieving revision 7.19 diff -u -u -b -r7.19 spam-stat.el --- lisp/spam-stat.el 2 Nov 2004 02:54:22 -0000 7.19 +++ lisp/spam-stat.el 5 Dec 2004 21:40:55 -0000 @@ -186,6 +186,9 @@ this filter, re-training spam-stat with several thousand messages will start to take a very long time.") +(defvar spam-stat-last-saved-at nil + "Time stamp of last change of spam-stat-file on this run") + (defvar spam-stat-syntax-table (let ((table (copy-syntax-table text-mode-syntax-table))) (modify-syntax-entry ?- "w" table) @@ -389,6 +392,7 @@ (interactive "P") (when (or force spam-stat-dirty) (let ((coding-system-for-write spam-stat-coding-system)) + (message "Saving %s..." spam-stat-file) (with-temp-file spam-stat-file (let ((standard-output (current-buffer)) (font-lock-maximum-size 0)) @@ -401,14 +405,25 @@ (spam-stat-bad entry)))) spam-stat) (insert ")))")))) - (setq spam-stat-dirty nil))) + (message "Saved %s." spam-stat-file) + (setq spam-stat-dirty nil + spam-stat-last-saved-at (nth 5 (file-attributes spam-stat-file))))) (defun spam-stat-load () "Read the `spam-stat' hash table from disk." ;; TODO: maybe we should warn the user if spam-stat-dirty is t? (let ((coding-system-for-read spam-stat-coding-system)) - (load-file spam-stat-file)) - (setq spam-stat-dirty nil)) + (cond (spam-stat-dirty (message "Spam stat not loaded: spam-stat-dirty t")) + ((or (not (boundp 'spam-stat-last-saved-at)) + (null spam-stat-last-saved-at) + (not (equal spam-stat-last-saved-at + (nth 5 (file-attributes spam-stat-file))))) + (progn + (load-file spam-stat-file) + (setq spam-stat-dirty nil + spam-stat-last-saved-at + (nth 5 (file-attributes spam-stat-file))))) + (t (message "Spam stat file not loaded: no change in disk.."))))) (defun spam-stat-to-hash-table (entries) "Turn list ENTRIES into a hash table and store as `spam-stat'. --=-=-= -- Nelson Ferreira --=-=-=--