X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=rcuja%2Frcuja.c;h=41ac70c43fb457aa98ae7ba80ebfce4b515904b6;hb=026545d3928cc63b042353581176f04fe00be08b;hp=0f07b15436e8b51b1591601fd4568ffb9dfa0c7e;hpb=f2ae7af7650493a88d99cb7d1400a7a025960124;p=userspace-rcu.git

diff --git a/rcuja/rcuja.c b/rcuja/rcuja.c
index 0f07b15..41ac70c 100644
--- a/rcuja/rcuja.c
+++ b/rcuja/rcuja.c
@@ -244,11 +244,6 @@ enum ja_recompact {
 	JA_RECOMPACT_DEL,
 };
 
-static
-unsigned long node_fallback_count_distribution[JA_ENTRY_PER_NODE];
-static
-unsigned long nr_nodes_allocated, nr_nodes_freed;
-
 static
 struct cds_ja_inode *_ja_node_mask_ptr(struct cds_ja_inode_flag *node)
 {
@@ -291,7 +286,9 @@ struct cds_ja_inode *ja_node_ptr(struct cds_ja_inode_flag *node)
 	}
 }
 
-struct cds_ja_inode *alloc_cds_ja_node(const struct cds_ja_type *ja_type)
+static
+struct cds_ja_inode *alloc_cds_ja_node(struct cds_ja *ja,
+		const struct cds_ja_type *ja_type)
 {
 	size_t len = 1U << ja_type->order;
 	void *p;
@@ -302,15 +299,15 @@ struct cds_ja_inode *alloc_cds_ja_node(const struct cds_ja_type *ja_type)
 		return NULL;
 	}
 	memset(p, 0, len);
-	uatomic_inc(&nr_nodes_allocated);
+	uatomic_inc(&ja->nr_nodes_allocated);
 	return p;
 }
 
-void free_cds_ja_node(struct cds_ja_inode *node)
+void free_cds_ja_node(struct cds_ja *ja, struct cds_ja_inode *node)
 {
 	free(node);
 	if (node)
-		uatomic_inc(&nr_nodes_freed);
+		uatomic_inc(&ja->nr_nodes_freed);
 }
 
 #define __JA_ALIGN_MASK(v, mask)	(((v) + (mask)) & ~(mask))
@@ -1238,7 +1235,7 @@ retry:		/* for fallback */
 			old_type_index, new_type_index);
 	new_type = &ja_types[new_type_index];
 	if (new_type_index != NODE_INDEX_NULL) {
-		new_node = alloc_cds_ja_node(new_type);
+		new_node = alloc_cds_ja_node(ja, new_type);
 		if (!new_node)
 			return -ENOMEM;
 
@@ -1285,7 +1282,7 @@ retry:		/* for fallback */
 		dbg_printf("Recompact inherit lock from %p\n", shadow_node);
 		new_shadow_node = rcuja_shadow_set(ja->ht, new_node_flag, shadow_node, ja, level);
 		if (!new_shadow_node) {
-			free_cds_ja_node(new_node);
+			free_cds_ja_node(ja, new_node);
 			return -ENOMEM;
 		}
 		if (fallback)
@@ -1409,7 +1406,7 @@ skip_copy:
 		dbg_printf("Using fallback for %u children, node type index: %u, mode %s\n",
 			new_shadow_node->nr_child, old_type_index, mode == JA_RECOMPACT_ADD_NEXT ? "add_next" :
 				(mode == JA_RECOMPACT_DEL ? "del" : "add_same"));
-		uatomic_inc(&node_fallback_count_distribution[new_shadow_node->nr_child]);
+		uatomic_inc(&ja->node_fallback_count_distribution[new_shadow_node->nr_child]);
 	}
 
 	/* Return pointer to new recompacted node through old_node_flag_ptr */
@@ -2404,17 +2401,47 @@ void rcuja_free_all_children(struct cds_ja_shadow_node *shadow_node,
 }
 
 static
-void print_debug_fallback_distribution(void)
+void print_debug_fallback_distribution(struct cds_ja *ja)
 {
 	int i;
 
 	fprintf(stderr, "Fallback node distribution:\n");
 	for (i = 0; i < JA_ENTRY_PER_NODE; i++) {
-		if (!node_fallback_count_distribution[i])
+		if (!ja->node_fallback_count_distribution[i])
 			continue;
 		fprintf(stderr, "	%3u: %4lu\n",
-			i, node_fallback_count_distribution[i]);
+			i, ja->node_fallback_count_distribution[i]);
+	}
+}
+
+static
+int ja_final_checks(struct cds_ja *ja)
+{
+	double fallback_ratio;
+	unsigned long na, nf, nr_fallback;
+	int ret = 0;
+
+	fallback_ratio = (double) uatomic_read(&ja->nr_fallback);
+	fallback_ratio /= (double) uatomic_read(&ja->nr_nodes_allocated);
+	nr_fallback = uatomic_read(&ja->nr_fallback);
+	if (nr_fallback)
+		fprintf(stderr,
+			"[warning] RCU Judy Array used %lu fallback node(s) (ratio: %g)\n",
+			uatomic_read(&ja->nr_fallback),
+			fallback_ratio);
+
+	na = uatomic_read(&ja->nr_nodes_allocated);
+	nf = uatomic_read(&ja->nr_nodes_freed);
+	dbg_printf("Nodes allocated: %lu, Nodes freed: %lu.\n", na, nf);
+	if (nr_fallback)
+		print_debug_fallback_distribution(ja);
+
+	if (na != nf) {
+		fprintf(stderr, "[error] Judy array leaked %ld nodes. Allocated: %lu, freed: %lu.\n",
+			(long) na - nf, na, nf);
+		ret = -1;
 	}
+	return ret;
 }
 
 /*
@@ -2440,15 +2467,7 @@ int cds_ja_destroy(struct cds_ja *ja,
 	flavor->barrier();
 
 	flavor->thread_online();
-	if (uatomic_read(&ja->nr_fallback))
-		fprintf(stderr,
-			"[warning] RCU Judy Array used %lu fallback node(s)\n",
-			uatomic_read(&ja->nr_fallback));
-	fprintf(stderr, "Nodes allocated: %lu, Nodes freed: %lu. Fallback ratio: %g\n",
-		uatomic_read(&nr_nodes_allocated),
-		uatomic_read(&nr_nodes_freed),
-		(double) uatomic_read(&ja->nr_fallback) / (double) uatomic_read(&nr_nodes_allocated));
-	print_debug_fallback_distribution();
+	ret = ja_final_checks(ja);
 	free(ja);
-	return 0;
+	return ret;
 }