diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-02-05 15:29:41 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2018-02-05 23:11:56 +0200 |
| commit | 3eff9532e5116eab0b465c356fc798ec62e16df7 (patch) | |
| tree | 4023205648cd8d400cce6a23ee9702a0ebf518e9 /src/betab.c | |
| parent | 16c8dfa0c3ffabd61bb07d8b47e63983b8eb94da (diff) | |
| download | varnish-mib-3eff9532e5116eab0b465c356fc798ec62e16df7.tar.gz varnish-mib-3eff9532e5116eab0b465c356fc798ec62e16df7.tar.bz2 | |
Initial rewrite for varnish 5.2
* src/betab.c (backend_dfn): Change type of the vpt
array. All uses updated.
(backend_clear): No need to release vpt entries now.
* src/varnish_mib.mib2c (VarnishMib::MIBTable): Change data table
to keep entries of const volatile uint64_t *.
(varnish_var_lookup, varnish_get_oid, dict_install): Reflect that change.
(vd): Rename to vsm.
(dict_load): Change arguments to VSC_Iter
(post_config): VSC_New takes no arguments.
Diffstat (limited to 'src/betab.c')
| -rw-r--r-- | src/betab.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/betab.c b/src/betab.c index 2979f8b..83d77e3 100644 --- a/src/betab.c +++ b/src/betab.c @@ -79,7 +79,7 @@ struct backend_dfn { size_t vbeIPv6_len; u_long vbePort; - struct VSC_point *vpt[VBE_MAX]; + const volatile uint64_t *vpt[VBE_MAX]; VTAILQ_ENTRY(backend_dfn) list; }; @@ -92,9 +92,6 @@ backend_clear(void) { while (!VTAILQ_EMPTY(&backends)) { struct backend_dfn *dfn = VTAILQ_FIRST(&backends); - int i; - for (i = 0; i < VBE_MAX; i++) - VSC_Destroy_Point(&dfn->vpt[i]); VTAILQ_REMOVE(&backends, dfn, list); free(dfn->vbeIdent); SNMP_FREE(dfn); @@ -127,7 +124,7 @@ backend_register(char const *name, size_t len, char const *param, } for (i = 0; betab_trans[i].param; i++) { if (strcmp(betab_trans[i].param, param) == 0) { - dfn->vpt[i] = VSC_Clone_Point(vpt); + dfn->vpt[i] = vpt->ptr; break; } } @@ -162,7 +159,7 @@ backendTable_load(netsnmp_cache *cache, void *vmagic) for (i = 0; i < VBE_MAX; i++) { U64 *u = (U64*)((char*)ent + betab_trans[i].off); - uint64_t n = *(const volatile uint64_t*)dfn->vpt[i]->ptr; + uint64_t n = *dfn->vpt[i]; u->high = n >> 32; u->low = n & 0xffffffff; } |