[git] GPG-ERROR - branch, master, updated. libgpg-error-1.22-6-g7ed1502

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  7ed150201cc5058650cf9673a4e53720a37841c8 (commit)
      from  28fd0ab40739e8cb73f208e30f78d8aa7a0a6d19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ed150201cc5058650cf9673a4e53720a37841c8
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 15 14:59:10 2016 +0200

    tests: Fix rare deadlock condition in t-poll.
    
    * tests/t-poll.c (launch_thread): Use es_fileno before starting the
    thread.
    --
    
    GnuPG-bug-id: 2257

diff --git a/tests/t-poll.c b/tests/t-poll.c
index 56b29c8..811f895 100644
--- a/tests/t-poll.c
+++ b/tests/t-poll.c
@@ -122,19 +122,22 @@ consumer_thread (void *argaddr)
 static void
 launch_thread (THREAD_RET_TYPE (*fnc)(void *), struct thread_arg *th)
 {
+  int fd;
+
+  th->stop_me = 0;
+  fd = es_fileno (th->stream);
 #ifdef _WIN32
 
   th->thread = CreateThread (NULL, 0, fnc, th, 0, NULL);
   if (!th->thread)
     die ("creating thread '%s' failed: rc=%d", th->name, (int)GetLastError ());
-  show ("thread '%s' launched (fd=%d)\n", th->name, es_fileno (th->stream));
+  show ("thread '%s' launched (fd=%d)\n", th->name, fd);
 
 #elif USE_POSIX_THREADS
 
-  th->stop_me = 0;
   if (pthread_create (&th->thread, NULL, fnc, th))
     die ("creating thread '%s' failed: %s\n", th->name, strerror (errno));
-  show ("thread '%s' launched (fd=%d)\n", th->name, es_fileno (th->stream));
+  show ("thread '%s' launched (fd=%d)\n", th->name, fd);
 
 # else /* no thread support */
 

-----------------------------------------------------------------------

Summary of changes:
 tests/t-poll.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org