From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 28 Nov 2011 14:07:54 +0000 (-0500)
Subject: rculfhash mm plugins: cleanup alloc
X-Git-Tag: v0.7.0~43^2~30
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e4ea7f62f5f009af7818cb05bd239bf67bae78ce;p=userspace-rcu.git

rculfhash mm plugins: cleanup alloc

- Ensure the order of fields set match the cds_lfht field order.
- 80 cols cleanup.

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

diff --git a/rculfhash-mm-chunk.c b/rculfhash-mm-chunk.c
index 0469776..38dde3a 100644
--- a/rculfhash-mm-chunk.c
+++ b/rculfhash-mm-chunk.c
@@ -79,8 +79,7 @@ struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
 	unsigned long nr_chunks, cds_lfht_size;
 
 	min_nr_alloc_buckets = max(min_nr_alloc_buckets,
-			max_nr_buckets / MAX_CHUNK_TABLE);
-
+				max_nr_buckets / MAX_CHUNK_TABLE);
 	nr_chunks = max_nr_buckets / min_nr_alloc_buckets;
 	cds_lfht_size = offsetof(struct cds_lfht, tbl_chunk) +
 			sizeof(ht->tbl_chunk[0]) * nr_chunks;
@@ -88,14 +87,13 @@ struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
 	ht = calloc(1, cds_lfht_size);
 	assert(ht);
 
+	ht->bucket_at = bucket_at;
 	ht->mm = &cds_lfht_mm_chunk;
-
 	ht->min_nr_alloc_buckets = min_nr_alloc_buckets;
-	ht->min_alloc_buckets_order = get_count_order_ulong(min_nr_alloc_buckets);
+	ht->min_alloc_buckets_order =
+		get_count_order_ulong(min_nr_alloc_buckets);
 	ht->max_nr_buckets = max_nr_buckets;
 
-	ht->bucket_at = bucket_at;
-
 	return ht;
 }
 
diff --git a/rculfhash-mm-mmap.c b/rculfhash-mm-mmap.c
index 542c884..e2c565e 100644
--- a/rculfhash-mm-mmap.c
+++ b/rculfhash-mm-mmap.c
@@ -140,14 +140,13 @@ struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
 	ht = calloc(1, sizeof(struct cds_lfht));
 	assert(ht);
 
+	ht->bucket_at = bucket_at;
 	ht->mm = &cds_lfht_mm_mmap;
-
 	ht->min_nr_alloc_buckets = min_nr_alloc_buckets;
 	ht->min_alloc_buckets_order =
 			get_count_order_ulong(min_nr_alloc_buckets);
 	ht->max_nr_buckets = max_nr_buckets;
 
-	ht->bucket_at = bucket_at;
 
 	return ht;
 }
diff --git a/rculfhash-mm-order.c b/rculfhash-mm-order.c
index 69e2b62..9c0c70e 100644
--- a/rculfhash-mm-order.c
+++ b/rculfhash-mm-order.c
@@ -82,14 +82,13 @@ struct cds_lfht *alloc_cds_lfht(unsigned long min_nr_alloc_buckets,
 	ht = calloc(1, sizeof(struct cds_lfht));
 	assert(ht);
 
+	ht->bucket_at = bucket_at;
 	ht->mm = &cds_lfht_mm_order;
-
 	ht->min_nr_alloc_buckets = min_nr_alloc_buckets;
-	ht->min_alloc_buckets_order = get_count_order_ulong(min_nr_alloc_buckets);
+	ht->min_alloc_buckets_order =
+		get_count_order_ulong(min_nr_alloc_buckets);
 	ht->max_nr_buckets = max_nr_buckets;
 
-	ht->bucket_at = bucket_at;
-
 	return ht;
 }