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

improve resmgr

Browse source
This commit is contained in:
Rongsong Shen 2025-12-18 16:20:41 +08:00
parent 4db6b039c5
commit 1f1e4fdaba
10 changed files with 107 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/lib/kvmgr.c
View file

@ -9,6 +9,8 @@
#include "xce/types.h"
#include "zarray.h"
#include "controller.capnp.h"
int kvmgr_init(kvmgr_t* mgr, hash_key_fn_t keyfn, int nslots, int delta,
zarray_item_killer_t killer)
{
@ -183,3 +185,64 @@ int kvmgr_iter(kvmgr_t* mgr, zarray_iter_skip_fn_t skipfn, xlist_t* l,
return rc;
}
int resmgr_init(resmgr_t* mgr, int nslots, int delta,
zarray_item_killer_t killer)
{
int rc = 0;
rc = kvmgr_init(&(mgr->resdef), string_hash_key, nslots, delta, killer);
if (rc < 0) {
return rc;
}
mgr->nshared = 0;
mgr->nunshared = 0;
return 0;
}
void resmgr_fini(resmgr_t* mgr)
{
kvmgr_fini(&(mgr->resdef));
mgr->nshared = 0;
mgr->nunshared = 0;
}
int32_t resmgr_add_res(resmgr_t* mgr, xce_resource_t* res)
{
int rc = 0;
rc = kvmgr_add(&(mgr->resdef), (void*)res->name, (void*)res);
if (rc < 0) {
return rc;
}
if (res->flags & XCE_RESF_SHARED) {
res->idx = mgr->nshared;
mgr->nshared++;
} else {
res->idx = mgr->nunshared;
mgr->nunshared++;
}
return rc;
}
xce_resource_t* resmgr_lockres(resmgr_t* mgr, char* resname, int op)
{
xce_resource_t* r = NULL;
r = (xce_resource_t*)kvmgr_lock(&(mgr->resdef), (void*)resname, op);
return r;
}
void resmgr_del_res(resmgr_t* mgr, xce_resource_t* r)
{
kvmgr_del(&(mgr->resdef), (void*)r->name);
}
int resmgr_iter(resmgr_t* mgr, xlist_t* l, void* arg)
{
return kvmgr_iter(&(mgr->resdef), NULL, l, arg);
}

33
src/lib/utils.c
View file

@ -1,9 +1,9 @@
#include <ctype.h>
#include <errno.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#if defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ < 28)
#include <pthread.h>
#else
@ -629,31 +629,34 @@ void block_sig(int signo)
c -= rot(b, 24); \
}
uint32_t hash(uint32_t a, uint32_t b,uint32_t c, uint32_t d) {
uint32_t hash(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
{
uint32_t i1 = a, i2 = b, i3 = c, i4 = d;
mix(i1,i2,i3);
mix(i2,i3,i4);
mix(i3,i4,i1);
final(i4,i1,i2);
mix(i1, i2, i3);
mix(i2, i3, i4);
mix(i3, i4, i1);
final(i4, i1, i2);
return i2;
}
uint32_t hash64(uint64_t x) {
uint32_t a = (uint32_t)(x & UMAX_BITS(32));
uint32_t b = (uint32_t)(rot(x, 16) & UMAX_BITS(32));
uint32_t c = (uint32_t)(rot(x,32) & UMAX_BITS(32));
uint32_t d = (uint32_t)(rot(x, 48) & UMAX_BITS(32));
uint32_t hash64(uint64_t x)
{
uint32_t a = (uint32_t)(x >> 32);
uint32_t b = (uint32_t)(x & UMAX_BITS(32));
uint32_t c = ((a & UMAX_BITS(16)) << 16) | (b >> 16);
uint32_t d = ((b & UMAX_BITS(16)) << 16) | (a >> 16);
return hash(a,b,c,d);
return hash(a, b, c, d);
}
uint32_t hash_string(const char *key) {
uint32_t hash_string(const char* key)
{
uint32_t hc = 5381;
int c;
int c;
while ((c = *key ++)) {
while ((c = *key++)) {
hc = ((hc << 5) + hc) + c;
}