Commit 9e6f88de authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

Add the name of the built-in directors during init

parent 9cd4a900
......@@ -91,7 +91,7 @@ vmod_fallback__init(VRT_CTX,
ALLOC_OBJ(rr, VMOD_DIRECTORS_FALLBACK_MAGIC);
AN(rr);
*rrp = rr;
vdir_new(&rr->vd, vcl_name, vmod_fallback_healthy,
vdir_new(&rr->vd, "fallback", vcl_name, vmod_fallback_healthy,
vmod_fallback_resolve, rr);
}
......
......@@ -64,7 +64,7 @@ vmod_hash__init(VRT_CTX, struct vmod_directors_hash **rrp,
rr->vbm = vbit_init(8);
AN(rr->vbm);
*rrp = rr;
vdir_new(&rr->vd, vcl_name, NULL, NULL, rr);
vdir_new(&rr->vd, "hash", vcl_name, NULL, NULL, rr);
}
VCL_VOID __match_proto__()
......
......@@ -87,8 +87,8 @@ 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, vcl_name, vmod_random_healthy, vmod_random_resolve,
rr);
vdir_new(&rr->vd, "random", vcl_name, vmod_random_healthy,
vmod_random_resolve, rr);
}
VCL_VOID __match_proto__()
......
......@@ -94,7 +94,8 @@ vmod_round_robin__init(VRT_CTX,
ALLOC_OBJ(rr, VMOD_DIRECTORS_ROUND_ROBIN_MAGIC);
AN(rr);
*rrp = rr;
vdir_new(&rr->vd, vcl_name, vmod_rr_healthy, vmod_rr_resolve, rr);
vdir_new(&rr->vd, "round-robin", vcl_name, vmod_rr_healthy,
vmod_rr_resolve, rr);
}
VCL_VOID __match_proto__()
......
......@@ -51,11 +51,12 @@ vdir_expand(struct vdir *vd, unsigned n)
}
void
vdir_new(struct vdir **vdp, const char *vcl_name, vdi_healthy_f *healthy,
vdi_resolve_f *resolve, void *priv)
vdir_new(struct vdir **vdp, const char *name, const char *vcl_name,
vdi_healthy_f *healthy, vdi_resolve_f *resolve, void *priv)
{
struct vdir *vd;
AN(name);
AN(vcl_name);
AN(vdp);
AZ(*vdp);
......@@ -66,6 +67,7 @@ vdir_new(struct vdir **vdp, const char *vcl_name, vdi_healthy_f *healthy,
ALLOC_OBJ(vd->dir, DIRECTOR_MAGIC);
AN(vd->dir);
vd->dir->name = name;
REPLACE(vd->dir->vcl_name, vcl_name);
vd->dir->priv = priv;
vd->dir->healthy = healthy;
......
......@@ -41,8 +41,8 @@ struct vdir {
struct vbitmap *vbm;
};
void vdir_new(struct vdir **vdp, const char *vcl_name, vdi_healthy_f *healthy,
vdi_resolve_f *resolve, void *priv);
void vdir_new(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_lock(struct vdir *vd);
void vdir_unlock(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