move pecx members where they belong

src/vdp_pesi.c

@@ -276,6 +276,9 @@ struct pesi_tree {
 /*
  * per request state
  *
+ * pecx: ESI parser
+ * pesi: any request
+ *
  */
 struct pecx {
 	unsigned		magic;
@@ -283,12 +286,8 @@ struct pecx {
 	const uint8_t		*p;
 	const uint8_t		*e;
 
-	struct worker		*wrk;
-	struct node	*node;
-
 	ssize_t			l;
 	int			state;
-	int			woken;
 };
 
 struct pesi {
@@ -297,6 +296,10 @@ struct pesi {
 	unsigned		has_task:1;
 
 	struct pesi_tree	*pesi_tree;
+	struct worker		*wrk;
+	struct node		*node;
+	int			woken;
+
 	struct pecx		pecx[1];
 	VTAILQ_ENTRY(pesi)	list;
 };
@@ -936,8 +939,8 @@ ved_task(struct worker *wrk, void *priv)
 	CHECK_OBJ_NOTNULL(pesi_tree, PESI_TREE_MAGIC);
 	pecx = pesi->pecx;
 	CHECK_OBJ_NOTNULL(pecx, PECX_MAGIC);
-	pecx->wrk = wrk;
-	node = pecx->node;
+	pesi->wrk = wrk;
+	node = pesi->node;
 	CHECK_OBJ_NOTNULL(node, NODE_MAGIC);
 	CHECK_OBJ_NOTNULL(pesi_tree->tree, BYTES_TREE_MAGIC);
 
@@ -962,7 +965,7 @@ ved_task(struct worker *wrk, void *priv)
 
 	while (1) {
 		req->wrk = wrk;
-		pecx->woken = 0;
+		pesi->woken = 0;
 		VSLdbgv(req, "Starting CNT_Request() req=%p", req);
 		s = CNT_Request(req);
 		VSLdbgv(req, "CNT_Request()=%d req=%p", s, req);
@@ -972,14 +975,14 @@ ved_task(struct worker *wrk, void *priv)
 		    "loop waiting for ESI (%d)", (int)s);
 		assert(s == REQ_FSM_DISEMBARK);
 		Lck_Lock(&req->sp->mtx);
-		if (!pecx->woken) {
+		if (!pesi->woken) {
 			VSLb(req->vsl, SLT_Debug, "Waiting for busyobj");
 			(void)Lck_CondWait(
 			    &wrk->cond, &req->sp->mtx, 0);
 			VSLb(req->vsl, SLT_Debug, "busyobj wakeup");
 		}
 		Lck_Unlock(&req->sp->mtx);
-		pecx->woken = 0;
+		pesi->woken = 0;
 		AZ(req->wrk);
 		VSLdbg(req, "Calling CNT_Embark()");
 		CNT_Embark(wrk, req);
@@ -1221,7 +1224,7 @@ vped_include(struct req *preq, const char *src, const char *host,
 
 	npecx = pesi2->pecx;
 	AZ(npecx->state);
-	npecx->node = node;
+	pesi2->node = node;
 
 	req->transport_priv = pesi2;
 
@@ -1903,7 +1906,7 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
 	CHECK_OBJ_NOTNULL(pesi->pecx, PECX_MAGIC);
-	parent = pesi->pecx->node;
+	parent = pesi->node;
 	CHECK_OBJ_NOTNULL(parent, NODE_MAGIC);
 	assert(parent->type == T_NEXUS);
 	VSLdbgv(req, "bytes_add: parent=%p front=%p",
@@ -2171,9 +2174,9 @@ vdp_pesi_init(struct req *req, void **priv)
 	AZ(pthread_cond_init(&pesi_tree->tree->cond, NULL));
 	AZ(pesi_tree->tree->retval);
 
-	pecx->node = pesi_tree->tree->root;
+	pesi->node = pesi_tree->tree->root;
 	AZ(pecx->state);
-	AZ(pecx->woken);
+	AZ(pesi->woken);
 
 	VDP_Push(req, &VDP_pesi_buf, pesi);
 	return (0);
@@ -2203,7 +2206,7 @@ vdp_pesi_fini(struct req *req, void **priv)
 	// XXX turn assertion - can we close in vdp_pesi_bytes?
 	pecx = pesi->pecx;
 	CHECK_OBJ_NOTNULL(pecx, PECX_MAGIC);
-	node = pecx->node;
+	node = pesi->node;
 	CHECK_OBJ_NOTNULL(node, NODE_MAGIC);
 
 	if (req->esi_level > 0) {
@@ -2296,7 +2299,7 @@ vdp_pesi_bytes(struct req *req, enum vdp_action act, void **priv,
 	pecx = pesi->pecx;
 	tree = pesi->pesi_tree->tree;
 
-	node = pecx->node;
+	node = pesi->node;
 	CHECK_OBJ_NOTNULL(node, NODE_MAGIC);
 
 	/*
@@ -2548,8 +2551,8 @@ vped_reembark(struct worker *wrk, struct req *req)
 
 	VSLb(req->vsl, SLT_Debug, "reembark wakeup");
 	Lck_Lock(&req->sp->mtx);
-	pesi->pecx->woken = 1;
-	AZ(pthread_cond_signal(&pesi->pecx->wrk->cond));
+	pesi->woken = 1;
+	AZ(pthread_cond_signal(&pesi->wrk->cond));
 	Lck_Unlock(&req->sp->mtx);
 }
 
@@ -2624,7 +2627,7 @@ vped_deliver(struct req *req, struct boc *boc, int wantbody)
 	CHECK_OBJ_NOTNULL(pesi->pesi_tree->tree, BYTES_TREE_MAGIC);
 	tree = pesi->pesi_tree->tree;
 
-	node = pesi->pecx->node;
+	node = pesi->node;
 	parent = node->parent;
 	CHECK_OBJ_NOTNULL(parent, NODE_MAGIC);
 	assert(parent->type == T_NEXUS);