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
cac8e853
Commit
cac8e853
authored
May 09, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Give/Move the previous reembark code to HTTP1, and close a
narrow race while we're at it.
parent
f839d558
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
22 deletions
+29
-22
cache_hash.c
bin/varnishd/cache/cache_hash.c
+2
-19
cache_http1_fsm.c
bin/varnishd/http1/cache_http1_fsm.c
+27
-3
No files found.
bin/varnishd/cache/cache_hash.c
View file @
cac8e853
...
...
@@ -536,7 +536,6 @@ static void
hsh_rush2
(
struct
worker
*
wrk
,
struct
rush
*
r
)
{
struct
req
*
req
;
struct
sess
*
sp
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
r
,
RUSH_MAGIC
);
...
...
@@ -546,24 +545,8 @@ hsh_rush2(struct worker *wrk, struct rush *r)
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
VTAILQ_REMOVE
(
&
r
->
reqs
,
req
,
w_list
);
DSL
(
DBG_WAITINGLIST
,
req
->
vsl
->
wid
,
"off waiting list"
);
if
(
req
->
transport
->
reembark
!=
NULL
)
{
req
->
transport
->
reembark
(
wrk
,
req
);
continue
;
}
if
(
!
SES_Reschedule_Req
(
req
))
continue
;
/* Couldn't schedule, ditch */
wrk
->
stats
->
busy_wakeup
--
;
wrk
->
stats
->
busy_killed
++
;
AN
(
req
->
vcl
);
VCL_Rel
(
&
req
->
vcl
);
sp
=
req
->
sp
;
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
CNT_AcctLogCharge
(
wrk
->
stats
,
req
);
Req_Release
(
req
);
SES_Delete
(
sp
,
SC_OVERLOAD
,
NAN
);
DSL
(
DBG_WAITINGLIST
,
req
->
vsl
->
wid
,
"kill from waiting list"
);
(
void
)
usleep
(
100000
);
AN
(
req
->
transport
->
reembark
);
req
->
transport
->
reembark
(
wrk
,
req
);
}
}
...
...
bin/varnishd/http1/cache_http1_fsm.c
View file @
cac8e853
...
...
@@ -175,6 +175,31 @@ http1_req_fail(struct req *req, enum sess_close reason)
SES_Close
(
req
->
sp
,
reason
);
}
static
void
__match_proto__
(
vtr_reembark_f
)
http1_reembark
(
struct
worker
*
wrk
,
struct
req
*
req
)
{
struct
sess
*
sp
;
sp
=
req
->
sp
;
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
http1_setstate
(
sp
,
H1BUSY
);
if
(
!
SES_Reschedule_Req
(
req
))
return
;
/* Couldn't schedule, ditch */
wrk
->
stats
->
busy_wakeup
--
;
wrk
->
stats
->
busy_killed
++
;
AN
(
req
->
vcl
);
VCL_Rel
(
&
req
->
vcl
);
CNT_AcctLogCharge
(
wrk
->
stats
,
req
);
Req_Release
(
req
);
SES_Delete
(
sp
,
SC_OVERLOAD
,
NAN
);
DSL
(
DBG_WAITINGLIST
,
req
->
vsl
->
wid
,
"kill from waiting list"
);
usleep
(
10000
);
}
struct
transport
HTTP1_transport
=
{
.
name
=
"HTTP/1"
,
.
magic
=
TRANSPORT_MAGIC
,
...
...
@@ -185,6 +210,7 @@ struct transport HTTP1_transport = {
.
new_session
=
http1_new_session
,
.
sess_panic
=
http1_sess_panic
,
.
req_panic
=
http1_req_panic
,
.
reembark
=
http1_reembark
,
};
/*----------------------------------------------------------------------
...
...
@@ -394,10 +420,8 @@ HTTP1_Session(struct worker *wrk, struct req *req)
req
->
transport
=
&
HTTP1_transport
;
req
->
task
.
func
=
http1_req
;
req
->
task
.
priv
=
req
;
if
(
CNT_Request
(
wrk
,
req
)
==
REQ_FSM_DISEMBARK
)
{
http1_setstate
(
sp
,
H1BUSY
);
if
(
CNT_Request
(
wrk
,
req
)
==
REQ_FSM_DISEMBARK
)
return
;
}
req
->
transport
=
NULL
;
req
->
task
.
func
=
NULL
;
req
->
task
.
priv
=
NULL
;
...
...
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