diff options
Diffstat (limited to 'source/blender/blenlib/tests/BLI_task_test.cc')
| -rw-r--r-- | source/blender/blenlib/tests/BLI_task_test.cc | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/source/blender/blenlib/tests/BLI_task_test.cc b/source/blender/blenlib/tests/BLI_task_test.cc index 52852873a06..a933d45e7cd 100644 --- a/source/blender/blenlib/tests/BLI_task_test.cc +++ b/source/blender/blenlib/tests/BLI_task_test.cc @@ -15,7 +15,7 @@ #include "BLI_task.h" #include "BLI_task.hh" -#define NUM_ITEMS 10000 +#define ITEMS_NUM 10000 /* *** Parallel iterations over range of integer values. *** */ @@ -34,12 +34,12 @@ static void task_range_iter_reduce_func(const void *__restrict UNUSED(userdata), int *join = (int *)join_v; int *chunk = (int *)userdata_chunk; *join += *chunk; - // printf("%d, %d\n", data[NUM_ITEMS], *((int *)userdata_chunk)); + // printf("%d, %d\n", data[ITEMS_NUM], *((int *)userdata_chunk)); } TEST(task, RangeIter) { - int data[NUM_ITEMS] = {0}; + int data[ITEMS_NUM] = {0}; int sum = 0; BLI_threadapi_init(); @@ -52,13 +52,13 @@ TEST(task, RangeIter) settings.userdata_chunk_size = sizeof(sum); settings.func_reduce = task_range_iter_reduce_func; - BLI_task_parallel_range(0, NUM_ITEMS, data, task_range_iter_func, &settings); + BLI_task_parallel_range(0, ITEMS_NUM, data, task_range_iter_func, &settings); /* Those checks should ensure us all items of the listbase were processed once, and only once * as expected. */ int expected_sum = 0; - for (int i = 0; i < NUM_ITEMS; i++) { + for (int i = 0; i < ITEMS_NUM; i++) { EXPECT_EQ(data[i], i); expected_sum += i; } @@ -84,41 +84,41 @@ static void task_mempool_iter_func(void *userdata, TEST(task, MempoolIter) { - int *data[NUM_ITEMS]; + int *data[ITEMS_NUM]; BLI_threadapi_init(); BLI_mempool *mempool = BLI_mempool_create( - sizeof(*data[0]), NUM_ITEMS, 32, BLI_MEMPOOL_ALLOW_ITER); + sizeof(*data[0]), ITEMS_NUM, 32, BLI_MEMPOOL_ALLOW_ITER); int i; /* 'Randomly' add and remove some items from mempool, to create a non-homogeneous one. */ - int num_items = 0; - for (i = 0; i < NUM_ITEMS; i++) { + int items_num = 0; + for (i = 0; i < ITEMS_NUM; i++) { data[i] = (int *)BLI_mempool_alloc(mempool); *data[i] = i - 1; - num_items++; + items_num++; } - for (i = 0; i < NUM_ITEMS; i += 3) { + for (i = 0; i < ITEMS_NUM; i += 3) { BLI_mempool_free(mempool, data[i]); data[i] = nullptr; - num_items--; + items_num--; } - for (i = 0; i < NUM_ITEMS; i += 7) { + for (i = 0; i < ITEMS_NUM; i += 7) { if (data[i] == nullptr) { data[i] = (int *)BLI_mempool_alloc(mempool); *data[i] = i - 1; - num_items++; + items_num++; } } - for (i = 0; i < NUM_ITEMS - 5; i += 23) { + for (i = 0; i < ITEMS_NUM - 5; i += 23) { for (int j = 0; j < 5; j++) { if (data[i + j] != nullptr) { BLI_mempool_free(mempool, data[i + j]); data[i + j] = nullptr; - num_items--; + items_num--; } } } @@ -126,12 +126,12 @@ TEST(task, MempoolIter) TaskParallelSettings settings; BLI_parallel_mempool_settings_defaults(&settings); - BLI_task_parallel_mempool(mempool, &num_items, task_mempool_iter_func, &settings); + BLI_task_parallel_mempool(mempool, &items_num, task_mempool_iter_func, &settings); /* Those checks should ensure us all items of the mempool were processed once, and only once - as * expected. */ - EXPECT_EQ(num_items, 0); - for (i = 0; i < NUM_ITEMS; i++) { + EXPECT_EQ(items_num, 0); + for (i = 0; i < ITEMS_NUM; i++) { if (data[i] != nullptr) { EXPECT_EQ(*data[i], i); } @@ -189,19 +189,19 @@ static void task_mempool_iter_tls_free(const void *UNUSED(userdata), TEST(task, MempoolIterTLS) { - int *data[NUM_ITEMS]; + int *data[ITEMS_NUM]; BLI_threadapi_init(); BLI_mempool *mempool = BLI_mempool_create( - sizeof(*data[0]), NUM_ITEMS, 32, BLI_MEMPOOL_ALLOW_ITER); + sizeof(*data[0]), ITEMS_NUM, 32, BLI_MEMPOOL_ALLOW_ITER); int i; - /* Add numbers negative `1..NUM_ITEMS` inclusive. */ - int num_items = 0; - for (i = 0; i < NUM_ITEMS; i++) { + /* Add numbers negative `1..ITEMS_NUM` inclusive. */ + int items_num = 0; + for (i = 0; i < ITEMS_NUM; i++) { data[i] = (int *)BLI_mempool_alloc(mempool); *data[i] = -(i + 1); - num_items++; + items_num++; } TaskParallelSettings settings; @@ -218,15 +218,15 @@ TEST(task, MempoolIterTLS) BLI_task_parallel_mempool(mempool, nullptr, task_mempool_iter_tls_func, &settings); - EXPECT_EQ(BLI_listbase_count(tls_data.accumulate_items), NUM_ITEMS); + EXPECT_EQ(BLI_listbase_count(tls_data.accumulate_items), ITEMS_NUM); /* Check that all elements are added into the list once. */ - int num_accum = 0; + int number_accum = 0; for (LinkData *link = (LinkData *)tls_data.accumulate_items->first; link; link = link->next) { int *data = (int *)link->data; - num_accum += *data; + number_accum += *data; } - EXPECT_EQ(num_accum, (NUM_ITEMS * (NUM_ITEMS + 1)) / 2); + EXPECT_EQ(number_accum, (ITEMS_NUM * (ITEMS_NUM + 1)) / 2); BLI_freelistN(tls_data.accumulate_items); MEM_freeN(tls_data.accumulate_items); @@ -253,31 +253,31 @@ TEST(task, ListBaseIter) { ListBase list = {nullptr, nullptr}; LinkData *items_buffer = (LinkData *)MEM_calloc_arrayN( - NUM_ITEMS, sizeof(*items_buffer), __func__); + ITEMS_NUM, sizeof(*items_buffer), __func__); BLI_threadapi_init(); int i; - int num_items = 0; - for (i = 0; i < NUM_ITEMS; i++) { + int items_num = 0; + for (i = 0; i < ITEMS_NUM; i++) { BLI_addtail(&list, &items_buffer[i]); - num_items++; + items_num++; } TaskParallelSettings settings; BLI_parallel_range_settings_defaults(&settings); - BLI_task_parallel_listbase(&list, &num_items, task_listbase_iter_func, &settings); + BLI_task_parallel_listbase(&list, &items_num, task_listbase_iter_func, &settings); /* Those checks should ensure us all items of the listbase were processed once, and only once - * as expected. */ - EXPECT_EQ(num_items, 0); + EXPECT_EQ(items_num, 0); LinkData *item; - for (i = 0, item = (LinkData *)list.first; i < NUM_ITEMS && item != nullptr; + for (i = 0, item = (LinkData *)list.first; i < ITEMS_NUM && item != nullptr; i++, item = item->next) { EXPECT_EQ(POINTER_AS_INT(item->data), i); } - EXPECT_EQ(NUM_ITEMS, i); + EXPECT_EQ(ITEMS_NUM, i); MEM_freeN(items_buffer); BLI_threadapi_exit(); |