X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu-call-rcu-impl.h;h=d5b75c076de22de777244cc26fb86f0791f898a5;hb=b75dffe654debbf8fd5a62d94cfeea15df6223e7;hp=c822646e03834bbf26224feae2a71bcdfb5bf8e1;hpb=3670fef2faef63803d62a08f2aa4f089f3858b50;p=urcu.git

diff --git a/urcu-call-rcu-impl.h b/urcu-call-rcu-impl.h
index c822646..d5b75c0 100644
--- a/urcu-call-rcu-impl.h
+++ b/urcu-call-rcu-impl.h
@@ -396,11 +396,19 @@ int set_cpu_call_rcu_data(int cpu, struct call_rcu_data *crdp)
 		errno = EINVAL;
 		return -EINVAL;
 	}
+
 	if (per_cpu_call_rcu_data == NULL) {
 		call_rcu_unlock(&call_rcu_mutex);
 		errno = ENOMEM;
 		return -ENOMEM;
 	}
+
+	if (per_cpu_call_rcu_data[cpu] != NULL && crdp != NULL) {
+		call_rcu_unlock(&call_rcu_mutex);
+		errno = EEXIST;
+		return -EEXIST;
+	}
+
 	per_cpu_call_rcu_data[cpu] = crdp;
 	call_rcu_unlock(&call_rcu_mutex);
 	return 0;
@@ -514,8 +522,13 @@ int create_all_cpu_call_rcu_data(unsigned long flags)
 		}
 		call_rcu_unlock(&call_rcu_mutex);
 		if ((ret = set_cpu_call_rcu_data(i, crdp)) != 0) {
-			/* FIXME: Leaks crdp for now. */
-			return ret; /* Can happen on race. */
+			call_rcu_data_free(crdp);
+
+			/* it has been created by other thread */
+			if (ret == -EEXIST)
+				continue;
+
+			return ret;
 		}
 	}
 	return 0;
@@ -596,6 +609,8 @@ void call_rcu_data_free(struct call_rcu_data *crdp)
 		_CMM_STORE_SHARED(crdp->cbs.head, NULL);
 		cbs_tail = (struct cds_wfq_node **)
 			uatomic_xchg(&crdp->cbs.tail, &crdp->cbs.head);
+		/* Create default call rcu data if need be */
+		(void) get_default_call_rcu_data();
 		cbs_endprev = (struct cds_wfq_node **)
 			uatomic_xchg(&default_call_rcu_data, cbs_tail);
 		*cbs_endprev = cbs;
@@ -604,7 +619,10 @@ void call_rcu_data_free(struct call_rcu_data *crdp)
 		wake_call_rcu_thread(default_call_rcu_data);
 	}
 
+	call_rcu_lock(&call_rcu_mutex);
 	cds_list_del(&crdp->list);
+	call_rcu_unlock(&call_rcu_mutex);
+
 	free(crdp);
 }