Hi again,
here is the current imap / maildir header cache. Please consider this
for inclusion into upstream.
Honestly,
Thomas
--
Thomas Glanzmann ++49 (0) 9131 85-27574 Department of Computer Science III
Martensstrasse 3 D-91058 Erlangen Germany University of Erlangen-Nuremberg
http://www3.informatik.uni-erlangen.de/Research/UMLinux/
diff -Nru a/Makefile.am b/Makefile.am
--- a/Makefile.am 2004-07-26 10:29:37 +02:00
+++ b/Makefile.am 2004-07-26 10:29:37 +02:00
@@ -63,7 +63,7 @@
pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
- pgppacket.c mutt_idna.h
+ pgppacket.c mutt_idna.h hcache.c
EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
configure acconfig.h account.h \
diff -Nru a/configure.in b/configure.in
--- a/configure.in 2004-07-26 10:29:37 +02:00
+++ b/configure.in 2004-07-26 10:29:37 +02:00
@@ -768,6 +768,81 @@
fi])
+dnl -- start cache --
+AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching for
Maildir folders],
+[if test x$enableval = xyes; then
+ AC_DEFINE(USE_HCACHE, 1, [Enable header caching for Maildir style
mailboxes])
+ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS hcache.o"
+
+ OLDCPPFLAGS="$CPPFLAGS"
+ OLDLIBS="$LIBS"
+
+ BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1
db41 db"
+
+ AC_MSG_CHECKING([for BerkeleyDB > 4.0])
+
+ for d in /opt/csw/bdb4 /opt /usr/local /usr; do
+ for v in `echo $BDB_VERSIONS .`; do
+ if test -r "$d/include/$v/db.h"; then
+ BDB_INCLUDE_DIR="$d/include/$v"
+ break
+ fi
+ done
+ for v in `echo $BDB_VERSIONS .`; do
+ if test -d "$d/lib/$v"; then
+ BDB_LIB_DIR="$d/lib/$v"
+ break
+ fi
+ done
+ for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do
+ test -r "$d/$v/include/db.h" && BDB_INCLUDE_DIR="$d/$v/include"
+ test -d "$d/$v/lib" && BDB_LIB_DIR="$d/$v/lib"
+ done
+ test x$BDB_INCLUDE_DIR = x -o x$BDB_LIB_DIR = x && continue
+ for v in `echo $BDB_VERSIONS`; do
+ CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
+ LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$v"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdlib.h>
+ #include <db.h>
+ ]],[[
+ DB *db = NULL;
+ db->open(db,NULL,NULL,NULL,0,0,0);
+ ]])],[
+ ac_cv_dbcreate=yes
+ BDB_LIB="$v"
+ break
+ ])
+ done
+ test x$BDB_LIB != x && break
+ done
+
+ if test x$ac_cv_dbcreate = xyes; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ CPPFLAGS="$OLDCPPFLAGS"
+ LIBS="$OLDLIBS -lgdbm";
+ AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,
+ [ac_cv_gdbmopen=no
+ AC_TRY_LINK([#include
<gdbm.h>],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes])])
+
+ if test x$ac_cv_dbcreate = xyes; then
+ CPPFLAGS="$OLDCPPFLAGS -I$BDB_INCLUDE_DIR"
+ LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
+ AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support])
+ elif test x$ac_cv_gdbmopen = xyes; then
+ CPPFLAGS="$OLDCPPFLAGS"
+ LIBS="$OLDLIBS -lgdbm";
+ AC_DEFINE(HAVE_GDBM, 1, [GDBM Support])
+ else
+ AC_MSG_ERROR(You need Sleepycat DB4 or GDBM for --enable-hcache)
+ fi
+fi])
+dnl -- end cache --
+
AC_SUBST(MUTTLIBS)
AC_SUBST(MUTT_LIB_OBJECTS)
AC_SUBST(LIBIMAP)
diff -Nru a/globals.h b/globals.h
--- a/globals.h 2004-07-26 10:29:37 +02:00
+++ b/globals.h 2004-07-26 10:29:37 +02:00
@@ -65,6 +65,10 @@
WHERE char *Locale;
WHERE char *MailcapPath;
WHERE char *Maildir;
+#if USE_HCACHE
+WHERE char *HeaderCache;
+WHERE short HeaderCachePageSize;
+#endif
WHERE char *MhFlagged;
WHERE char *MhReplied;
WHERE char *MhUnseen;
diff -Nru a/hcache.c b/hcache.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/hcache.c 2004-07-26 10:29:37 +02:00
@@ -0,0 +1,787 @@
+/*
+ * Copyright (C) 2004 Thomas Glanzmann <sithglan@xxxxxxxxxxxxxxxxxxxx>
+ * Copyright (C) 2004 Tobias Werth <sitowert@xxxxxxxxxxxxxxxxxxxx>
+ * Copyright (C) 2004 Brian Fundakowski Feldman <green@xxxxxxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#if HAVE_GDBM
+#include <gdbm.h>
+#elif HAVE_DB4
+#include <db.h>
+#endif
+
+#include <errno.h>
+#include <fcntl.h>
+#include "mutt.h"
+#include "message.h"
+#include "mime.h"
+#include "mx.h"
+#include "lib.h"
+
+#if HAVE_GDBM
+static struct
+header_cache
+{
+ GDBM_FILE db;
+ char *folder;
+ unsigned int crc;
+} HEADER_CACHE;
+#elif HAVE_DB4
+static struct
+header_cache
+{
+ DB_ENV *env;
+ DB *db;
+ unsigned int crc;
+} HEADER_CACHE;
+#endif
+
+typedef union
+{
+ struct timeval timeval;
+ unsigned long long uid_validity;
+} validate;
+
+static unsigned char *
+dump_int(unsigned int i, unsigned char *d, int *off)
+{
+ safe_realloc(&d, *off + sizeof(int));
+ memcpy(d + *off, &i, sizeof(int));
+ (*off) += sizeof(int);
+
+ return d;
+}
+
+static void
+restore_int(unsigned int *i, const unsigned char *d, int *off)
+{
+ memcpy(i, d + *off, sizeof(int));
+ (*off) += sizeof(int);
+}
+
+static unsigned char *
+dump_char(char *c, unsigned char *d, int *off)
+{
+ unsigned int size;
+
+ if (c == NULL) {
+ size = 0;
+ d = dump_int(size, d, off);
+ return d;
+ }
+
+ size = mutt_strlen(c) + 1;
+ d = dump_int(size, d, off);
+ safe_realloc(&d, *off + size);
+ memcpy(d + *off, c, size);
+ *off += size;
+
+ return d;
+}
+
+static unsigned char *
+dump_char_size(char *c, unsigned char *d, int *off, ssize_t size)
+{
+ if (c == NULL) {
+ size = 0;
+ d = dump_int(size, d, off);
+ return d;
+ }
+
+ d = dump_int(size, d, off);
+ safe_realloc(&d, *off + size);
+ memcpy(d + *off, c, size);
+ *off += size;
+
+ return d;
+}
+
+static void
+restore_char(char **c, const unsigned char *d, int *off)
+{
+ unsigned int size;
+ restore_int(&size, d, off);
+
+ if (size == 0) {
+ *c = NULL;
+ return;
+ }
+
+ *c = safe_malloc(size);
+ memcpy(*c, d + *off, size);
+ *off += size;
+}
+
+static unsigned char *
+dump_address(ADDRESS *a, unsigned char *d, int *off)
+{
+ unsigned int counter = 0;
+ unsigned int start_off = *off;
+
+ d = dump_int(0xdeadbeef, d, off);
+
+ while (a) {
+#ifdef EXACT_ADDRESS
+ d = dump_char(a->val, d, off);
+#endif
+ d = dump_char(a->personal, d, off);
+ d = dump_char(a->mailbox, d, off);
+ d = dump_int(a->group, d, off);
+ a = a->next;
+ counter++;
+ }
+
+ memcpy(d + start_off, &counter, sizeof(int));
+
+ return d;
+}
+
+static void
+restore_address(ADDRESS **a, const unsigned char *d, int *off)
+{
+ unsigned int counter;
+
+ restore_int(&counter, d, off);
+
+ while (counter) {
+ *a = safe_malloc(sizeof(ADDRESS));
+#ifdef EXACT_ADDRESS
+ restore_char(&(*a)->val, d, off);
+#endif
+ restore_char(&(*a)->personal, d, off);
+ restore_char(&(*a)->mailbox, d, off);
+ restore_int((unsigned int *)&(*a)->group, d, off);
+ a = &(*a)->next;
+ counter--;
+ }
+
+ *a = NULL;
+}
+
+static unsigned char *
+dump_list(LIST *l, unsigned char *d, int *off)
+{
+ unsigned int counter = 0;
+ unsigned int start_off = *off;
+
+ d = dump_int(0xdeadbeef, d, off);
+
+ while (l) {
+ d = dump_char(l->data, d, off);
+ l = l->next;
+ counter++;
+ }
+
+ memcpy(d + start_off, &counter, sizeof(int));
+
+ return d;
+}
+
+static void
+restore_list(LIST **l, const unsigned char *d, int *off)
+{
+ unsigned int counter;
+
+ restore_int(&counter, d, off);
+
+ while (counter) {
+ *l = safe_malloc(sizeof(LIST));
+ restore_char(&(*l)->data, d, off);
+ l = &(*l)->next;
+ counter--;
+ }
+
+ *l = NULL;
+}
+
+static unsigned char *
+dump_buffer(BUFFER *b, unsigned char *d, int *off)
+{
+ if (! b) {
+ d = dump_int(0, d, off);
+ return d;
+ } else {
+ d = dump_int(1, d, off);
+ }
+
+ d = dump_char_size(b->data, d, off, b->dsize + 1);
+ d = dump_int(b->dptr - b->data, d, off);
+ d = dump_int(b->dsize, d, off);
+ d = dump_int(b->destroy, d, off);
+
+ return d;
+}
+
+static void
+restore_buffer(BUFFER **b, const unsigned char *d, int *off)
+{
+ unsigned int used;
+ unsigned int offset;
+ restore_int(&used, d, off);
+ if (! used) {
+ return;
+ }
+
+ *b = malloc(sizeof(BUFFER));
+
+ restore_char(& (*b)->data, d, off);
+ restore_int(& offset, d, off);
+ (*b)->dptr = (*b)->data + offset;
+ restore_int(& (*b)->dsize, d, off);
+ restore_int((unsigned int *) & (*b)->destroy, d, off);
+}
+
+static unsigned char *
+dump_parameter(PARAMETER *p, unsigned char *d, int *off)
+{
+ unsigned int counter = 0;
+ unsigned int start_off = *off;
+
+ d = dump_int(0xdeadbeef, d, off);
+
+ while (p) {
+ d = dump_char(p->attribute, d, off);
+ d = dump_char(p->value, d, off);
+ p = p->next;
+ counter++;
+ }
+
+ memcpy(d + start_off, &counter, sizeof(int));
+
+ return d;
+}
+
+static void
+restore_parameter(PARAMETER **p, const unsigned char *d, int *off)
+{
+ unsigned int counter;
+
+ restore_int(&counter, d, off);
+
+ while (counter) {
+ *p = safe_malloc(sizeof(PARAMETER));
+ restore_char(&(*p)->attribute, d, off);
+ restore_char(&(*p)->value, d, off);
+ p = &(*p)->next;
+ counter--;
+ }
+
+ *p = NULL;
+}
+
+static unsigned char *
+dump_body(BODY *c, unsigned char *d, int *off)
+{
+ safe_realloc(&d, *off + sizeof(BODY));
+ memcpy(d + *off, c, sizeof(BODY));
+ *off += sizeof(BODY);
+
+ d = dump_char(c->xtype, d, off);
+ d = dump_char(c->subtype, d, off);
+
+ d = dump_parameter(c->parameter, d, off);
+
+ d = dump_char(c->description, d, off);
+ d = dump_char(c->form_name, d, off);
+ d = dump_char(c->filename, d, off);
+ d = dump_char(c->d_filename, d, off);
+
+ return d;
+}
+
+static void
+restore_body(BODY *c, const unsigned char *d, int *off)
+{
+ memcpy(c, d + *off, sizeof(BODY));
+ *off += sizeof(BODY);
+
+ restore_char(& c->xtype, d, off);
+ restore_char(& c->subtype, d, off);
+
+ restore_parameter(& c->parameter, d, off);
+
+ restore_char(& c->description, d, off);
+ restore_char(& c->form_name, d, off);
+ restore_char(& c->filename, d, off);
+ restore_char(& c->d_filename, d, off);
+}
+
+static unsigned char *
+dump_envelope(ENVELOPE *e, unsigned char *d, int *off)
+{
+ d = dump_address(e->return_path, d, off);
+ d = dump_address(e->from, d, off);
+ d = dump_address(e->to, d, off);
+ d = dump_address(e->cc, d, off);
+ d = dump_address(e->bcc, d, off);
+ d = dump_address(e->sender, d, off);
+ d = dump_address(e->reply_to, d, off);
+ d = dump_address(e->mail_followup_to, d, off);
+
+ d = dump_char(e->subject, d, off);
+ if (e->real_subj) {
+ d = dump_int(e->real_subj - e->subject, d, off);
+ } else {
+ d = dump_int(-1, d, off);
+ }
+ d = dump_char(e->message_id, d, off);
+ d = dump_char(e->supersedes, d, off);
+ d = dump_char(e->date, d, off);
+ d = dump_char(e->x_label, d, off);
+
+ d = dump_buffer(e->spam, d, off);
+
+ d = dump_list(e->references, d, off);
+ d = dump_list(e->in_reply_to, d, off);
+ d = dump_list(e->userhdrs, d, off);
+
+ return d;
+}
+
+static void
+restore_envelope(ENVELOPE *e, const unsigned char *d, int *off)
+{
+ int real_subj_off;
+
+ restore_address(& e->return_path, d, off);
+ restore_address(& e->from, d, off);
+ restore_address(& e->to, d, off);
+ restore_address(& e->cc, d, off);
+ restore_address(& e->bcc, d, off);
+ restore_address(& e->sender, d, off);
+ restore_address(& e->reply_to, d, off);
+ restore_address(& e->mail_followup_to, d, off);
+
+ restore_char(& e->subject, d, off);
+ restore_int((unsigned int *) (& real_subj_off), d, off);
+ if (0 <= real_subj_off) {
+ e->real_subj = e->subject + real_subj_off;
+ } else {
+ e->real_subj = NULL;
+ }
+ restore_char(& e->message_id, d, off);
+ restore_char(& e->supersedes, d, off);
+ restore_char(& e->date, d, off);
+ restore_char(& e->x_label, d, off);
+
+ restore_buffer(& e->spam, d, off);
+
+ restore_list(& e->references, d, off);
+ restore_list(& e->in_reply_to, d, off);
+ restore_list(& e->userhdrs, d, off);
+}
+
+static
+unsigned int crc32(unsigned int crc, unsigned char const *p, size_t len)
+{
+ int i;
+ while (len--) {
+ crc ^= *p++;
+ for (i = 0; i < 8; i++)
+ crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0);
+ }
+ return crc;
+}
+
+static int
+generate_crc32()
+{
+ int crc = 0;
+ SPAM_LIST *sp = SpamList;
+ RX_LIST *rx = NoSpamList;
+
+ crc = crc32(crc, (unsigned char const *) "HCACHE V1",
mutt_strlen("HCACHE V1"));
+
+#if HAVE_LANGINFO_CODESET
+ crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset));
+ crc = crc32(crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
mutt_strlen("HAVE_LANGINFO_CODESET"));
+#endif
+
+#if EXACT_ADDRESS
+ crc = crc32(crc, (unsigned char const *) "EXACT_ADDRESS",
mutt_strlen("EXACT_ADDRESS"));
+#endif
+ while(sp) {
+ crc = crc32(crc, (unsigned char const *) sp->rx->pattern,
mutt_strlen(sp->rx->pattern));
+ sp = sp->next;
+ }
+
+ while(rx) {
+ crc = crc32(crc, (unsigned char const *) rx->rx->pattern,
mutt_strlen(rx->rx->pattern));
+ rx = rx->next;
+ }
+
+ return crc;
+}
+
+static int
+crc32_matches(const char *d, unsigned int crc)
+{
+ int off = sizeof(validate);
+ unsigned int mycrc = 0;
+
+ if (! d) {
+ return 0;
+ }
+
+ restore_int(&mycrc, (unsigned char *) d, &off);
+
+ return (crc == mycrc);
+}
+
+/* This function transforms a header into a char so that it is useable by
+ * db_store */
+static void *
+mutt_hcache_dump(void *_db, HEADER *h, int *off, unsigned long long
uid_validity)
+{
+ struct header_cache *db = _db;
+ unsigned char *d = NULL;
+ *off = 0;
+
+ d = safe_malloc(sizeof(validate));
+
+ if (uid_validity) {
+ memcpy(d, &uid_validity, sizeof(long long));
+ } else {
+ struct timeval now;
+ gettimeofday(&now, NULL);
+ memcpy(d, &now, sizeof(struct timeval));
+ }
+ *off += sizeof(validate);
+
+ d = dump_int(db->crc, d, off);
+
+ safe_realloc(&d, *off + sizeof(HEADER));
+ memcpy(d + *off, h, sizeof(HEADER));
+ *off += sizeof(HEADER);
+
+ d = dump_envelope(h->env, d, off);
+ d = dump_body(h->content, d, off);
+ d = dump_char(h->maildir_flags, d, off);
+
+ return d;
+}
+
+HEADER *
+mutt_hcache_restore(const unsigned char *d, HEADER **oh)
+{
+ int off = 0;
+ HEADER *h = mutt_new_header();
+
+ /* skip validate */
+ off += sizeof(validate);
+
+ /* skip crc */
+ off += sizeof(unsigned int);
+
+ memcpy(h, d + off, sizeof(HEADER));
+ off += sizeof(HEADER);
+
+ h->env = mutt_new_envelope();
+ restore_envelope(h->env, d, &off);
+
+ h->content = mutt_new_body();
+ restore_body(h->content, d, &off);
+
+ restore_char(&h->maildir_flags, d, &off);
+
+ /* this is needed for maildir style mailboxes */
+ if (oh) {
+ h->old = (*oh)->old;
+ h->path = safe_strdup((*oh)->path);
+ mutt_free_header (oh);
+ }
+
+ return h;
+}
+
+#if HAVE_GDBM
+
+void *
+mutt_hcache_open(const char *path, const char *folder)
+{
+ struct header_cache *h = malloc(sizeof(HEADER_CACHE));
+ h->db = NULL;
+ h->folder = safe_strdup (folder);
+ h->crc = generate_crc32();
+
+ if (! path || path[0] == '\0') {
+ return NULL;
+ }
+
+ h->db = gdbm_open((char *) path, (int) HeaderCachePageSize,
GDBM_WRCREAT, 00600, NULL);
+ if (h->db) {
+ return h;
+ }
+
+ /* if rw failed try ro */
+ h->db = gdbm_open((char *) path, (int) HeaderCachePageSize,
GDBM_READER, 00600, NULL);
+ if(h->db) {
+ return h;
+ } else {
+ FREE(& h->folder);
+ FREE(& h);
+
+ return NULL;
+ }
+}
+
+void
+mutt_hcache_close(void *db)
+{
+ struct header_cache *h = db;
+
+ if (! h) {
+ return;
+ }
+
+ gdbm_close(h->db);
+ FREE(& h->folder);
+ FREE(& h);
+}
+
+void *
+mutt_hcache_fetch(void *db, const char *filename, size_t (*keylen)(const char
*fn))
+{
+ struct header_cache *h = db;
+ datum key;
+ datum data;
+ char path[_POSIX_PATH_MAX];
+
+ if (! h) {
+ return NULL;
+ }
+
+ strncpy(path, h->folder, sizeof(path));
+ strncat(path, filename, sizeof(path) - mutt_strlen(path));
+
+ key.dptr = path;
+ key.dsize = keylen(path);
+
+ data = gdbm_fetch(h->db, key);
+
+ if (! crc32_matches(data.dptr, h->crc)) {
+ free(data.dptr);
+ return NULL;
+ }
+
+ return data.dptr;
+}
+
+int
+mutt_hcache_store(void *db, const char *filename, HEADER *header, unsigned
long long uid_validity, size_t (*keylen)(const char *fn))
+{
+ struct header_cache *h = db;
+ datum key;
+ datum data;
+ char path[_POSIX_PATH_MAX];
+ int ret;
+
+ if (! h) {
+ return -1;
+ }
+
+ strncpy(path, h->folder, sizeof(path));
+ strncat(path, filename, sizeof(path) - mutt_strlen(path));
+
+ key.dptr = path;
+ key.dsize = keylen(path);
+
+ data.dptr = mutt_hcache_dump(db, header, &data.dsize, uid_validity);
+
+ ret = gdbm_store(h->db, key, data, GDBM_REPLACE);
+
+ FREE(& data.dptr);
+
+ return ret;
+}
+
+int
+mutt_hcache_delete(void *db, const char *filename, size_t (*keylen)(const char
*fn))
+{
+ datum key;
+ struct header_cache *h = db;
+ char path[_POSIX_PATH_MAX];
+
+ if (! h) {
+ return -1;
+ }
+
+ strncpy(path, h->folder, sizeof(path));
+ strncat(path, filename, sizeof(path) - mutt_strlen(path));
+
+ key.dptr = path;
+ key.dsize = keylen(path);
+
+ return gdbm_delete(h->db, key);
+}
+#elif HAVE_DB4
+
+static void
+mutt_hcache_dbt_init(DBT *dbt, void *data, size_t len)
+{
+ dbt->data = data;
+ dbt->size = dbt->ulen = len;
+ dbt->dlen = dbt->doff = 0;
+ dbt->flags = DB_DBT_USERMEM;
+}
+
+static void
+mutt_hcache_dbt_empty_init(DBT *dbt)
+{
+ dbt->data = NULL;
+ dbt->size = dbt->ulen = dbt->dlen = dbt->doff = 0;
+ dbt->flags = 0;
+}
+
+void *
+mutt_hcache_open(const char *path, const char *folder)
+{
+ struct stat sb;
+ u_int32_t createflags = DB_CREATE;
+ int ret;
+ struct header_cache *h = malloc(sizeof(HEADER_CACHE));
+
+ h->crc = generate_crc32();
+
+ if (! path || path[0] == '\0') {
+ FREE(& h);
+ return NULL;
+ }
+
+ ret = db_env_create(&h->env, 0);
+ if (ret) {
+ FREE(& h);
+ return NULL;
+ }
+
+ ret = h->env->open(h->env, NULL, DB_INIT_MPOOL | DB_CREATE |
DB_PRIVATE, 0600);
+ if (! ret) {
+ ret = db_create(&h->db, h->env, 0);
+ if (ret) {
+ h->env->close(h->env, 0);
+ FREE(& h);
+ return NULL;
+ }
+ }
+
+ if (stat(path, &sb) != 0 && errno == ENOENT) {
+ createflags |= DB_EXCL;
+ h->db->set_pagesize(h->db, (int) HeaderCachePageSize);
+ }
+
+ ret = h->db->open(h->db, NULL, path, folder, DB_BTREE, createflags,
0600);
+ if (ret) {
+ h->db->close(h->db, 0);
+ h->env->close(h->env, 0);
+ FREE(& h);
+ return NULL;
+ }
+
+ return h;
+}
+
+void
+mutt_hcache_close(void *db)
+{
+ struct header_cache *h = db;
+ int ret;
+
+ if (! h) {
+ return;
+ }
+
+ h->db->close(h->db, 0);
+ h->env->close(h->env, 0);
+
+ FREE(& h);
+}
+
+void *
+mutt_hcache_fetch(void *db, const char *filename, size_t (*keylen)(const char
*fn))
+{
+ DBT key;
+ DBT data;
+ struct header_cache *h = db;
+
+ if (! h) {
+ return NULL;
+ }
+
+ filename++; /* skip '/' */
+
+ mutt_hcache_dbt_init(&key, (void *) filename, keylen(filename));
+ mutt_hcache_dbt_empty_init(&data);
+ data.flags = DB_DBT_MALLOC;
+
+ h->db->get(h->db, NULL, &key, &data, 0);
+
+ if (! crc32_matches(data.dptr, h->crc)) {
+ free(data.dptr);
+ return NULL;
+ }
+
+ return data.data;
+}
+
+int
+mutt_hcache_store(void *db, const char *filename, HEADER *header, unsigned
long long uid_validity, size_t (*keylen)(const char *fn))
+{
+ DBT key;
+ DBT data;
+ int ret;
+ struct header_cache *h = db;
+
+ if (! h) {
+ return -1;
+ }
+
+ filename++; /* skip '/' */
+
+ mutt_hcache_dbt_init(&key, (void *) filename, keylen(filename));
+
+ mutt_hcache_dbt_empty_init(&data);
+ data.flags = DB_DBT_USERMEM;
+ data.data = mutt_hcache_dump(db, header, (signed int *) &data.size,
uid_validity);
+ data.ulen = data.size;
+
+ ret = h->db->put(h->db, NULL, &key, &data, 0);
+
+ FREE(& data.data);
+
+ return ret;
+}
+
+int
+mutt_hcache_delete(void *db, const char *filename, size_t (*keylen)(const char
*fn))
+{
+ DBT key;
+ struct header_cache *h = db;
+
+ if (! h) {
+ return -1;
+ }
+
+ filename++; /* skip '/' */
+
+ mutt_hcache_dbt_init(&key, (void *) filename, keylen(filename));
+ return h->db->del(h->db, NULL, &key, 0);
+}
+#endif
diff -Nru a/imap/imap.c b/imap/imap.c
--- a/imap/imap.c 2004-07-26 10:29:37 +02:00
+++ b/imap/imap.c 2004-07-26 10:29:37 +02:00
@@ -602,6 +602,17 @@
if ((pc = imap_get_flags (&(idata->flags), pc)) == NULL)
goto fail;
}
+#ifdef USE_HCACHE
+ /* save UIDVALIDITY for the header cache */
+ else if (ascii_strncasecmp("OK [UIDVALIDITY", pc, 14) == 0)
+ {
+ dprint(2, (debugfile, "Getting mailbox UIDVALIDITY\n"));
+ pc += 3;
+ pc = imap_next_word(pc);
+
+ sscanf(pc, "%u", &(idata->uid_validity));
+ }
+#endif
else
{
pc = imap_next_word (pc);
diff -Nru a/imap/imap_private.h b/imap/imap_private.h
--- a/imap/imap_private.h 2004-07-26 10:29:37 +02:00
+++ b/imap/imap_private.h 2004-07-26 10:29:37 +02:00
@@ -179,6 +179,9 @@
unsigned int newMailCount;
IMAP_CACHE cache[IMAP_CACHE_LEN];
int noclose : 1;
+#ifdef USE_HCACHE
+ unsigned long long uid_validity;
+#endif
/* all folder flags - system flags AND keywords */
LIST *flags;
diff -Nru a/imap/message.c b/imap/message.c
--- a/imap/message.c 2004-07-26 10:29:37 +02:00
+++ b/imap/message.c 2004-07-26 10:29:37 +02:00
@@ -44,6 +44,283 @@
* msgno of the last message read. It will return a value other than
* msgend if mail comes in while downloading headers (in theory).
*/
+#if USE_HCACHE
+static size_t imap_hcache_keylen (const char *fn)
+{
+ return mutt_strlen(fn);
+}
+static int msg_fetch_header_fetch (CONTEXT* ctx, IMAP_HEADER* h, char* buf,
FILE* fp)
+{
+ IMAP_DATA* idata;
+ long bytes;
+ int rc = -1; /* default now is that string isn't FETCH response*/
+
+ idata = (IMAP_DATA*) ctx->data;
+
+ if (buf[0] != '*')
+ return rc;
+
+ /* skip to message number */
+ buf = imap_next_word (buf);
+ h->sid = atoi (buf);
+
+ /* find FETCH tag */
+ buf = imap_next_word (buf);
+ if (ascii_strncasecmp ("FETCH", buf, 5))
+ return rc;
+
+ rc = -2; /* we've got a FETCH response, for better or worse */
+ if (!(buf = strchr (buf, '(')))
+ return rc;
+ buf++;
+
+ if (msg_parse_fetch (h, buf) < 0) {
+ return -2;
+ }
+
+ if (!(buf = strchr (buf, ')')))
+ return rc;
+ buf++;
+
+ return 0;
+}
+
+int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
+{
+ CONTEXT* ctx;
+ char buf[LONG_STRING];
+ char hdrreq[STRING];
+ FILE *fp;
+ char tempfile[_POSIX_PATH_MAX];
+ int msgno;
+ IMAP_HEADER h;
+ int rc, mfhrc, oldmsgcount;
+ int fetchlast = 0;
+ const char *want_headers = "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES
CONTENT-TYPE IN-REPLY-TO REPLY-TO LINES X-LABEL";
+ void *hc = NULL;
+ unsigned long long *uid_validity = NULL;
+
+ char uid_buf[64];
+
+ ctx = idata->ctx;
+
+ hc = mutt_hcache_open (HeaderCache, ctx->path);
+
+ if (mutt_bit_isset (idata->capabilities,IMAP4REV1))
+ {
+ snprintf (hdrreq, sizeof (hdrreq), "BODY.PEEK[HEADER.FIELDS (%s)]",
+ want_headers);
+ }
+ else if (mutt_bit_isset (idata->capabilities,IMAP4))
+ {
+ snprintf (hdrreq, sizeof (hdrreq), "RFC822.HEADER.LINES (%s)",
+ want_headers);
+ }
+ else
+ { /* Unable to fetch headers for lower versions */
+ mutt_error _("Unable to fetch headers from this IMAP server version.");
+ mutt_sleep (2); /* pause a moment to let the user see the error */
+ mutt_hcache_close (hc);
+ return -1;
+ }
+
+ /* instead of downloading all headers and then parsing them, we parse them
+ * as they come in. */
+ mutt_mktemp (tempfile);
+ if (!(fp = safe_fopen (tempfile, "w+")))
+ {
+ mutt_error (_("Could not create temporary file %s"), tempfile);
+ mutt_sleep (2);
+ mutt_hcache_close (hc);
+ return -1;
+ }
+ unlink (tempfile);
+
+ /* make sure context has room to hold the mailbox */
+ while ((msgend) >= idata->ctx->hdrmax)
+ mx_alloc_memory (idata->ctx);
+
+ oldmsgcount = ctx->msgcount;
+ idata->reopen &= ~IMAP_NEWMAIL_PENDING;
+ idata->newMailCount = 0;
+
+ snprintf (buf, sizeof (buf),
+ "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
+ fetchlast = msgend + 1;
+
+ imap_cmd_start (idata, buf);
+
+ for (msgno = msgbegin; msgno <= msgend ; msgno++)
+ {
+ if (ReadInc && (!msgno || ((msgno+1) % ReadInc == 0)))
+ mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1,
+ msgend + 1);
+
+ rewind (fp);
+ memset (&h, 0, sizeof (h));
+ h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+ do
+ {
+ mfhrc = 0;
+
+ rc = imap_cmd_step (idata);
+ if (rc != IMAP_CMD_CONTINUE)
+ break;
+
+ if ((mfhrc = msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf,
fp)) == -1)
+ continue;
+ else if (mfhrc < 0)
+ break;
+
+ /* make sure we don't get remnants from older larger message headers */
+ fputs ("\n\n", fp);
+
+ sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
+ uid_validity = (unsigned long long *) mutt_hcache_fetch (hc, uid_buf,
&imap_hcache_keylen);
+
+ if (uid_validity != NULL
+ && *uid_validity == idata->uid_validity) {
+ ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *)
uid_validity, 0);
+ ctx->hdrs[msgno]->index = h.sid - 1;
+ if (h.sid != ctx->msgcount + 1)
+ dprint (1, (debugfile, "imap_read_headers: msgcount and
sequence ID are inconsistent!"));
+ /* messages which have not been expunged are ACTIVE (borrowed
from mh
+ * folders) */
+ ctx->hdrs[msgno]->active = 1;
+ ctx->hdrs[msgno]->read = h.read;
+ ctx->hdrs[msgno]->old = h.old;
+ ctx->hdrs[msgno]->deleted = h.deleted;
+ ctx->hdrs[msgno]->flagged = h.flagged;
+ ctx->hdrs[msgno]->replied = h.replied;
+ ctx->hdrs[msgno]->changed = h.changed;
+ /* ctx->hdrs[msgno]->received is restored from
mutt_hcache_restore */
+ ctx->hdrs[msgno]->data = (void *) (h.data);
+
+ ctx->msgcount++;
+ } else {
+ ctx->hdrs[msgno] = NULL;
+ }
+ rewind (fp);
+
+ FREE(&uid_validity);
+
+ }
+ while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
+ ((msgno + 1) >= fetchlast)));
+ }
+
+ fetchlast = msgbegin;
+
+ for (msgno = msgbegin; msgno <= msgend ; msgno++)
+ {
+ if (ReadInc && (!msgno || ((msgno+1) % ReadInc == 0)))
+ mutt_message (_("Fetching message headers... [%d/%d]"), msgno + 1,
+ msgend + 1);
+
+ if (ctx->hdrs[msgno])
+ continue;
+
+ if (msgno + 1 > fetchlast)
+ {
+ fetchlast = msgno + 1;
+ while((! ctx->hdrs[fetchlast]) && (fetchlast <= msgend))
+ fetchlast++;
+
+ snprintf (buf, sizeof (buf),
+ "FETCH %d:%d (UID FLAGS INTERNALDATE RFC822.SIZE %s)", msgno + 1,
+ fetchlast, hdrreq);
+
+ imap_cmd_start (idata, buf);
+ }
+
+
+ /* freshen fp, h */
+ rewind (fp);
+ memset (&h, 0, sizeof (h));
+ h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+
+ /* this DO loop does two things:
+ * 1. handles untagged messages, so we can try again on the same msg
+ * 2. fetches the tagged response at the end of the last message.
+ */
+ do
+ {
+ mfhrc = 0;
+
+ rc = imap_cmd_step (idata);
+ if (rc != IMAP_CMD_CONTINUE)
+ break;
+
+ if ((mfhrc = msg_fetch_header (idata->ctx, &h, idata->cmd.buf, fp)) ==
-1)
+ continue;
+ else if (mfhrc < 0)
+ break;
+
+ /* make sure we don't get remnants from older larger message headers */
+ fputs ("\n\n", fp);
+
+ /* update context with message header */
+ ctx->hdrs[msgno] = mutt_new_header ();
+
+ ctx->hdrs[msgno]->index = h.sid - 1;
+ if (h.sid != ctx->msgcount + 1)
+ dprint (1, (debugfile, "imap_read_headers: msgcount and sequence ID are
inconsistent!"));
+ /* messages which have not been expunged are ACTIVE (borrowed from mh
+ * folders) */
+ ctx->hdrs[msgno]->active = 1;
+ ctx->hdrs[msgno]->read = h.read;
+ ctx->hdrs[msgno]->old = h.old;
+ ctx->hdrs[msgno]->deleted = h.deleted;
+ ctx->hdrs[msgno]->flagged = h.flagged;
+ ctx->hdrs[msgno]->replied = h.replied;
+ ctx->hdrs[msgno]->changed = h.changed;
+ ctx->hdrs[msgno]->received = h.received;
+ ctx->hdrs[msgno]->data = (void *) (h.data);
+
+ rewind (fp);
+ /* NOTE: if Date: header is missing, mutt_read_rfc822_header depends
+ * on h.received being set */
+ ctx->hdrs[msgno]->env = mutt_read_rfc822_header (fp, ctx->hdrs[msgno],
+ 0, 0);
+ /* content built as a side-effect of mutt_read_rfc822_header */
+ ctx->hdrs[msgno]->content->length = h.content_length;
+ sprintf(uid_buf, "/%u", h.data->uid);
+ mutt_hcache_store(hc, uid_buf, ctx->hdrs[msgno], idata->uid_validity,
&imap_hcache_keylen);
+
+ ctx->msgcount++;
+ }
+ while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
+ ((msgno + 1) >= fetchlast)));
+
+ if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK)))
+ {
+ imap_free_header_data ((void**) &h.data);
+ fclose (fp);
+
+ mutt_hcache_close (hc);
+ return -1;
+ }
+ /* in case we get new mail while fetching the headers */
+ if (idata->reopen & IMAP_NEWMAIL_PENDING)
+ {
+ msgend = idata->newMailCount - 1;
+ while ((msgend) >= ctx->hdrmax)
+ mx_alloc_memory (ctx);
+ idata->reopen &= ~IMAP_NEWMAIL_PENDING;
+ idata->newMailCount = 0;
+ }
+ }
+
+ fclose(fp);
+
+ mutt_hcache_close (hc);
+
+ if (ctx->msgcount > oldmsgcount)
+ mx_update_context (ctx, ctx->msgcount - oldmsgcount);
+
+ return msgend;
+}
+#else
int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend)
{
CONTEXT* ctx;
@@ -201,6 +478,7 @@
return msgend;
}
+#endif
int imap_fetch_message (MESSAGE *msg, CONTEXT *ctx, int msgno)
{
@@ -723,6 +1001,7 @@
return s;
}
+
/* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
* Expects string beginning with * n FETCH.
diff -Nru a/init.h b/init.h
--- a/init.h 2004-07-26 10:29:37 +02:00
+++ b/init.h 2004-07-26 10:29:37 +02:00
@@ -1022,6 +1022,30 @@
** \fBDON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE
** DOING!\fP
*/
+#if USE_HCACHE
+
+ { "header_cache", DT_PATH, R_NONE, UL &HeaderCache, 0 },
+ /*
+ ** .pp
+ ** Path to the header cache file. If unset no cache will be used. Otherwise
+ ** the cache will be enabled for Maildir and IMAP mailboxes.
+ */
+ { "maildir_header_cache_verify", DT_BOOL, R_NONE, OPTHCACHEVERIFY, 1 },
+ /*
+ ** .pp
+ ** Check for Maildir unaware programs other than mutt having modified maildir
+ ** files when the header cache is in use. This incurs one stat(2) per
+ ** message every time the folder is opened.
+ */
+ { "header_cache_pagesize", DT_NUM, R_NONE, UL &HeaderCachePageSize, 16384 },
+ /*
+ ** .pp
+ ** Change the maildir header cache database page size. Too large
+ ** or too small of a page size for the common header can waste
+ ** space, memory effectiveness, or CPU time. You can use the
+ ** db_dump utility to determine the optimal page size.
+ */
+#endif /* USE_HCACHE */
{ "maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, 0 },
/*
** .pp
diff -Nru a/main.c b/main.c
--- a/main.c 2004-07-26 10:29:37 +02:00
+++ b/main.c 2004-07-26 10:29:37 +02:00
@@ -412,6 +412,12 @@
"-HAVE_GETADDRINFO "
#endif
+#if USE_HCACHE
+ "+USE_HCACHE "
+#else
+ "-USE_HCACHE "
+#endif
+
);
#ifdef ISPELL
diff -Nru a/mh.c b/mh.c
--- a/mh.c 2004-07-26 10:29:37 +02:00
+++ b/mh.c 2004-07-26 10:29:37 +02:00
@@ -779,11 +779,68 @@
return r;
}
+#if USE_HCACHE
+
+static size_t maildir_hcache_keylen (const char *fn)
+{
+ const char * p = strchr (fn, ':');
+ return p ? (size_t) (p - fn) : mutt_strlen(fn);
+}
+
/*
* This function does the second parsing pass for a maildir-style
* folder.
*/
+void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
+{
+ struct maildir *p;
+ void *hc = NULL;
+ char fn[_POSIX_PATH_MAX];
+ void *data;
+ unsigned int size;
+ struct timeval *when = NULL;
+ struct stat lastchanged;
+ int ret;
+
+ hc = mutt_hcache_open (HeaderCache, ctx->path);
+
+ for (p = md; p; p = p->next) {
+ if (! (p && p->h && !p->header_parsed)) {
+ continue;
+ }
+
+ data = mutt_hcache_fetch (hc, p->h->path + 3,
&maildir_hcache_keylen);
+ when = (struct timeval *) data;
+
+ snprintf(fn, sizeof (fn), "%s/%s", ctx->path, p->h->path);
+
+ if (option(OPTHCACHEVERIFY)) {
+ ret = stat(fn, &lastchanged);
+ } else {
+ lastchanged.st_mtime = 0;
+ ret = 0;
+ }
+
+ if (data != NULL
+ && ret == 0
+ && lastchanged.st_mtime <= when->tv_sec) {
+ p->h = mutt_hcache_restore ((unsigned char *)data,
&p->h);
+ maildir_parse_flags (p->h, fn);
+
+ } else if (maildir_parse_message (ctx->magic, fn, p->h->old,
p->h)) {
+ maildir_parse_flags(p->h, fn);
+ p->header_parsed = 1;
+ mutt_hcache_store (hc, p->h->path + 3, p->h, 0,
&maildir_hcache_keylen);
+ } else {
+ mutt_free_header (&p->h);
+ }
+ FREE(&data);
+ }
+ mutt_hcache_close (hc);
+}
+
+#else /* USE_HCACHE */
void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
{
@@ -804,7 +861,7 @@
}
}
-
+#endif /* USE_HCACHE */
/* Read a MH/maildir style mailbox.
*
@@ -1297,6 +1354,9 @@
{
char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX];
int i, j;
+#if USE_HCACHE
+ void *hc = NULL;
+#endif /* USE_HCACHE */
if (ctx->magic == M_MH)
i = mh_check_mailbox (ctx, index_hint);
@@ -1306,6 +1366,11 @@
if (i != 0)
return i;
+#if USE_HCACHE
+ if (ctx->magic == M_MAILDIR)
+ hc = mutt_hcache_open(HeaderCache, ctx->path);
+#endif /* USE_HCACHE */
+
for (i = 0; i < ctx->msgcount; i++)
{
if (ctx->hdrs[i]->deleted
@@ -1314,7 +1379,13 @@
snprintf (path, sizeof (path), "%s/%s", ctx->path, ctx->hdrs[i]->path);
if (ctx->magic == M_MAILDIR
|| (option (OPTMHPURGE) && ctx->magic == M_MH))
+ {
+#if USE_HCACHE
+ if (ctx->magic == M_MAILDIR)
+ mutt_hcache_delete (hc, ctx->hdrs[i]->path + 3,
&maildir_hcache_keylen);
+#endif /* USE_HCACHE */
unlink (path);
+ }
else if (ctx->magic == M_MH)
{
/* MH just moves files out of the way when you delete them */
@@ -1336,16 +1407,21 @@
if (ctx->magic == M_MAILDIR)
{
if (maildir_sync_message (ctx, i) == -1)
- return -1;
+ goto err;
}
else
{
if (mh_sync_message (ctx, i) == -1)
- return -1;
+ goto err;
}
}
}
+#if USE_HCACHE
+ if (ctx->magic == M_MAILDIR)
+ mutt_hcache_close (hc);
+#endif /* USE_HCACHE */
+
if (ctx->magic == M_MH)
mh_update_sequences (ctx);
@@ -1366,6 +1442,13 @@
}
return 0;
+
+err:
+#if USE_HCACHE
+ if (ctx->magic == M_MAILDIR)
+ mutt_hcache_close (hc);
+#endif /* USE_HCACHE */
+ return -1;
}
static char *maildir_canon_filename (char *dest, const char *src, size_t l)
diff -Nru a/mutt.h b/mutt.h
--- a/mutt.h 2004-07-26 10:29:37 +02:00
+++ b/mutt.h 2004-07-26 10:29:37 +02:00
@@ -352,6 +352,9 @@
OPTFORCENAME,
OPTFORWDECODE,
OPTFORWQUOTE,
+#if USE_HCACHE
+ OPTHCACHEVERIFY,
+#endif
OPTHDRS,
OPTHEADER,
OPTHELP,
diff -Nru a/protos.h b/protos.h
--- a/protos.h 2004-07-26 10:29:37 +02:00
+++ b/protos.h 2004-07-26 10:29:37 +02:00
@@ -102,6 +102,16 @@
ENVELOPE *mutt_read_rfc822_header (FILE *, HEADER *, short, short);
HEADER *mutt_dup_header (HEADER *);
+#if USE_HCACHE
+void *mutt_hcache_open(const char *path, const char *folder);
+void mutt_hcache_close(void *db);
+HEADER *mutt_hcache_restore(const unsigned char *d, HEADER **oh);
+void *mutt_hcache_fetch(void *db, const char *filename, size_t (*keylen)(const
char *fn));
+int mutt_hcache_store(void *db, const char *filename, HEADER *h, unsigned long
long uid_validity, size_t (*keylen)(const char *fn));
+int mutt_hcache_delete(void *db, const char *filename, size_t (*keylen)(const
char *fn));
+#endif /* USE_HCACHE */
+
+
ATTACHPTR **mutt_gen_attach_list (BODY *, int, ATTACHPTR **, short *, short *,
int, int);
time_t mutt_decrease_mtime (const char *, struct stat *);
Attachment:
pgp3DZPegP8kc.pgp
Description: PGP signature