[svn] GpgOL - r230 - in trunk: . src

[svn author wk]

Author: wk
Date: 2008-03-10 10:13:52 +0100 (Mon, 10 Mar 2008)
New Revision: 230

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/engine-assuan.c
   trunk/src/engine.c
Log:
Performance fixes.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-07 12:53:28 UTC (rev 229)
+++ trunk/ChangeLog	2008-03-10 09:13:52 UTC (rev 230)
@@ -1,3 +1,7 @@
+2008-03-10  Werner Koch  <wk at g10code.com>
+
+	* Release 0.10.6.
+
 2008-03-07  Werner Koch  <wk at g10code.com>
 
 	* configure.ac (SVN_REVISION): New AC_DEFINE.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-03-07 12:53:28 UTC (rev 229)
+++ trunk/src/ChangeLog	2008-03-10 09:13:52 UTC (rev 230)
@@ -1,3 +1,12 @@
+2008-03-10  Werner Koch  <wk at g10code.com>
+
+	* engine.c (FILTER_BUFFER_SIZE): Increase to 4k.
+	(engine_filter, engine_wait, engine_wait): Replace Sleep by
+	SwitchToThread.
+	* engine-assuan.c (struct work_item_s): Increase buffer to 1k.
+	(worker_start_write, async_worker_thread): Replace Sleep by
+	SwitchToThread.
+
 2008-03-07  Werner Koch  <wk at g10code.com>
 
 	* mapihelp.cpp (mapi_get_sender): New.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-03-07 12:53:28 UTC (rev 229)
+++ trunk/NEWS	2008-03-10 09:13:52 UTC (rev 230)
@@ -1,9 +1,6 @@
-Noteworthy changes for version 0.10.6
+Noteworthy changes for version 0.10.6 (2008-03-10)
 ==================================================
 
- UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
-    - Under OL2007 some menu entries are missing.
-
  * More tweaks to allow processing of opaque encrypted or signed
    S/MIME.
 
@@ -18,7 +15,9 @@
 
  * Automatic protocol selection works now also with signing.
 
+ * Processing large messages is faster.
 
+
 Noteworthy changes for version 0.10.5 (2008-02-18)
 ==================================================
 

Modified: trunk/README
===================================================================
--- trunk/README	2008-03-07 12:53:28 UTC (rev 229)
+++ trunk/README	2008-03-10 09:13:52 UTC (rev 230)
@@ -1,11 +1,6 @@
 GpgOL is a GnuPG plugin for MS Outlook.
 
- UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
- UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
- UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
- UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
- UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
- UNDER HEAVY DEVELOPMENT - DO NOT USE FOR PRODUCTION!
+WARNING:  This version requires the latest Kleopatra software.
 
 
 .          Top directory with build scripts and information files.
@@ -31,8 +26,3 @@
 select "query" and there category "gpgol") if you did not found any
 information there please send a report, including all relevant version
 numbers to the address given at the top of this AUTHORS file.
-
-
-
-
-

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-03-07 12:53:28 UTC (rev 229)
+++ trunk/configure.ac	2008-03-10 09:13:52 UTC (rev 230)
@@ -17,7 +17,7 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [0.10.6])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))

Modified: trunk/src/engine-assuan.c
===================================================================
--- trunk/src/engine-assuan.c	2008-03-07 12:53:28 UTC (rev 229)
+++ trunk/src/engine-assuan.c	2008-03-10 09:13:52 UTC (rev 230)
@@ -110,7 +110,7 @@
                                     the item is removed from the
                                     queue.  */
   OVERLAPPED ov;     /* The overlapped info structure.  */
-  char buffer[128];  /* The buffer used by ReadFile or WriteFile.  */
+  char buffer[1024]; /* The buffer used by ReadFile or WriteFile.  */
 };
 
 
@@ -726,7 +726,7 @@
         {
 /*           log_debug ("%s:%s: [%s:%p] ignoring EAGAIN from callback", */
 /*                      SRCNAME, __func__, item->name, item->hd); */
-          Sleep (10);
+          SwitchToThread ();
           retval = 1;
         }
       else
@@ -990,7 +990,7 @@
         }
       LeaveCriticalSection (&work_queue_lock);
 
-      Sleep (0);
+      SwitchToThread ();
 
       EnterCriticalSection (&work_queue_lock);
       if (debug_ioworker_extra)

Modified: trunk/src/engine.c
===================================================================
--- trunk/src/engine.c	2008-03-07 12:53:28 UTC (rev 229)
+++ trunk/src/engine.c	2008-03-10 09:13:52 UTC (rev 230)
@@ -34,7 +34,7 @@
 #include "engine-assuan.h"
 
 
-#define FILTER_BUFFER_SIZE 128  /* FIXME: Increase it after testing  */
+#define FILTER_BUFFER_SIZE 4096
 
 
 #define TRACEPOINT() do { log_debug ("%s:%s:%d: tracepoint\n", \
@@ -486,7 +486,7 @@
       if (!PulseEvent (filter->in.condvar))
         log_error_w32 (-1, "%s:%s: PulseEvent(in) failed", SRCNAME, __func__);
       release_in_lock (filter, __func__);
-      Sleep (50);
+      SwitchToThread ();
     }
 
   if (debug_filter)
@@ -609,7 +609,7 @@
         more = 1;
       release_in_lock (filter, __func__);
       if (more)
-        Sleep (50);
+        SwitchToThread ();
     }
   while (more);
 
@@ -651,7 +651,7 @@
             more = 1;
           release_in_lock (filter, __func__);
           if (more)
-            Sleep (50);
+            SwitchToThread ();
         }
       while (more);
     }