rshen/librtti
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename key2id to kv

Browse source
This commit is contained in:
Rongsong Shen 2026-02-13 15:00:16 +08:00
parent d8690bfeb9
commit e5f3983952
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/rtti/typeinfo.h
View file

@ -149,15 +149,15 @@ typedef struct {
/* key to id table */ /* key to id table */
typedef int (*key_add_fn_t)(meta_obj_t*, uint64_t*, void*); typedef int (*key_add_fn_t)(meta_obj_t*, void*, void*);
typedef int (*key_del_fn_t)(meta_obj_t*, void*); typedef int (*key_del_fn_t)(meta_obj_t*, void*);
typedef uint64_t (*key_find_fn_t)(meta_obj_t*, uint64_t*, void*); typedef uint64_t (*key_find_fn_t)(meta_obj_t*, void*, void**);
typedef struct { typedef struct {
key_add_fn_t add_key; key_add_fn_t add_key;
key_del_fn_t del_key; key_del_fn_t del_key;
key_find_fn_t find_key; key_find_fn_t find_key;
} intf_key2id_t; } intf_kv_t;
typedef struct { typedef struct {
intf_lock_t* lock; intf_lock_t* lock;
@ -167,7 +167,7 @@ typedef struct {
intf_hash_t* hash; intf_hash_t* hash;
intf_length_t* length; intf_length_t* length;
intf_bitmap_t* bitmap; intf_bitmap_t* bitmap;
intf_key2id_t* key2id; intf_kv_t* kv;
} interface_table_t; } interface_table_t;
struct typeinfo_ { struct typeinfo_ {
@ -214,8 +214,8 @@ extern int bit_set(var, unsigned long);
extern int bit_clr(var, unsigned long); extern int bit_clr(var, unsigned long);
extern int bit_clrall(var); extern int bit_clrall(var);
extern int key_add(var, uint64_t*, void*); extern int key_add(var, void*, void*);
extern int key_del(var, void*); extern int key_del(var, void*);
extern int key_find(var, uint64_t*, void*); extern int key_find(var, void*, void**);
#endif #endif

14
src/key2id.c → src/kv.c
View file

@ -4,7 +4,7 @@
#include "rtti.h" #include "rtti.h"
int key_add(var v, uint64_t* id, void* key) int key_add(var v, void* key, void* value)
{ {
meta_obj_t* obj = NULL; meta_obj_t* obj = NULL;
key_add_fn_t method = NULL; key_add_fn_t method = NULL;
@ -14,12 +14,12 @@ int key_add(var v, uint64_t* id, void* key)
return -EINVAL; return -EINVAL;
} }
RTTI_GET_METHOD(method, obj, key2id, add_key); RTTI_GET_METHOD(method, obj, kv, add_key);
if (method == NULL) { if (method == NULL) {
return -EINVAL; return -EINVAL;
} }
return method(obj, id, key); return method(obj, key, value);
} }
int key_del(var v, void* key) int key_del(var v, void* key)
@ -32,7 +32,7 @@ int key_del(var v, void* key)
return -EINVAL; return -EINVAL;
} }
RTTI_GET_METHOD(method, obj, key2id, del_key); RTTI_GET_METHOD(method, obj, kv, del_key);
if (method == NULL) { if (method == NULL) {
return -EINVAL; return -EINVAL;
} }
@ -40,7 +40,7 @@ int key_del(var v, void* key)
return method(obj, key); return method(obj, key);
} }
int key_find(var v, uint64_t* id, void* key) int key_find(var v, void* key, void** value)
{ {
meta_obj_t* obj = NULL; meta_obj_t* obj = NULL;
key_find_fn_t method = NULL; key_find_fn_t method = NULL;
@ -50,10 +50,10 @@ int key_find(var v, uint64_t* id, void* key)
return -EINVAL; return -EINVAL;
} }
RTTI_GET_METHOD(method, obj, key2id, find_key); RTTI_GET_METHOD(method, obj, kv, find_key);
if (method == NULL) { if (method == NULL) {
return -EINVAL; return -EINVAL;
} }
return method(obj, id, key); return method(obj, key, value);
} }

2
src/meson.build
View file

@ -10,7 +10,7 @@ librtti_c_srcs=[
'hash.c', 'hash.c',
'length.c', 'length.c',
'bitmap.c', 'bitmap.c',
'key2id.c', 'kv.c',
] ]