Skip to content

V
varnish-cache
Commit 4c0b6693 authored by Joshua Bussdieker's avatar Joshua Bussdieker
Browse files
Options

Remove debug lines

parent b2fef867
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 38 deletions
bin/varnishd/cache/cache_fetch.c
View file @ 4c0b6693
......@@ -217,7 +217,6 @@ vbf_stp_fetchhdr(struct worker *wrk, struct busyobj *bo)
static enum fetch_step
vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
{
printf(" vbf_stp_fetch(wrk: %p, bo: %p)\n", wrk, bo);
struct http *hp, *hp2;
char *b;
uint16_t nhttp;
......@@ -440,7 +439,6 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
}
VBO_DerefBusyObj(wrk, &bo); // XXX ?
printf(" vbf_stp_fetch(wrk: %p, bo: %p) = F_STP_DONE\n", wrk, bo);
return (F_STP_DONE);
}
......@@ -533,7 +531,6 @@ vbf_fetch_thread(struct worker *wrk, void *priv)
void
VBF_Fetch(struct worker *wrk, struct req *req)
{
printf(" VBF_Fetch(wrk: %p, req: %p)\n", wrk, req);
struct busyobj *bo;
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
......@@ -561,5 +558,4 @@ VBF_Fetch(struct worker *wrk, struct req *req)
printf("XXX\n");
(void)usleep(100000);
}
printf(" VBF_Fetch(wrk: %p, req: %p) = void\n", wrk, req);
}
bin/varnishd/cache/cache_hash.c
View file @ 4c0b6693
......@@ -305,7 +305,6 @@ enum lookup_e
HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
int wait_for_busy, int always_insert)
{
printf(" HSH_Lookup(req: %p, *ocp: %p, *bocp: %p, wait_for_busy: %d, always_insert: %d)\n", req, *ocp, *bocp, wait_for_busy, always_insert);
struct worker *wrk;
struct objhead *oh;
struct objcore *oc;
......@@ -354,7 +353,6 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
*bocp = hsh_insert_busyobj(wrk, oh);
/* NB: no deref of objhead, new object inherits reference */
Lck_Unlock(&oh->mtx);
printf(" HSH_Lookup(req: %p, *ocp: %p, *bocp: %p, wait_for_busy: %d, always_insert: %d) = HSH_MISS\n", req, *ocp, *bocp, wait_for_busy, always_insert);
return (HSH_MISS);
}
......@@ -415,7 +413,6 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
if (!cache_param->obj_readonly && o->hits < INT_MAX)
o->hits++;
*ocp = oc;
printf(" HSH_Lookup(req: %p, *ocp: %p, *bocp: %p, wait_for_busy: %d, always_insert: %d) = HSH_HIT\n", req, *ocp, *bocp, wait_for_busy, always_insert);
return (HSH_HIT);
}
if (o->exp.entered > exp_entered) {
......@@ -454,7 +451,6 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
*bocp = hsh_insert_busyobj(wrk, oh);
/* NB: no deref of objhead, new object inherits reference */
Lck_Unlock(&oh->mtx);
printf(" HSH_Lookup(req: %p, *ocp: %p, *bocp: %p, wait_for_busy: %d, always_insert: %d) = HSH_MISS\n", req, *ocp, *bocp, wait_for_busy, always_insert);
return (HSH_MISS);
}
......@@ -486,7 +482,6 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
*/
req->hash_objhead = oh;
Lck_Unlock(&oh->mtx);
printf(" HSH_Lookup(req: %p, *ocp: %p, *bocp: %p, wait_for_busy: %d, always_insert: %d) = HSH_BUSY\n", req, *ocp, *bocp, wait_for_busy, always_insert);
return (HSH_BUSY);
}
......
bin/varnishd/cache/cache_req_fsm.c
View file @ 4c0b6693
......@@ -940,7 +940,6 @@ cnt_diag(struct req *req, const char *state)
enum req_fsm_nxt
CNT_Request(struct worker *wrk, struct req *req)
{
printf("CNT_Request(wrk: %p, req: %p)\n", wrk, req);
enum req_fsm_nxt nxt;
struct storage *st;
......@@ -1023,7 +1022,6 @@ CNT_Request(struct worker *wrk, struct req *req)
req->wrk = NULL;
assert(WRW_IsReleased(wrk));
printf("CNT_Request(wrk: %p, req: %p) = %d\n", wrk, req, nxt);
return (nxt);
}
......
bin/varnishd/cache/cache_session.c
View file @ 4c0b6693
......@@ -344,7 +344,6 @@ SES_Delete(struct sess *sp, enum sess_close reason, double now)
struct req *
SES_GetReq(struct worker *wrk, struct sess *sp)
{
printf("SES_GetReq(wrk: %p, sp: %p)\n", wrk, sp);
struct sesspool *pp;
struct req *req;
uint16_t nhttp;
......@@ -402,12 +401,6 @@ SES_GetReq(struct worker *wrk, struct sess *sp)
VTAILQ_INIT(&req->body);
printf(" - Start: %p\n", req->ws->s);
printf(" - Free: %p\n", req->ws->f);
printf(" - Reserve: %p\n", req->ws->r);
printf(" - End: %p\n", req->ws->e);
printf(" %dKB\n", (req->ws->e - req->ws->s) / 1024);
printf("SES_GetReq(wrk: %p, sp: %p) = %p\n", wrk, sp, req);
return (req);
}
......
bin/varnishd/cache/cache_vary.c
View file @ 4c0b6693
......@@ -73,7 +73,6 @@
int
VRY_Create(struct busyobj *bo, struct vsb **psb)
{
printf(" VRY_Create(bo: %p, psb: %p)\n", bo, *psb);
char *v, *p, *q, *h, *e;
struct vsb *sb, *sbh;
unsigned l;
......@@ -166,7 +165,6 @@ VRY_Create(struct busyobj *bo, struct vsb **psb)
VSB_delete(sbh);
AZ(VSB_finish(sb));
*psb = sb;
printf(" VRY_Create(bo: %p, psb: %p) = %d\n", bo, *psb, VSB_len(sb));
return (VSB_len(sb));
}
......@@ -220,10 +218,6 @@ vry_cmp(const uint8_t *v1, const uint8_t *v2)
void
VRY_Prep(struct req *req)
{
printf(" VRY_Prep(req: %p)\n", req);
printf(" - vary_b %p\n", req->vary_b);
printf(" - vary_l %p\n", req->vary_l);
printf(" - vary_e %p\n", req->vary_e);
if (req->hash_objhead == NULL) {
/* Not a waiting list return */
AZ(req->vary_b);
......@@ -237,10 +231,6 @@ VRY_Prep(struct req *req)
req->vary_e = (void*)req->ws->r;
if (req->vary_b + 2 < req->vary_e)
req->vary_b[2] = '\0';
printf(" - vary_b %p\n", req->vary_b);
printf(" - vary_l %p\n", req->vary_l);
printf(" - vary_e %p\n", req->vary_e);
printf(" VRY_Prep(req: %p) = void\n", req);
}
/**********************************************************************
......@@ -250,10 +240,6 @@ VRY_Prep(struct req *req)
void
VRY_Finish(struct req *req, struct busyobj *bo)
{
printf(" VRY_Finish(req: %p, bo: %p)\n", req, bo);
printf(" - vary_b %p\n", req->vary_b);
printf(" - vary_l %p\n", req->vary_l);
printf(" - vary_e %p\n", req->vary_e);
if (bo != NULL) {
CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
VRY_Validate(req->vary_b);
......@@ -269,10 +255,6 @@ VRY_Finish(struct req *req, struct busyobj *bo)
req->vary_b = NULL;
req->vary_l = NULL;
req->vary_e = NULL;
printf(" - vary_b %p\n", req->vary_b);
printf(" - vary_l %p\n", req->vary_l);
printf(" - vary_e %p\n", req->vary_e);
printf(" VRY_Finish(req: %p, bo: %p) = void\n", req, bo);
}
/**********************************************************************
......@@ -285,9 +267,7 @@ VRY_Finish(struct req *req, struct busyobj *bo)
int
VRY_Match(struct req *req, const uint8_t *vary)
{
printf(" VRY_Match(req: %p, vary: %p)\n", req, vary);
uint8_t *vsp = req->vary_b;
printf(" - vsp: %p\n", vsp);
char *h, *e;
unsigned lh, ln;
int i, oflo = 0;
......
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