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
c6289aae
Commit
c6289aae
authored
Oct 22, 2015
by
Poul-Henning Kamp
Committed by
Lasse Karstensen
Jan 13, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make the ban lurker sleep on a condvar so other code can wake it up.
parent
cfeb9fb3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
cache_ban.c
bin/varnishd/cache/cache_ban.c
+2
-2
cache_ban.h
bin/varnishd/cache/cache_ban.h
+2
-0
cache_ban_lurker.c
bin/varnishd/cache/cache_ban_lurker.c
+16
-1
No files found.
bin/varnishd/cache/cache_ban.c
View file @
c6289aae
...
...
@@ -756,6 +756,7 @@ BAN_Init(void)
bp
=
BAN_Build
();
AN
(
bp
);
AZ
(
BAN_Commit
(
bp
));
AZ
(
pthread_cond_init
(
&
ban_lurker_cond
,
NULL
));
Lck_Lock
(
&
ban_mtx
);
ban_mark_completed
(
VTAILQ_FIRST
(
&
ban_head
));
Lck_Unlock
(
&
ban_mtx
);
...
...
@@ -774,9 +775,8 @@ BAN_Shutdown(void)
{
void
*
status
;
Lck_Lock
(
&
ban_mtx
);
ban_shutdown
=
1
;
Lck_Unlock
(
&
ban_mtx
);
ban_kick_lurker
(
);
AZ
(
pthread_join
(
ban_thread
,
&
status
));
AZ
(
status
);
...
...
bin/varnishd/cache/cache_ban.h
View file @
c6289aae
...
...
@@ -105,6 +105,7 @@ extern struct lock ban_mtx;
extern
int
ban_shutdown
;
extern
struct
banhead_s
ban_head
;
extern
struct
ban
*
volatile
ban_start
;
extern
pthread_cond_t
ban_lurker_cond
;
void
ban_mark_completed
(
struct
ban
*
b
);
unsigned
ban_len
(
const
uint8_t
*
banspec
);
...
...
@@ -114,3 +115,4 @@ int ban_evaluate(struct worker *wrk, const uint8_t *bs, struct objcore *oc,
double
ban_time
(
const
uint8_t
*
banspec
);
int
ban_equal
(
const
uint8_t
*
bs1
,
const
uint8_t
*
bs2
);
void
BAN_Free
(
struct
ban
*
b
);
void
ban_kick_lurker
(
void
);
bin/varnishd/cache/cache_ban_lurker.c
View file @
c6289aae
...
...
@@ -38,6 +38,18 @@
static
struct
objcore
oc_marker
=
{
.
magic
=
OBJCORE_MAGIC
,
};
static
unsigned
ban_batch
;
static
unsigned
ban_generation
;
pthread_cond_t
ban_lurker_cond
;
void
ban_kick_lurker
(
void
)
{
Lck_Lock
(
&
ban_mtx
);
ban_generation
++
;
AZ
(
pthread_cond_signal
(
&
ban_lurker_cond
));
Lck_Unlock
(
&
ban_mtx
);
}
static
void
ban_cleantail
(
void
)
...
...
@@ -254,7 +266,10 @@ ban_lurker(struct worker *wrk, void *priv)
if
(
d
<=
0
.
0
||
!
ban_lurker_work
(
wrk
,
&
vsl
))
d
=
0
.
609
;
// Random, non-magic
ban_cleantail
();
VTIM_sleep
(
d
);
d
+=
VTIM_real
();
Lck_Lock
(
&
ban_mtx
);
(
void
)
Lck_CondWait
(
&
ban_lurker_cond
,
&
ban_mtx
,
d
);
Lck_Unlock
(
&
ban_mtx
);
}
pthread_exit
(
0
);
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