Changeset 5495:36aa1130091a for imap

Timestamp:

2008-08-25 00:52:17 (3 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Introduce $imap_pipeline_depth.
This lets users control the number of commands that mutt will queue up
before sending them to the server. Setting this to 0 disables
pipelining, which should close #2892.

Location:

imap

Files:

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

imap/command.c

@@ -158 +158 @@
         {
           /* first command in queue has finished - move queue pointer up */
-          idata->lastcmd = (idata->lastcmd + 1) % IMAP_PIPELINE_DEPTH;
+          idata->lastcmd = (idata->lastcmd + 1) % idata->cmdslots;
         }
         cmd->state = cmd_status (idata->buf);
@@ -169 +169 @@
     }
 
-    c = (c + 1) % IMAP_PIPELINE_DEPTH;
+    c = (c + 1) % idata->cmdslots;
   }
   while (c != idata->nextcmd);
@@ -309 +309 @@
 static int cmd_queue_full (IMAP_DATA* idata)
 {
-  if ((idata->nextcmd + 1) % IMAP_PIPELINE_DEPTH == idata->lastcmd)
+  if ((idata->nextcmd + 1) % idata->cmdslots == idata->lastcmd)
     return 1;
 
@@ -328 +328 @@
 
   cmd = idata->cmds + idata->nextcmd;
-  idata->nextcmd = (idata->nextcmd + 1) % IMAP_PIPELINE_DEPTH;
+  idata->nextcmd = (idata->nextcmd + 1) % idata->cmdslots;
 
   snprintf (cmd->seq, sizeof (cmd->seq), "a%04u", idata->seqno++);

imap/imap.c

@@ -487 +487 @@
   idata->state = IMAP_DISCONNECTED;
   idata->seqno = idata->nextcmd = idata->lastcmd = idata->status = 0;
-  memset (idata->cmds, 0, sizeof (IMAP_COMMAND) * IMAP_PIPELINE_DEPTH);
+  memset (idata->cmds, 0, sizeof (IMAP_COMMAND) * idata->cmdslots);
 }
 

imap/imap_private.h

@@ -54 +54 @@
 /* number of entries in the hash table */
 #define IMAP_CACHE_LEN 10
-
-/* number of commands that can be batched into a single request
- * ( - 1, for the easy way to detect ring buffer wrap) */
-#define IMAP_PIPELINE_DEPTH 15
 
 #define SEQLEN 5
@@ -191 +187 @@
 
   /* command queue */
-  IMAP_COMMAND cmds[IMAP_PIPELINE_DEPTH];
+  IMAP_COMMAND* cmds;
+  int cmdslots;
   int nextcmd;
   int lastcmd;

imap/util.c

@@ -355 +355 @@
     FREE (&idata);
 
+  idata->cmdslots = ImapPipelineDepth + 2;
+  if (!(idata->cmds = safe_calloc(idata->cmdslots, sizeof(*idata->cmds))))
+  {
+    mutt_buffer_free(&idata->cmdbuf);
+    FREE (&idata);
+  }
+
   return idata;
 }
@@ -370 +377 @@
   FREE (&(*idata)->buf);
   mutt_bcache_close (&(*idata)->bcache);
+  FREE (&(*idata)->cmds);
   FREE (idata);         /* __FREE_CHECKED__ */
 }