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
ef4557c4
Commit
ef4557c4
authored
Feb 25, 2015
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align backend/waiter debugs properly, they may be here for some time.
parent
4aebfa93
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
13 deletions
+22
-13
cache_backend_tcp.c
bin/varnishd/cache/cache_backend_tcp.c
+20
-12
cache_waiter_poll.c
bin/varnishd/waiter/cache_waiter_poll.c
+2
-1
No files found.
bin/varnishd/cache/cache_backend_tcp.c
View file @
ef4557c4
...
...
@@ -93,22 +93,28 @@ tcp_handle(struct waited *w, enum wait_event ev, double now)
tp
=
vbc
->
backend
->
tcp_pool
;
// NB: Incestous
Lck_Lock
(
&
tp
->
mtx
);
VSL
(
SLT_Debug
,
0
,
"------> Handler fd %d in_w %d state %d ev %d stolen %d"
,
vbc
->
fd
,
vbc
->
in_waiter
,
vbc
->
state
,
ev
,
vbc
->
stolen
);
AN
(
vbc
->
in_waiter
);
VSL
(
SLT_Debug
,
0
,
"------> Handler fd %d in_w %d state %d ev %d stolen %d"
,
vbc
->
fd
,
vbc
->
in_waiter
,
vbc
->
state
,
ev
,
vbc
->
stolen
);
switch
(
vbc
->
state
)
{
case
VBC_STATE_AVAIL
:
if
(
ev
!=
WAITER_ACTION
||
!
vbc
->
stolen
)
{
VSL
(
SLT_Debug
,
0
,
"------> Handler avail + !action -> close"
);
VSL
(
SLT_Debug
,
0
,
"------> Handler avail + !action -> close"
);
VTCP_close
(
&
vbc
->
fd
);
VTAILQ_REMOVE
(
&
tp
->
connlist
,
vbc
,
list
);
tp
->
n_conn
--
;
FREE_OBJ
(
vbc
);
}
else
{
VSL
(
SLT_Debug
,
0
,
"------> Handler avail + action -> re-wait"
);
VSL
(
SLT_Debug
,
0
,
"------> Handler avail + action -> re-wait"
);
vbc
->
stolen
=
0
;
if
(
Wait_Enter
(
tp
->
waiter
,
vbc
->
waited
))
{
VSL
(
SLT_Debug
,
0
,
"------> Handler avail + !timeout -> re-wait failed"
);
VSL
(
SLT_Debug
,
0
,
"------> Handler avail + "
"!timeout -> re-wait failed"
);
VTCP_close
(
&
vbc
->
fd
);
VTAILQ_REMOVE
(
&
tp
->
connlist
,
vbc
,
list
);
tp
->
n_conn
--
;
...
...
@@ -117,11 +123,11 @@ VSL(SLT_Debug, 0, "------> Handler avail + !timeout -> re-wait failed");
}
break
;
case
VBC_STATE_USED
:
VSL
(
SLT_Debug
,
0
,
"------> Handler used"
);
VSL
(
SLT_Debug
,
0
,
"------> Handler used"
);
vbc
->
in_waiter
=
0
;
break
;
case
VBC_STATE_CLEANUP
:
VSL
(
SLT_Debug
,
0
,
"------> Handler cleanup"
);
VSL
(
SLT_Debug
,
0
,
"------> Handler cleanup"
);
VTCP_close
(
&
vbc
->
fd
);
tp
->
n_kill
--
;
VTAILQ_REMOVE
(
&
tp
->
killlist
,
vbc
,
list
);
...
...
@@ -288,14 +294,15 @@ VBT_Recycle(struct tcp_pool *tp, struct vbc **vbcp)
Lck_Lock
(
&
tp
->
mtx
);
tp
->
n_used
--
;
VSL
(
SLT_Debug
,
0
,
"------> Recycle fd %d in_w %d"
,
vbc
->
fd
,
vbc
->
in_waiter
);
VSL
(
SLT_Debug
,
0
,
"------> Recycle fd %d in_w %d"
,
vbc
->
fd
,
vbc
->
in_waiter
);
if
(
!
vbc
->
in_waiter
)
{
vbc
->
in_waiter
=
1
;
vbc
->
waited
->
ptr
=
vbc
;
vbc
->
waited
->
fd
=
vbc
->
fd
;
vbc
->
waited
->
idle
=
VTIM_real
();
VSL
(
SLT_Debug
,
0
,
"------> Recycle fd %d Wait_Enter"
,
vbc
->
fd
);
VSL
(
SLT_Debug
,
0
,
"------> Recycle fd %d Wait_Enter"
,
vbc
->
fd
);
if
(
Wait_Enter
(
tp
->
waiter
,
vbc
->
waited
))
{
VTCP_close
(
&
vbc
->
fd
);
FREE_OBJ
(
vbc
);
...
...
@@ -345,7 +352,8 @@ VBT_Close(struct tcp_pool *tp, struct vbc **vbcp)
assert
(
vbc
->
state
==
VBC_STATE_USED
);
assert
(
vbc
->
fd
>
0
);
VSL
(
SLT_Debug
,
0
,
"------> Close fd %d in_w %d"
,
vbc
->
fd
,
vbc
->
in_waiter
);
VSL
(
SLT_Debug
,
0
,
"------> Close fd %d in_w %d"
,
vbc
->
fd
,
vbc
->
in_waiter
);
Lck_Lock
(
&
tp
->
mtx
);
tp
->
n_used
--
;
...
...
@@ -378,7 +386,7 @@ VBT_Get(struct tcp_pool *tp, double tmo)
CHECK_OBJ_NOTNULL
(
vbc
,
VBC_MAGIC
);
assert
(
vbc
->
state
==
VBC_STATE_AVAIL
);
VSL
(
SLT_Debug
,
0
,
"------> Steal fd %d"
,
vbc
->
fd
);
VSL
(
SLT_Debug
,
0
,
"------> Steal fd %d"
,
vbc
->
fd
);
VTAILQ_REMOVE
(
&
tp
->
connlist
,
vbc
,
list
);
tp
->
n_conn
--
;
...
...
@@ -399,11 +407,11 @@ VSL(SLT_Debug, 0, "------> Steal fd %d", vbc->fd);
if
(
vbc
->
fd
<
0
)
FREE_OBJ
(
vbc
);
if
(
vbc
==
NULL
)
{
VSL
(
SLT_Debug
,
0
,
"------> No new fd"
);
VSL
(
SLT_Debug
,
0
,
"------> No new fd"
);
Lck_Lock
(
&
tp
->
mtx
);
tp
->
n_used
--
;
// Nope, didn't work after all.
Lck_Unlock
(
&
tp
->
mtx
);
}
else
VSL
(
SLT_Debug
,
0
,
"------> New fd %d"
,
vbc
->
fd
);
VSL
(
SLT_Debug
,
0
,
"------> New fd %d"
,
vbc
->
fd
);
return
(
vbc
);
}
bin/varnishd/waiter/cache_waiter_poll.c
View file @
ef4557c4
...
...
@@ -149,7 +149,8 @@ vwp_main(void *priv)
break
;
CHECK_OBJ_NOTNULL
(
sp
,
WAITED_MAGIC
);
fd
=
sp
->
fd
;
VSL
(
SLT_Debug
,
0
,
"POLL Handle %d %x"
,
fd
,
vwp
->
pollfd
[
fd
].
revents
);
VSL
(
SLT_Debug
,
0
,
"POLL Handle %d %x"
,
fd
,
vwp
->
pollfd
[
fd
].
revents
);
assert
(
fd
>=
0
);
assert
(
fd
<=
vwp
->
hpoll
);
assert
(
fd
<
vwp
->
npoll
);
...
...
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