* load.c (load_unlock): release loading barrier and then remove it

  from loading_table if it is not in-use.  [Bug #5754]
* thread.c (rb_barrier_release, rb_barrier_destroy): return
  whether any other threads are waiting on it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 6 deletions

diff --git a/load.c b/load.c
index 2672051727..d7debad4de 100644
--- a/load.c
+++ b/load.c
@@ -427,12 +427,10 @@ load_unlock(const char *ftptr, int done)
 
 	if (!st_lookup(loading_tbl, key, &data)) return;
 	barrier = (VALUE)data;
-	if (rb_barrier_waiting(barrier) ||
-	    (st_delete(loading_tbl, &key, &data) && (xfree((char *)key), 1))) {
-	    if (done)
-		rb_barrier_destroy(barrier);
-	    else
-		rb_barrier_release(barrier);
+	if (!(done ? rb_barrier_destroy(barrier) : rb_barrier_release(barrier))) {
+	    if (st_delete(loading_tbl, &key, &data)) {
+		xfree((char *)key);
+	    }
 	}
     }
 }