Introduce a local "req" parameter in the cnt_* states, and pass wrk and req

in as paramters to shave a few source lines

bin/varnishd/cache/cache.h

@@ -127,7 +127,7 @@ typedef struct {
 /*--------------------------------------------------------------------*/
 
 enum step {
-#define STEP(l, u)	STP_##u,
+#define STEP(l, u, arg)	STP_##u,
 #include "tbl/steps.h"
 #undef STEP
 };

bin/varnishd/cache/cache_panic.c

@@ -238,7 +238,7 @@ pan_sess(const struct sess *sp)
 	    sp->addr ? sp->addr : "?.?.?.?",
 	    sp->port ? sp->port : "?");
 	switch (sp->step) {
-#define STEP(l, u) case STP_##u: stp = "STP_" #u; break;
+#define STEP(l, u, arg) case STP_##u: stp = "STP_" #u; break;
 #include "tbl/steps.h"
 #undef STEP
 		default: stp = NULL;

include/tbl/steps.h

@@ -29,20 +29,20 @@
  */
 
 /*lint -save -e525 -e539 */
-STEP(wait,	WAIT)
-STEP(first,	FIRST)
-STEP(recv,	RECV)
-STEP(start,	START)
-STEP(pipe,	PIPE)
-STEP(pass,	PASS)
-STEP(lookup,	LOOKUP)
-STEP(miss,	MISS)
-STEP(hit,	HIT)
-STEP(fetch,	FETCH)
-STEP(fetchbody,	FETCHBODY)
-STEP(streambody,STREAMBODY)
-STEP(prepresp,	PREPRESP)
-STEP(deliver,	DELIVER)
-STEP(error,	ERROR)
-STEP(done,	DONE)
+STEP(wait,		WAIT,		(sp, sp->wrk, sp->req))
+STEP(first,		FIRST,		(sp, sp->wrk))
+STEP(recv,		RECV,		(sp, sp->wrk, sp->req))
+STEP(start,		START,		(sp, sp->wrk, sp->req))
+STEP(pipe,		PIPE,		(sp, sp->wrk, sp->req))
+STEP(pass,		PASS,		(sp, sp->wrk, sp->req))
+STEP(lookup,		LOOKUP,		(sp, sp->wrk, sp->req))
+STEP(miss,		MISS,		(sp, sp->wrk, sp->req))
+STEP(hit,		HIT,		(sp, sp->wrk, sp->req))
+STEP(fetch,		FETCH,		(sp, sp->wrk, sp->req))
+STEP(fetchbody,		FETCHBODY,	(sp, sp->wrk, sp->req))
+STEP(streambody,	STREAMBODY,	(sp, sp->wrk, sp->req))
+STEP(prepresp,		PREPRESP,	(sp, sp->wrk, sp->req))
+STEP(deliver,		DELIVER,	(sp, sp->wrk, sp->req))
+STEP(error,		ERROR,		(sp, sp->wrk, sp->req))
+STEP(done,		DONE,		(sp, sp->wrk, sp->req))
 /*lint -restore */