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
8faf5870
Commit
8faf5870
authored
Sep 19, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various minor polishing
parent
ac393c4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
cache_pool.c
bin/varnishd/cache_pool.c
+6
-6
cache_wrk.c
bin/varnishd/cache_wrk.c
+1
-1
No files found.
bin/varnishd/cache_pool.c
View file @
8faf5870
...
...
@@ -259,7 +259,7 @@ Pool_Work_Thread(void *priv, struct worker *w)
*/
static
int
WRK_Q
ueue
(
struct
pool
*
pp
,
struct
sess
*
sp
)
pool_q
ueue
(
struct
pool
*
pp
,
struct
sess
*
sp
)
{
struct
worker
*
w
;
...
...
@@ -297,7 +297,7 @@ Pool_Schedule(struct pool *pp, struct sess *sp)
{
CHECK_OBJ_NOTNULL
(
sp
,
SESS_MAGIC
);
AZ
(
sp
->
wrk
);
if
(
WRK_Q
ueue
(
pp
,
sp
)
==
0
)
if
(
pool_q
ueue
(
pp
,
sp
)
==
0
)
return
(
0
);
VSC_C_main
->
client_drop_late
++
;
...
...
@@ -345,7 +345,7 @@ Pool_Wait(struct sess *sp)
*/
static
void
wrk_breed_flock
(
struct
pool
*
qp
,
const
pthread_attr_t
*
tp_attr
)
pool_breed
(
struct
pool
*
qp
,
const
pthread_attr_t
*
tp_attr
)
{
pthread_t
tp
;
...
...
@@ -418,7 +418,7 @@ pool_herder(void *priv)
AZ
(
pthread_attr_init
(
&
tp_attr
));
}
wrk_breed_flock
(
pp
,
&
tp_attr
);
pool_breed
(
pp
,
&
tp_attr
);
if
(
pp
->
nthr
<
params
->
wthread_min
)
continue
;
...
...
@@ -466,6 +466,7 @@ pool_herder(void *priv)
AZ
(
pthread_cond_signal
(
&
w
->
cond
));
}
}
NEEDLESS_RETURN
(
NULL
);
}
/*--------------------------------------------------------------------
...
...
@@ -543,6 +544,7 @@ pool_poolherder(void *priv)
u
+=
pp
->
lqueue
;
VSC_C_main
->
thread_queue_len
=
u
;
}
NEEDLESS_RETURN
(
NULL
);
}
/*--------------------------------------------------------------------*/
...
...
@@ -555,5 +557,3 @@ Pool_Init(void)
Lck_New
(
&
pool_mtx
,
lck_wq
);
AZ
(
pthread_create
(
&
thr_pool_herder
,
NULL
,
pool_poolherder
,
NULL
));
}
/*--------------------------------------------------------------------*/
bin/varnishd/cache_wrk.c
View file @
8faf5870
...
...
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Worker thread stuff unre
al
ted to the worker thread pools.
* Worker thread stuff unre
la
ted to the worker thread pools.
*/
#include "config.h"
...
...
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