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
4ddf7012
Commit
4ddf7012
authored
Jan 20, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename the 'boc' variable to 'busy' to avoid misunderstandings
now that we have a struct boc.
parent
e25593a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+16
-16
No files found.
bin/varnishd/cache/cache_req_fsm.c
View file @
4ddf7012
...
@@ -355,7 +355,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
...
@@ -355,7 +355,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
static
enum
req_fsm_nxt
static
enum
req_fsm_nxt
cnt_lookup
(
struct
worker
*
wrk
,
struct
req
*
req
)
cnt_lookup
(
struct
worker
*
wrk
,
struct
req
*
req
)
{
{
struct
objcore
*
oc
,
*
b
oc
;
struct
objcore
*
oc
,
*
b
usy
;
enum
lookup_e
lr
;
enum
lookup_e
lr
;
int
had_objhead
=
0
;
int
had_objhead
=
0
;
...
@@ -370,7 +370,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -370,7 +370,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
AZ
(
req
->
objcore
);
AZ
(
req
->
objcore
);
if
(
req
->
hash_objhead
)
if
(
req
->
hash_objhead
)
had_objhead
=
1
;
had_objhead
=
1
;
lr
=
HSH_Lookup
(
req
,
&
oc
,
&
b
oc
,
lr
=
HSH_Lookup
(
req
,
&
oc
,
&
b
usy
,
req
->
esi_level
==
0
?
1
:
0
,
req
->
esi_level
==
0
?
1
:
0
,
req
->
hash_always_miss
?
1
:
0
req
->
hash_always_miss
?
1
:
0
);
);
...
@@ -386,10 +386,10 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -386,10 +386,10 @@ cnt_lookup(struct worker *wrk, struct req *req)
if
(
had_objhead
)
if
(
had_objhead
)
VSLb_ts_req
(
req
,
"Waitinglist"
,
W_TIM_real
(
wrk
));
VSLb_ts_req
(
req
,
"Waitinglist"
,
W_TIM_real
(
wrk
));
if
(
b
oc
==
NULL
)
{
if
(
b
usy
==
NULL
)
{
VRY_Finish
(
req
,
DISCARD
);
VRY_Finish
(
req
,
DISCARD
);
}
else
{
}
else
{
AN
(
b
oc
->
flags
&
OC_F_BUSY
);
AN
(
b
usy
->
flags
&
OC_F_BUSY
);
VRY_Finish
(
req
,
KEEP
);
VRY_Finish
(
req
,
KEEP
);
}
}
...
@@ -397,9 +397,9 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -397,9 +397,9 @@ cnt_lookup(struct worker *wrk, struct req *req)
if
(
lr
==
HSH_MISS
)
{
if
(
lr
==
HSH_MISS
)
{
/* Found nothing */
/* Found nothing */
AZ
(
oc
);
AZ
(
oc
);
AN
(
b
oc
);
AN
(
b
usy
);
AN
(
b
oc
->
flags
&
OC_F_BUSY
);
AN
(
b
usy
->
flags
&
OC_F_BUSY
);
req
->
objcore
=
b
oc
;
req
->
objcore
=
b
usy
;
req
->
req_step
=
R_STP_MISS
;
req
->
req_step
=
R_STP_MISS
;
return
(
REQ_FSM_MORE
);
return
(
REQ_FSM_MORE
);
}
}
...
@@ -408,9 +408,9 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -408,9 +408,9 @@ cnt_lookup(struct worker *wrk, struct req *req)
AZ
(
oc
->
flags
&
OC_F_BUSY
);
AZ
(
oc
->
flags
&
OC_F_BUSY
);
req
->
objcore
=
oc
;
req
->
objcore
=
oc
;
if
((
oc
->
flags
&
OC_F_PASS
)
&&
b
oc
!=
NULL
)
{
if
((
oc
->
flags
&
OC_F_PASS
)
&&
b
usy
!=
NULL
)
{
/* Treat a graced Hit-For-Pass as a miss */
/* Treat a graced Hit-For-Pass as a miss */
req
->
objcore
=
b
oc
;
req
->
objcore
=
b
usy
;
req
->
stale_oc
=
oc
;
req
->
stale_oc
=
oc
;
req
->
req_step
=
R_STP_MISS
;
req
->
req_step
=
R_STP_MISS
;
return
(
REQ_FSM_MORE
);
return
(
REQ_FSM_MORE
);
...
@@ -431,10 +431,10 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -431,10 +431,10 @@ cnt_lookup(struct worker *wrk, struct req *req)
switch
(
wrk
->
handling
)
{
switch
(
wrk
->
handling
)
{
case
VCL_RET_DELIVER
:
case
VCL_RET_DELIVER
:
if
(
b
oc
!=
NULL
)
{
if
(
b
usy
!=
NULL
)
{
AZ
(
oc
->
flags
&
OC_F_PASS
);
AZ
(
oc
->
flags
&
OC_F_PASS
);
AZ
(
b
oc
->
busyobj
);
AZ
(
b
usy
->
busyobj
);
VBF_Fetch
(
wrk
,
req
,
b
oc
,
oc
,
VBF_BACKGROUND
);
VBF_Fetch
(
wrk
,
req
,
b
usy
,
oc
,
VBF_BACKGROUND
);
}
else
{
}
else
{
(
void
)
VRB_Ignore
(
req
);
// XXX: handle err
(
void
)
VRB_Ignore
(
req
);
// XXX: handle err
}
}
...
@@ -447,8 +447,8 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -447,8 +447,8 @@ cnt_lookup(struct worker *wrk, struct req *req)
"change return(fetch) to return(miss) in vcl_hit{}"
);
"change return(fetch) to return(miss) in vcl_hit{}"
);
/* FALL-THROUGH */
/* FALL-THROUGH */
case
VCL_RET_MISS
:
case
VCL_RET_MISS
:
if
(
b
oc
!=
NULL
)
{
if
(
b
usy
!=
NULL
)
{
req
->
objcore
=
b
oc
;
req
->
objcore
=
b
usy
;
req
->
stale_oc
=
oc
;
req
->
stale_oc
=
oc
;
req
->
req_step
=
R_STP_MISS
;
req
->
req_step
=
R_STP_MISS
;
}
else
{
}
else
{
...
@@ -481,8 +481,8 @@ cnt_lookup(struct worker *wrk, struct req *req)
...
@@ -481,8 +481,8 @@ cnt_lookup(struct worker *wrk, struct req *req)
/* Drop our object, we won't need it */
/* Drop our object, we won't need it */
(
void
)
HSH_DerefObjCore
(
wrk
,
&
req
->
objcore
);
(
void
)
HSH_DerefObjCore
(
wrk
,
&
req
->
objcore
);
if
(
b
oc
!=
NULL
)
{
if
(
b
usy
!=
NULL
)
{
(
void
)
HSH_DerefObjCore
(
wrk
,
&
b
oc
);
(
void
)
HSH_DerefObjCore
(
wrk
,
&
b
usy
);
VRY_Clear
(
req
);
VRY_Clear
(
req
);
}
}
...
...
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