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

improve xkvmgr and testsuite for scheduler

Browse source
This commit is contained in:
Rongsong Shen 2026-02-26 14:39:12 +08:00
parent 2ee87d4ee6
commit 598d381379
10 changed files with 327 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

114
src/lib/kvmgr.c
View file

@ -430,7 +430,7 @@ static int xkvmgr_init(meta_obj_t* obj, va_list ap)
}
kv_params.nslots = params->nslots;
kv_params.datakiller = params->datakiller;
kv_params.datakiller = NULL;
switch (params->key_type) {
case KVMGR_KEY_INT:
@ -496,12 +496,25 @@ static int xkvmgr_add(meta_obj_t* obj, void* key, void* value)
xkvmgr_t* kvm = RTTI_OBJ_TO_DATA(xkvmgr_t, obj);
int rc;
xkvmgr_private_t* priv = RTTI_OBJ_TO_PRIV(obj);
int idx;
if (kvm->dynamic) {
my_rwlock_wlock(&(priv->lock));
}
rc = key_add(kvm->kvtab, key, value);
rc = vstore(kvm->data, value);
if (rc >= 0) {
idx = rc;
rc = key_add(kvm->kvtab, key, (void*)(long)idx);
if (rc >= 0) {
rc = idx;
} else {
vclear(kvm->data, idx);
}
}
if (kvm->dynamic) {
my_rwlock_unlock(&(priv->lock));
@ -515,12 +528,23 @@ static int xkvmgr_find(meta_obj_t* obj, void* key, void** value)
xkvmgr_t* kvm = RTTI_OBJ_TO_DATA(xkvmgr_t, obj);
int rc;
xkvmgr_private_t* priv = RTTI_OBJ_TO_PRIV(obj);
void* data;
*value = NULL;
if (kvm->dynamic) {
my_rwlock_rlock(&(priv->lock));
}
rc = key_find(kvm->kvtab, key, value);
rc = key_find(kvm->kvtab, key, &data);
if (rc >= 0) {
int idx = (int)(long)data;
rc = vget(kvm->data, idx, &data);
if (rc >= 0) {
*value = data;
}
}
if (kvm->dynamic) {
my_rwlock_unlock(&(priv->lock));
@ -587,6 +611,78 @@ static void xkvmgr_iter_destroy(iterator_t* iter)
return;
}
static int xkvmgr_get_vec(meta_obj_t* obj, int count, int* idxs, void** data)
{
xkvmgr_t* kvm = RTTI_OBJ_TO_DATA(xkvmgr_t, obj);
xkvmgr_private_t* priv = RTTI_OBJ_TO_PRIV(obj);
int rc = 0;
if (kvm->dynamic) {
my_rwlock_rlock(&(priv->lock));
}
rc = vget_vec(kvm->data, count, idxs, data);
if (kvm->dynamic) {
my_rwlock_unlock(&(priv->lock));
}
return rc;
}
static int xkvmgr_get(meta_obj_t* obj, int idx, void** data)
{
xkvmgr_t* kvm = RTTI_OBJ_TO_DATA(xkvmgr_t, obj);
xkvmgr_private_t* priv = RTTI_OBJ_TO_PRIV(obj);
int rc = 0;
if (kvm->dynamic) {
my_rwlock_rlock(&(priv->lock));
}
rc = vget(kvm->data, idx, data);
if (kvm->dynamic) {
my_rwlock_unlock(&(priv->lock));
}
return rc;
}
static int xkvmgr_put_vec(meta_obj_t* obj, int count, int* idxs, void** data)
{
xkvmgr_t* kvm = RTTI_OBJ_TO_DATA(xkvmgr_t, obj);
xkvmgr_private_t* priv = RTTI_OBJ_TO_PRIV(obj);
int rc = 0;
if (kvm->dynamic) {
my_rwlock_wlock(&(priv->lock));
}
rc = vput_vec(kvm->data, count, idxs, data);
if (kvm->dynamic) {
my_rwlock_unlock(&(priv->lock));
}
return rc;
}
static int xkvmgr_put(meta_obj_t* obj, int idx, void* data)
{
xkvmgr_t* kvm = RTTI_OBJ_TO_DATA(xkvmgr_t, obj);
xkvmgr_private_t* priv = RTTI_OBJ_TO_PRIV(obj);
int rc = 0;
if (kvm->dynamic) {
my_rwlock_wlock(&(priv->lock));
}
rc = vput(kvm->data, idx, data);
if (kvm->dynamic) {
my_rwlock_unlock(&(priv->lock));
}
return rc;
}
typeinfo_t xkvmgr_type = {
.name = "xkvmgr",
.privateSize = sizeof(xkvmgr_private_t),
@ -594,9 +690,15 @@ typeinfo_t xkvmgr_type = {
.init = (obj_init_fn_t)xkvmgr_init,
.destroy = (obj_destroy_fn_t)xkvmgr_destroy,
.interfaces
= { .kv = &(intf_kv_t) { .add_key = (key_add_fn_t)xkvmgr_add,
.del_key = (key_del_fn_t)NULL,
.find_key = (key_find_fn_t)xkvmgr_find },
= { .kv = &(intf_kv_t) { .add_key = (key_add_fn_t)xkvmgr_add,
.del_key = (key_del_fn_t)NULL,
.find_key = (key_find_fn_t)xkvmgr_find },
.varray = &(intf_varray_t) { .vstore = (vstore_fn_t)NULL,
.vget = (vget_fn_t)xkvmgr_get,
.vget_vec = (vget_vec_fn_t)xkvmgr_get_vec,
.vput = (vput_fn_t)xkvmgr_put,
.vput_vec = (vput_vec_fn_t)xkvmgr_put_vec,
.vclear = (vclear_fn_t)NULL },
.iter
= &(intf_iterator_t) { .make = (iter_make_fn_t)xkvmgr_make_iter,
.next = (iter_next_fn_t)xkvmgr_iter_next,

161
src/lib/testsuite/test_kvmgr.c
View file

@ -1,76 +1,129 @@
#include <rtti.h>
#include <stdio.h>
#include <stdlib.h>
#include <unity/unity.h>
#include "kv.h"
#include "kvmgr.h"
#include <unity.h>
#include "objmgr.h"
#include "utils.h"
typedef struct {
char* key;
int data;
} kv_data_t;
static void test_kvadd(void)
static void test_kvmgr_create(void)
{
kvmgr_t mgr;
char *key = "key1";
kv_data_t data = { .key = key, .data = 100 };
kv_data_t* p = NULL;
kvmgr_params_t params = { .key_type = KVMGR_KEY_STRING,
.dynamic = 0,
.nslots = 4,
.delta = 4,
.datakiller = NULL };
var kvmgr = makeInstance(&xkvmgr_type, &params);
kvmgr_init(&mgr, string_hash_key, 4, 4, NULL);
kvmgr_add(&mgr, key, &data);
p = kvmgr_lock(&mgr, key, OBJREF_NOP);
TEST_ASSERT_TRUE(p != NULL);
TEST_ASSERT_TRUE(p == &data);
kvmgr_fini(&mgr);
TEST_ASSERT_TRUE(kvmgr != NULL);
destroy(kvmgr);
}
static void test_kvput(void)
{
kvmgr_t mgr;
char *key = "key1";
kv_data_t data = { .key = key, .data = 100 };
kv_data_t* p = NULL;
int idx = 10;
typedef struct {
char* name;
uint16_t age;
} user_t;
kvmgr_init(&mgr, string_hash_key, 4, 4, NULL);
kvmgr_put(&mgr, key, idx, &data);
p = kvmgr_lock(&mgr, key, OBJREF_NOP);
TEST_ASSERT_TRUE(p != NULL);
TEST_ASSERT_TRUE(p == &data);
p = kvmgr_lock_byid(&mgr, idx, OBJREF_NOP);
TEST_ASSERT_TRUE(p != NULL);
TEST_ASSERT_TRUE(p == &data);
static void my_user_killer(void* data)
{
user_t* u = (user_t*)data;
if (u == NULL) {
return;
}
FREEUP(u->name);
FREEUP(u);
}
static void test_kvmgr_add(void)
{
kvmgr_params_t params = { .key_type = KVMGR_KEY_STRING,
.dynamic = 0,
.nslots = 4,
.delta = 4,
.datakiller = my_user_killer };
var kvmgr = makeInstance(&xkvmgr_type, &params);
user_t* u = NULL;
int rc = 0;
void* data = NULL;
TEST_ASSERT_TRUE(kvmgr != NULL);
u = calloc(1, sizeof(*u));
TEST_ASSERT_TRUE(u != NULL);
u->name = strdup("tester1");
TEST_ASSERT_TRUE(u->name != NULL);
u->age = 32;
rc = key_add(kvmgr, (void*)u->name, (void*)u);
TEST_ASSERT_TRUE(rc >= 0);
rc = key_find(kvmgr, (void*)u->name, &data);
TEST_ASSERT_TRUE(rc >= 0);
TEST_ASSERT_TRUE(data == u);
destroy(kvmgr);
}
static void test_kvmgr_iter(void)
{
kvmgr_params_t params = { .key_type = KVMGR_KEY_INT,
.dynamic = 0,
.nslots = 4,
.delta = 4,
.datakiller = NULL };
var kvmgr = makeInstance(&xkvmgr_type, &params);
int rc = 0;
int i;
iterator_t it;
TEST_ASSERT_TRUE(kvmgr != NULL);
for (i = 0; i < 10; i++) {
rc = key_add(kvmgr, (void*)(long)i, (void*)(long)(i * i));
TEST_ASSERT_TRUE(rc >= 0);
}
rc = iter_make(&it, kvmgr);
TEST_ASSERT_TRUE(rc >= 0);
i = 0;
for (;;) {
void* data;
rc = iter_next(&it, &data);
TEST_ASSERT_TRUE(rc >= 0);
if (rc == RTTI_ITER_NO_DATA) {
break;
}
TEST_ASSERT_TRUE((int)(long)data == i * i);
i++;
}
TEST_ASSERT_TRUE(i == 10);
iter_destroy(&it);
kvmgr_fini(&mgr);
destroy(kvmgr);
}
static void test_kvdel(void)
{
kvmgr_t mgr;
char *key = "key1";
kv_data_t data = { .key = key, .data = 100 };
kv_data_t* p = NULL;
kvmgr_init(&mgr, string_hash_key, 4, 4, NULL);
kvmgr_add(&mgr, key, &data);
p = kvmgr_lock(&mgr, key, OBJREF_NOP);
TEST_ASSERT_TRUE(p != NULL);
TEST_ASSERT_TRUE(p == &data);
kvmgr_del(&mgr, key);
p = kvmgr_lock(&mgr, key, OBJREF_NOP);
TEST_ASSERT_TRUE( p == NULL);
kvmgr_fini(&mgr);
}
void test_kvmgr(void)
{
printf("\n>> kvmgr test\n");
RUN_TEST(test_kvadd);
RUN_TEST(test_kvput);
RUN_TEST(test_kvdel);
RUN_TEST(test_kvmgr_create);
RUN_TEST(test_kvmgr_add);
RUN_TEST(test_kvmgr_iter);
}

1
src/lib/zarray.c
View file

@ -471,6 +471,7 @@ static int xzarray_store(meta_obj_t* obj, void* data)
a->count++;
rc = idx;
break;
}
idx++;