This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.23-296-g04794f3


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 "GNU C Library master sources".

The branch, master has been updated
       via  04794f3e7e9a8f61519b7d8bb5ad864431d3e488 (commit)
      from  66355680f840f336eb83e7f46a873556a1bdedcc (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 -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=04794f3e7e9a8f61519b7d8bb5ad864431d3e488

commit 04794f3e7e9a8f61519b7d8bb5ad864431d3e488
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed May 4 15:51:19 2016 +0200

    Revert "aio: fix newp->running data race"
    
    This reverts commit fd67a9cf7b733da082e4b6a5f25c19ea7921b4cd.

diff --git a/ChangeLog b/ChangeLog
index a4501a0..30ab0e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,13 +2,6 @@
 
 	* malloc/malloc-internal.h: Adjust header file guard.
 
-2016-05-04  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-	* sysdeps/pthread/aio_misc.c (__aio_enqueue_request): Do not write
-	`running` field of `newp` when a thread was started to process it,
-	since that thread will not take `__aio_requests_mutex`, and the field
-	already has the proper value actually.
-
 2016-05-04  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #19787]
diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c
index faf139d..f55570d 100644
--- a/sysdeps/pthread/aio_misc.c
+++ b/sysdeps/pthread/aio_misc.c
@@ -453,11 +453,7 @@ __aio_enqueue_request (aiocb_union *aiocbp, int operation)
 		result = 0;
 	    }
 	}
-      else
-	newp->running = running;
     }
-  else
-    newp->running = running;
 
   /* Enqueue the request in the run queue if it is not yet running.  */
   if (running == yes && result == 0)
@@ -470,7 +466,9 @@ __aio_enqueue_request (aiocb_union *aiocbp, int operation)
 	pthread_cond_signal (&__aio_new_request_notification);
     }
 
-  if (result != 0)
+  if (result == 0)
+    newp->running = running;
+  else
     {
       /* Something went wrong.  */
       __aio_free_request (newp);

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

Summary of changes:
 ChangeLog                  |    7 -------
 sysdeps/pthread/aio_misc.c |    8 +++-----
 2 files changed, 3 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]