Signed-off-by: Eric Wong <[email protected]>
---
rculfhash.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/rculfhash.c b/rculfhash.c
index d534be2..61da37a 100644
--- a/rculfhash.c
+++ b/rculfhash.c
@@ -1177,6 +1177,10 @@ void partition_resize_helper(struct cds_lfht *ht,
unsigned long i,
int thread, ret;
unsigned long nr_threads;
+ assert(nr_cpus_mask != -1);
+ if (nr_cpus_mask < 0 || len < 2 * MIN_PARTITION_PER_THREAD)
+ goto fallback;
+
/*
* Note: nr_cpus_mask + 1 is always power of 2.
* We spawn just the number of threads we need to satisfy the minimum
@@ -1270,13 +1274,6 @@ static
void init_table_populate(struct cds_lfht *ht, unsigned long i,
unsigned long len)
{
- assert(nr_cpus_mask != -1);
- if (nr_cpus_mask < 0 || len < 2 * MIN_PARTITION_PER_THREAD) {
- ht->flavor->thread_online();
- init_table_populate_partition(ht, i, 0, len);
- ht->flavor->thread_offline();
- return;
- }
partition_resize_helper(ht, i, len, init_table_populate_partition);
}
@@ -1369,14 +1366,6 @@ void remove_table_partition(struct cds_lfht *ht,
unsigned long i,
static
void remove_table(struct cds_lfht *ht, unsigned long i, unsigned long len)
{
-
- assert(nr_cpus_mask != -1);
- if (nr_cpus_mask < 0 || len < 2 * MIN_PARTITION_PER_THREAD) {
- ht->flavor->thread_online();
- remove_table_partition(ht, i, 0, len);
- ht->flavor->thread_offline();
- return;
- }
partition_resize_helper(ht, i, len, remove_table_partition);
}
--
2.0.0.259.gbf1bc9c
_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
