2006-10-23 Marcus Brinkmann <marcus@g10code.de>

	* wait-global.c (gpgme_wait): Unlock CTX_LIST_LOCK while calling
	_gpgme_engine_io_event().

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 9dce5958a97470254da29256991c75208e2d3263..f3b78b5b2181fea69a8e3f2bf383ea0312fde9b5 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-23  Marcus Brinkmann  <marcus@g10code.de>
 
+       * wait-global.c (gpgme_wait): Unlock CTX_LIST_LOCK while calling
+       _gpgme_engine_io_event().
+
        * keylist.c (gpgme_op_keylist_next): Return error if OPD is NULL.
 
 2006-09-25  Marcus Brinkmann  <marcus@g10code.de>

diff --git a/gpgme/wait-global.c b/gpgme/wait-global.c
index a6da116e6d5684ca052a54deaf21126f52259b9c..3b1e3d9af8e0f4826307e842640da7ea527a1a7c 100644 (file)
--- a/gpgme/wait-global.c
+++ b/gpgme/wait-global.c
@@ -334,6 +334,7 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error_t *status, int hang)
 
       /* Now some contexts might have finished successfully.  */
       LOCK (ctx_list_lock);
+    retry:
       for (li = ctx_active_list; li; li = li->next)
        {
          gpgme_ctx_t actx = li->ctx;
@@ -344,7 +345,19 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error_t *status, int hang)
          if (i == actx->fdt.size)
            {
              gpgme_error_t err = 0;
+
+             /* FIXME: This does not perform too well.  We have to
+                release the lock because the I/O event handler
+                acquires it to remove the context from the active
+                list.  Two alternative strategies are worth
+                considering: Either implement the DONE event handler
+                here in a lock-free manner, or save a list of all
+                contexts to be released and call the DONE events
+                afterwards.  */
+             UNLOCK (ctx_list_lock);
              _gpgme_engine_io_event (actx->engine, GPGME_EVENT_DONE, &err);
+             LOCK (ctx_list_lock);
+             goto retry;
            }
        }
       UNLOCK (ctx_list_lock);