lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enhance ordq

Browse source
This commit is contained in:
Rongsong Shen 2025-12-17 12:14:52 +08:00
parent e85ce0e5ad
commit 48ab2e60a2
4 changed files with 119 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/lib/testsuite/test_ordq.c
View file

@ -35,7 +35,7 @@ static void test_ordq_get(void)
}
for (i = 0; i < 8; i++) {
it = ordq_get(&q);
it = ordq_get(&q, NULL);
TEST_ASSERT_TRUE((it != NULL) && (it->key == mk_ordkey(val[i])));
free(it);
@ -46,6 +46,55 @@ static void test_ordq_get(void)
return;
}
static int test_skip(void *ctx, ordq_item_t *data) {
int val = (int)(long)data->key;
return (val % 2 != 0);
}
static void test_ordq_get_skip(void)
{
int rc;
ordq_t q;
ordq_item_t* it;
int keys[8] = { 9, 8, 1, 4, 7, 2, 6, 2 };
int val[8] = { 1, 2, 2, 4, 6, 7, 8, 9 };
int i, j, nc;
rc = ordq_init(&q, NULL, (ordq_cmp_fn_t)long_cmp);
TEST_ASSERT_TRUE(rc >= 0);
for (i = 0; i < 8; i++) {
ordq_put(&q, mk_ordkey(keys[i]), (void*)NULL);
}
j = 0; nc = 0;
for (i = 0; i < 5; i++) {
it = ordq_get(&q, test_skip);
if ( it == NULL) {
break;
}
nc ++;
while((j < 8) && (val[j] % 2 != 0)) {
j ++;
}
TEST_ASSERT_TRUE(it->key == mk_ordkey(val[j]));
free(it);
j ++;
}
TEST_ASSERT_TRUE(nc == 5);
ordq_fini(&q);
return;
}
static void test_ordq_peek(void)
{
int rc;
@ -63,7 +112,7 @@ static void test_ordq_peek(void)
}
for (i = 0; i < 8; i++) {
it = ordq_peek(&q); /* ordq_peek() will not remove item from q */
it = ordq_peek(&q, NULL); /* ordq_peek() will not remove item from q */
TEST_ASSERT_TRUE((it != NULL) && (it->key == mk_ordkey(val[0])));
}
@ -73,10 +122,45 @@ static void test_ordq_peek(void)
return;
}
static int test_skip2(void *ctx, ordq_item_t *data) {
int val = (int)(long)data->key;
return (val % 3 != 0);
}
static void test_ordq_peek_skip(void)
{
int rc;
ordq_t q;
ordq_item_t* it;
int keys[8] = { 9, 8, 1, 4, 7, 2, 6, 2 };
int val[8] = { 1, 2, 2, 4, 6, 7, 8, 9 };
int i;
rc = ordq_init(&q, NULL, (ordq_cmp_fn_t)long_cmp);
TEST_ASSERT_TRUE(rc >= 0);
for (i = 0; i < 8; i++) {
ordq_put(&q, mk_ordkey(keys[i]), (void*)NULL);
}
for (i = 0; i < 8; i++) {
it = ordq_peek(&q, test_skip2); /* ordq_peek() will not remove item from q */
TEST_ASSERT_TRUE((it != NULL) && (it->key == mk_ordkey(val[4])));
}
ordq_fini(&q);
return;
}
void test_ordq(void)
{
printf("\n>> ordq test\n\n");
RUN_TEST(test_ordq_get);
RUN_TEST(test_ordq_peek);
RUN_TEST(test_ordq_get_skip);
RUN_TEST(test_ordq_peek_skip);
}