Commit cddce39d authored by Nils Goroll's avatar Nils Goroll

remove useless references to pecx

it is only needed in the esi parser and for some sanity checks
parent f7f0af00
...@@ -253,9 +253,9 @@ struct bytes_tree { ...@@ -253,9 +253,9 @@ struct bytes_tree {
/* /*
* pesi_tree is a global context for the entire ESI tree started at level 0. * pesi_tree is a global context for the entire ESI tree started at level 0.
* pecx is local to each subrequest, allocated in req WS. * pesi is local to each subrequest, allocated in req WS.
* *
* XXX remove and merge with bytes_tree ? * XXX merge pesi_tree with bytes_tree ?
*/ */
struct pesi; struct pesi;
...@@ -910,7 +910,6 @@ ved_task(struct worker *wrk, void *priv) ...@@ -910,7 +910,6 @@ ved_task(struct worker *wrk, void *priv)
struct sess *sp; struct sess *sp;
struct pesi *pesi; struct pesi *pesi;
struct pesi_tree *pesi_tree; struct pesi_tree *pesi_tree;
struct pecx *pecx;
struct node *node; struct node *node;
enum req_fsm_nxt s; enum req_fsm_nxt s;
...@@ -937,8 +936,6 @@ ved_task(struct worker *wrk, void *priv) ...@@ -937,8 +936,6 @@ ved_task(struct worker *wrk, void *priv)
CAST_OBJ_NOTNULL(pesi, req->transport_priv, PESI_MAGIC); CAST_OBJ_NOTNULL(pesi, req->transport_priv, PESI_MAGIC);
pesi_tree = pesi->pesi_tree; pesi_tree = pesi->pesi_tree;
CHECK_OBJ_NOTNULL(pesi_tree, PESI_TREE_MAGIC); CHECK_OBJ_NOTNULL(pesi_tree, PESI_TREE_MAGIC);
pecx = pesi->pecx;
CHECK_OBJ_NOTNULL(pecx, PECX_MAGIC);
pesi->wrk = wrk; pesi->wrk = wrk;
node = pesi->node; node = pesi->node;
CHECK_OBJ_NOTNULL(node, NODE_MAGIC); CHECK_OBJ_NOTNULL(node, NODE_MAGIC);
...@@ -1116,7 +1113,6 @@ vped_include(struct req *preq, const char *src, const char *host, ...@@ -1116,7 +1113,6 @@ vped_include(struct req *preq, const char *src, const char *host,
{ {
struct worker *wrk; struct worker *wrk;
struct sess *sp; struct sess *sp;
struct pecx *pecx, *npecx;
struct pesi_tree *pesi_tree; struct pesi_tree *pesi_tree;
struct req *req; struct req *req;
struct bytes_tree *tree; struct bytes_tree *tree;
...@@ -1128,8 +1124,6 @@ vped_include(struct req *preq, const char *src, const char *host, ...@@ -1128,8 +1124,6 @@ vped_include(struct req *preq, const char *src, const char *host,
sp = preq->sp; sp = preq->sp;
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC); CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(pesi, PESI_MAGIC); CHECK_OBJ_NOTNULL(pesi, PESI_MAGIC);
pecx = pesi->pecx;
CHECK_OBJ_NOTNULL(pecx, PECX_MAGIC);
pesi_tree = pesi->pesi_tree; pesi_tree = pesi->pesi_tree;
CHECK_OBJ_NOTNULL(pesi_tree, PESI_TREE_MAGIC); CHECK_OBJ_NOTNULL(pesi_tree, PESI_TREE_MAGIC);
tree = pesi_tree->tree; tree = pesi_tree->tree;
...@@ -1222,8 +1216,6 @@ vped_include(struct req *preq, const char *src, const char *host, ...@@ -1222,8 +1216,6 @@ vped_include(struct req *preq, const char *src, const char *host,
return (-1); return (-1);
} }
npecx = pesi2->pecx;
AZ(npecx->state);
pesi2->node = node; pesi2->node = node;
req->transport_priv = pesi2; req->transport_priv = pesi2;
...@@ -1905,7 +1897,6 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv, ...@@ -1905,7 +1897,6 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
CHECK_OBJ_NOTNULL(req, REQ_MAGIC); CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
CHECK_OBJ_NOTNULL(pesi->pecx, PECX_MAGIC);
parent = pesi->node; parent = pesi->node;
CHECK_OBJ_NOTNULL(parent, NODE_MAGIC); CHECK_OBJ_NOTNULL(parent, NODE_MAGIC);
assert(parent->type == T_NEXUS); assert(parent->type == T_NEXUS);
...@@ -2188,7 +2179,6 @@ vdp_pesi_fini(struct req *req, void **priv) ...@@ -2188,7 +2179,6 @@ vdp_pesi_fini(struct req *req, void **priv)
struct pesi *pesi; struct pesi *pesi;
struct pesi_tree *pesi_tree; struct pesi_tree *pesi_tree;
struct bytes_tree *bytes_tree; struct bytes_tree *bytes_tree;
struct pecx *pecx;
struct node *node; struct node *node;
CHECK_OBJ_NOTNULL(req, REQ_MAGIC); CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
...@@ -2203,9 +2193,6 @@ vdp_pesi_fini(struct req *req, void **priv) ...@@ -2203,9 +2193,6 @@ vdp_pesi_fini(struct req *req, void **priv)
VSLdbgv(req, "vdp_pesi_fini: esi_level=%u", req->esi_level); VSLdbgv(req, "vdp_pesi_fini: esi_level=%u", req->esi_level);
// XXX turn assertion - can we close in vdp_pesi_bytes?
pecx = pesi->pecx;
CHECK_OBJ_NOTNULL(pecx, PECX_MAGIC);
node = pesi->node; node = pesi->node;
CHECK_OBJ_NOTNULL(node, NODE_MAGIC); CHECK_OBJ_NOTNULL(node, NODE_MAGIC);
......
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