From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 14 Jun 2013 12:22:50 +0000 (-0400)
Subject: rcu barrier: handle OOM die urcu_die
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f5a9966d764fab837d740f14762bb2a8e20b99f9;p=userspace-rcu.git

rcu barrier: handle OOM die urcu_die

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/urcu-call-rcu-impl.h b/urcu-call-rcu-impl.h
index fb3568f..10c4f3e 100644
--- a/urcu-call-rcu-impl.h
+++ b/urcu-call-rcu-impl.h
@@ -786,7 +786,7 @@ void rcu_barrier(void)
 {
 	struct call_rcu_data *crdp;
 	struct call_rcu_completion completion;
-	int count = 0, work_count = 0;
+	int count = 0;
 	int was_online;
 
 	/* Put in offline state in QSBR. */
@@ -817,24 +817,13 @@ void rcu_barrier(void)
 		struct call_rcu_completion_work *work;
 
 		work = calloc(sizeof(*work), 1);
-		if (!work) {
-			static int warned = 0;
-
-			if (!warned) {
-				fprintf(stderr, "[error] liburcu: unable to allocate memory for rcu_barrier()\n");
-			}
-			warned = 1;
-			break;
-		}
+		if (!work)
+			urcu_die(errno);
 		work->completion = &completion;
 		_call_rcu(&work->head, _rcu_barrier_complete, crdp);
-		work_count++;
 	}
 	call_rcu_unlock(&call_rcu_mutex);
 
-	if (work_count != count)
-		uatomic_sub(&completion.barrier_count, count - work_count);
-
 	/* Wait for them */
 	for (;;) {
 		uatomic_dec(&completion.futex);