Commit 4e701d69 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Add a VRT_CTX arg to vdir_new(), we will need it

parent a99c21d7
......@@ -98,7 +98,7 @@ vmod_fallback__init(VRT_CTX,
ALLOC_OBJ(fb, VMOD_DIRECTORS_FALLBACK_MAGIC);
AN(fb);
*fbp = fb;
vdir_new(&fb->vd, "fallback", vcl_name, vmod_fallback_healthy,
vdir_new(ctx, &fb->vd, "fallback", vcl_name, vmod_fallback_healthy,
vmod_fallback_resolve, fb);
fb->st = sticky;
}
......
......@@ -59,7 +59,7 @@ vmod_hash__init(VRT_CTX, struct vmod_directors_hash **rrp,
ALLOC_OBJ(rr, VMOD_DIRECTORS_HASH_MAGIC);
AN(rr);
*rrp = rr;
vdir_new(&rr->vd, "hash", vcl_name, NULL, NULL, rr);
vdir_new(ctx, &rr->vd, "hash", vcl_name, NULL, NULL, rr);
}
VCL_VOID v_matchproto_()
......
......@@ -86,7 +86,7 @@ vmod_random__init(VRT_CTX, struct vmod_directors_random **rrp,
ALLOC_OBJ(rr, VMOD_DIRECTORS_RANDOM_MAGIC);
AN(rr);
*rrp = rr;
vdir_new(&rr->vd, "random", vcl_name, vmod_random_healthy,
vdir_new(ctx, &rr->vd, "random", vcl_name, vmod_random_healthy,
vmod_random_resolve, rr);
}
......
......@@ -95,7 +95,7 @@ vmod_round_robin__init(VRT_CTX,
ALLOC_OBJ(rr, VMOD_DIRECTORS_ROUND_ROBIN_MAGIC);
AN(rr);
*rrp = rr;
vdir_new(&rr->vd, "round-robin", vcl_name, vmod_rr_healthy,
vdir_new(ctx, &rr->vd, "round-robin", vcl_name, vmod_rr_healthy,
vmod_rr_resolve, rr);
}
......
......@@ -50,11 +50,12 @@ vdir_expand(struct vdir *vd, unsigned n)
}
void
vdir_new(struct vdir **vdp, const char *name, const char *vcl_name,
vdir_new(VRT_CTX, struct vdir **vdp, const char *name, const char *vcl_name,
vdi_healthy_f *healthy, vdi_resolve_f *resolve, void *priv)
{
struct vdir *vd;
AN(ctx);
AN(name);
AN(vcl_name);
AN(vdp);
......
......@@ -41,7 +41,8 @@ struct vdir {
struct vbitmap *vbm;
};
void vdir_new(struct vdir **vdp, const char *name, const char *vcl_name,
void vdir_new(VRT_CTX, struct vdir **vdp, const char *name,
const char *vcl_name,
vdi_healthy_f *healthy, vdi_resolve_f *resolve, void *priv);
void vdir_delete(struct vdir **vdp);
void vdir_rdlock(struct vdir *vd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment