Changeset 5074:d10bc7f74089

Timestamp:

2007-04-05 18:03:05 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

IMAP header cache API improvements.

Location:

imap

Files:

• imap_private.h (modified) (1 diff)
• message.c (modified) (4 diffs)
• util.c (modified) (2 diffs)

imap/imap_private.h

@@ -261 +261 @@
 #ifdef USE_HCACHE
 header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path);
+HEADER* imap_hcache_get (IMAP_DATA* idata, unsigned int uid);
+int imap_hcache_put (IMAP_DATA* idata, HEADER* h);
 #endif
 

imap/message.c

@@ -79 +79 @@
   unsigned int *uidnext = NULL;
   int evalhc = 0;
-  char uid_buf[64];
 #endif /* USE_HCACHE */
 
@@ -169 +168 @@
 
         idx = h.sid - 1;
-        sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
-        uid_validity = (unsigned int*)mutt_hcache_fetch (idata->hcache, uid_buf, &imap_hcache_keylen);
-
-        if (uid_validity != NULL && *uid_validity == idata->uid_validity)
+        ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid);
+        if (ctx->hdrs[idx])
         {
-          ctx->hdrs[idx] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
           ctx->hdrs[idx]->index = idx;
           /* messages which have not been expunged are ACTIVE (borrowed from mh 
@@ -195 +191 @@
            * TODO: consider the possibility of a holey cache. */
           imap_free_header_data((void**) &h.data);
-  
-        FREE(&uid_validity);
       }
       while (rc != IMAP_CMD_OK && mfhrc == -1);
@@ -294 +288 @@
 
 #if USE_HCACHE
-      sprintf(uid_buf, "/%u", h.data->uid);
-      mutt_hcache_store(idata->hcache, uid_buf, ctx->hdrs[idx], idata->uid_validity, &imap_hcache_keylen);
+      imap_hcache_put (idata, ctx->hdrs[idx]);
 #endif /* USE_HCACHE */
 

imap/util.c

@@ -29 +29 @@
 #include "mutt_ssl.h"
 #ifdef USE_HCACHE
+#include "message.h"
 #include "hcache.h"
 #endif
@@ -86 +87 @@
 
   return mutt_hcache_open (HeaderCache, cachepath);
+}
+
+HEADER* imap_hcache_get (IMAP_DATA* idata, unsigned int uid)
+{
+  char key[16];
+  unsigned int* uv;
+  HEADER* h = NULL;
+
+  sprintf(key, "/%u", uid);
+  uv = (unsigned int*)mutt_hcache_fetch (idata->hcache, key,
+                                         imap_hcache_keylen);
+  if (uv)
+  {
+    if (*uv == idata->uid_validity)
+      h = mutt_hcache_restore ((unsigned char*)uv, NULL);
+    FREE (&uv);
+  }
+
+  return h;
+}
+
+int imap_hcache_put (IMAP_DATA* idata, HEADER* h)
+{
+  char key[16];
+
+  sprintf(key, "/%u", HEADER_DATA (h)->uid);
+  return mutt_hcache_store (idata->hcache, key, h, idata->uid_validity,
+                            imap_hcache_keylen);
 }
 #endif