Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
a6b98489
Commit
a6b98489
authored
Nov 22, 2012
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Eliminated duplicated code for trimming the tail of the banlist.
Original patch by: martin
parent
3a02001b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
25 deletions
+14
-25
cache_ban.c
bin/varnishd/cache/cache_ban.c
+14
-25
No files found.
bin/varnishd/cache/cache_ban.c
View file @
a6b98489
...
...
@@ -846,7 +846,7 @@ ban_CheckLast(void)
static
int
ban_lurker_work
(
struct
worker
*
wrk
,
struct
vsl_log
*
vsl
)
{
struct
ban
*
b
,
*
b0
,
*
b2
;
struct
ban
*
b
,
*
b0
;
struct
objhead
*
oh
;
struct
objcore
*
oc
,
*
oc2
;
struct
object
*
o
;
...
...
@@ -856,18 +856,6 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl)
AN
(
pass
&
BAN_F_LURK
);
AZ
(
pass
&
~
BAN_F_LURK
);
/* First route the last ban(s) */
do
{
Lck_Lock
(
&
ban_mtx
);
b2
=
ban_CheckLast
();
if
(
b2
!=
NULL
)
/* Notify stevedores */
STV_BanInfo
(
BI_DROP
,
b2
->
spec
,
ban_len
(
b2
->
spec
));
Lck_Unlock
(
&
ban_mtx
);
if
(
b2
!=
NULL
)
BAN_Free
(
b2
);
}
while
(
b2
!=
NULL
);
/*
* Find out if we have any bans we can do something about
* If we find any, tag them with our pass number.
...
...
@@ -1004,7 +992,7 @@ ban_lurker(struct worker *wrk, void *priv)
(
void
)
priv
;
while
(
1
)
{
while
(
cache_param
->
ban_lurker_sleep
==
0
.
0
)
{
do
{
/*
* Ban-lurker is disabled:
* Clean the last ban, if possible, and sleep
...
...
@@ -1018,18 +1006,19 @@ ban_lurker(struct worker *wrk, void *priv)
Lck_Unlock
(
&
ban_mtx
);
if
(
bf
!=
NULL
)
BAN_Free
(
bf
);
else
VTIM_sleep
(
1
.
0
);
}
i
=
ban_lurker_work
(
wrk
,
&
vsl
);
VSL_Flush
(
&
vsl
,
0
);
WRK_SumStat
(
wrk
);
if
(
i
)
{
VTIM_sleep
(
cache_param
->
ban_lurker_sleep
);
}
else
{
VTIM_sleep
(
1
.
0
);
}
while
(
bf
!=
NULL
);
if
(
cache_param
->
ban_lurker_sleep
!=
0
.
0
)
{
do
{
i
=
ban_lurker_work
(
wrk
,
&
vsl
);
VSL_Flush
(
&
vsl
,
0
);
WRK_SumStat
(
wrk
);
if
(
i
)
VTIM_sleep
(
cache_param
->
ban_lurker_sleep
);
}
while
(
i
);
}
VTIM_sleep
(
0
.
609
);
// Random, non-magic
}
NEEDLESS_RETURN
(
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