Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
47c7bc11
Commit
47c7bc11
authored
Jun 19, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename STEP to SESS_STEP
parent
1c14a9d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
22 deletions
+22
-22
cache.h
bin/varnishd/cache/cache.h
+2
-2
cache_center.c
bin/varnishd/cache/cache_center.c
+2
-2
cache_panic.c
bin/varnishd/cache/cache_panic.c
+2
-2
steps.h
include/tbl/steps.h
+16
-16
No files found.
bin/varnishd/cache/cache.h
View file @
47c7bc11
...
...
@@ -123,9 +123,9 @@ typedef struct {
/*--------------------------------------------------------------------*/
enum
step
{
#define STEP(l, u, arg) STP_##u,
#define S
ESS_S
TEP(l, u, arg) STP_##u,
#include "tbl/steps.h"
#undef STEP
#undef S
ESS_S
TEP
};
/*--------------------------------------------------------------------*/
...
...
bin/varnishd/cache/cache_center.c
View file @
47c7bc11
...
...
@@ -1644,14 +1644,14 @@ CNT_Session(struct sess *sp)
}
switch
(
sp
->
step
)
{
#define STEP(l,u,arg) \
#define S
ESS_S
TEP(l,u,arg) \
case STP_##u: \
if (cache_param->diag_bitmap & 0x01) \
cnt_diag(sp, #u); \
done = cnt_##l arg; \
break;
#include "tbl/steps.h"
#undef STEP
#undef S
ESS_S
TEP
default:
WRONG
(
"State engine misfire"
);
}
...
...
bin/varnishd/cache/cache_panic.c
View file @
47c7bc11
...
...
@@ -278,9 +278,9 @@ pan_sess(const struct sess *sp)
sp
->
addr
?
sp
->
addr
:
"?.?.?.?"
,
sp
->
port
?
sp
->
port
:
"?"
);
switch
(
sp
->
step
)
{
#define STEP(l, u, arg) case STP_##u: stp = "STP_" #u; break;
#define S
ESS_S
TEP(l, u, arg) case STP_##u: stp = "STP_" #u; break;
#include "tbl/steps.h"
#undef STEP
#undef S
ESS_S
TEP
default:
stp
=
NULL
;
}
if
(
stp
!=
NULL
)
...
...
include/tbl/steps.h
View file @
47c7bc11
...
...
@@ -29,20 +29,20 @@
*/
/*lint -save -e525 -e539 */
STEP
(
wait
,
WAIT
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
STEP
(
first
,
FIRST
,
(
sp
,
sp
->
wrk
))
STEP
(
restart
,
RESTART
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
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
(
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
))
S
ESS_S
TEP
(
wait
,
WAIT
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
first
,
FIRST
,
(
sp
,
sp
->
wrk
))
S
ESS_S
TEP
(
restart
,
RESTART
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
recv
,
RECV
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
start
,
START
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
pipe
,
PIPE
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
pass
,
PASS
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
lookup
,
LOOKUP
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
miss
,
MISS
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
hit
,
HIT
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
fetch
,
FETCH
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
fetchbody
,
FETCHBODY
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
prepresp
,
PREPRESP
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
deliver
,
DELIVER
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
error
,
ERROR
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
S
ESS_S
TEP
(
done
,
DONE
,
(
sp
,
sp
->
wrk
,
sp
->
req
))
/*lint -restore */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment