cleanup

src/vdp_pesi.c

@@ -1054,15 +1054,8 @@ vdp_pesi_bytes(struct req *req, enum vdp_action act, void **priv,
 					"state=%d npending=%d",
 					tree->root->state,
 					tree->npending);
-#if 1
 				AZ(Lck_CondWait(&tree->cond,
 						&tree->tree_lock, 0));
-#else
-				(void)(Lck_CondWait(&tree->cond,
-						    &tree->tree_lock,
-						    VTIM_real() + 2));
-				AZ(errno);
-#endif
 				tree_deliver(req, tree);
 			}
 			Lck_Unlock(&tree->tree_lock);
@@ -1129,7 +1122,7 @@ assert_vdp_next_not(struct req *req, const struct vdp *vdp)
 }
 
 /*
- * close first vdp and assert it has the right type
+ * close vdp at position skip and assert it has the right type
  *
  * there must be at least one vdp remaining
  */
@@ -1177,18 +1170,6 @@ push_vdps(struct req *req, struct nexus_gzip *gz)
 	CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
 	CHECK_OBJ_NOTNULL(req->wrk, WORKER_MAGIC);
 
-#ifdef DEBUG
-	/* XXX 5-28 */
-	struct vdp_entry *vdpe;
-	CHECK_OBJ_NOTNULL(req->vdc, VDP_CTX_MAGIC);
-	VTAILQ_FOREACH(vdpe, &req->vdc->vdp, list) {
-		CHECK_OBJ_NOTNULL(vdpe, VDP_ENTRY_MAGIC);
-		VSLdbgv(req,
-			"push_vdps: VDP list before pushing parent VDPs: %s",
-			vdpe->vdp->name);
-	}
-#endif
-
 	i = ObjCheckFlag(req->wrk, req->objcore, OF_GZIPED);
 	if (gz->is && i && !(req->res_mode & RES_ESI)) {
 		/* A gzip'ed include which is not ESI processed */
@@ -1210,14 +1191,6 @@ push_vdps(struct req *req, struct nexus_gzip *gz)
 	}
 	// else just push to parent
 
-#ifdef DEBUG
-	/* XXX debugging */
-	CHECK_OBJ_NOTNULL(req->vdc, VDP_CTX_MAGIC);
-	VTAILQ_FOREACH(vdpe, &req->vdc->vdp, list) {
-		CHECK_OBJ_NOTNULL(vdpe, VDP_ENTRY_MAGIC);
-		VSLdbgv(req, "push_vdps: VDP list: %s", vdpe->vdp->name);
-	}
-#endif
 	return (0);
 }