Changeset 5112:4411620e877b for imap

Timestamp:

2007-04-10 16:07:53 (20 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Do not hold hcache open while mailbox is open - it can lead to lockups

Location:

imap

Files:

• imap.c (modified) (6 diffs)
• imap_private.h (modified) (1 diff)
• message.c (modified) (4 diffs)
• util.c (modified) (3 diffs)

imap/imap.c

@@ -249 +249 @@
   int i, cacheno;
 
+#ifdef USE_HCACHE
+  imap_hcache_open (idata);
+#endif
+
   for (i = 0; i < idata->ctx->msgcount; i++)
   {
@@ -277 +281 @@
     }
   }
+
+#if USE_HCACHE
+  imap_hcache_close (idata);
+#endif
 
   /* We may be called on to expunge at any time. We can't rely on the caller
@@ -735 +743 @@
   ctx->v2r = safe_calloc (count, sizeof (int));
   ctx->msgcount = 0;
-#ifdef USE_HCACHE
-  idata->hcache = imap_hcache_open (idata, idata->ctx->path);
-#endif
+
   if (count && (imap_read_headers (idata, 0, count-1) < 0))
   {
@@ -1140 +1146 @@
   }
 
+#if USE_HCACHE
+  imap_hcache_open (idata);
+#endif
+
   /* save messages with real (non-flag) changes */
   for (n = 0; n < ctx->msgcount; n++)
@@ -1175 +1185 @@
   }
 
+#if USE_HCACHE
+  imap_hcache_close (idata);
+#endif
+
   /* sync +/- flags for the five flags mutt cares about */
   rc = 0;
@@ -1308 +1322 @@
   }
 
-#ifdef USE_HCACHE
-  mutt_hcache_close (idata->hcache);
-  idata->hcache = NULL;
-#endif
   mutt_bcache_close (&idata->bcache);
 

imap/imap_private.h

@@ -260 +260 @@
 /* util.c */
 #ifdef USE_HCACHE
-header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path);
+int imap_hcache_open (IMAP_DATA* idata);
+void imap_hcache_close (IMAP_DATA* idata);
 HEADER* imap_hcache_get (IMAP_DATA* idata, unsigned int uid);
 int imap_hcache_put (IMAP_DATA* idata, HEADER* h);

imap/message.c

@@ -120 +120 @@
 
 #if USE_HCACHE
+  imap_hcache_open (idata);
+
   if (idata->hcache && !msgbegin)
   {
@@ -200 +202 @@
         if (h.data)
           imap_free_header_data ((void**) (void*) &h.data);
+        imap_hcache_close (idata);
         fclose (fp);
         return -1;
@@ -301 +304 @@
       if (h.data)
         imap_free_header_data ((void**) (void*) &h.data);
+#if USE_HCACHE
+      imap_hcache_close (idata);
+#endif
       fclose (fp);
       return -1;
@@ -330 +336 @@
     mutt_hcache_store_raw (idata->hcache, "/UIDNEXT", &idata->uidnext,
                            sizeof (idata->uidnext), imap_hcache_keylen);
+
+  imap_hcache_close (idata);
 #endif /* USE_HCACHE */
 

imap/util.c

@@ -72 +72 @@
 
 #ifdef USE_HCACHE
-header_cache_t* imap_hcache_open (IMAP_DATA* idata, const char* path)
+int imap_hcache_open (IMAP_DATA* idata)
 {
   IMAP_MBOX mx;
@@ -78 +78 @@
   char cachepath[LONG_STRING];
 
-  if (imap_parse_path (path, &mx) < 0)
-    return NULL;
+  if (imap_parse_path (idata->ctx->path, &mx) < 0)
+    return -1;
 
   mutt_account_tourl (&idata->conn->account, &url);
@@ -86 +86 @@
   FREE (&mx.mbox);
 
-  return mutt_hcache_open (HeaderCache, cachepath);
+  idata->hcache = mutt_hcache_open (HeaderCache, cachepath);
+
+  return idata->hcache != NULL ? 0 : -1;
+}
+
+void imap_hcache_close (IMAP_DATA* idata)
+{
+  if (!idata->hcache)
+    return;
+
+  mutt_hcache_close (idata->hcache);
+  idata->hcache = NULL;
 }