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
676064df
Commit
676064df
authored
Dec 21, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add timeouts and comprehensive test-case for memorypool gymnastics.
parent
8313da8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
8 deletions
+71
-8
cache_mempool.c
bin/varnishd/cache/cache_mempool.c
+42
-8
c00050.vtc
bin/varnishtest/tests/c00050.vtc
+29
-0
No files found.
bin/varnishd/cache/cache_mempool.c
View file @
676064df
...
...
@@ -42,14 +42,17 @@ struct memitem {
#define MEMITEM_MAGIC 0x42e55401
VTAILQ_ENTRY
(
memitem
)
list
;
unsigned
size
;
double
payload
;
double
touched
;
char
payload
;
};
VTAILQ_HEAD
(
memhead_s
,
memitem
);
struct
mempool
{
unsigned
magic
;
#define MEMPOOL_MAGIC 0x37a75a8d
VTAILQ_HEAD
(,
memitem
)
list
;
VTAILQ_HEAD
(,
memitem
)
surplus
;
struct
memhead_s
list
;
struct
memhead_s
surplus
;
struct
lock
*
mtx
;
struct
lock
imtx
;
const
char
*
name
;
...
...
@@ -58,6 +61,7 @@ struct mempool {
struct
VSC_C_mempool
*
vsc
;
unsigned
n_pool
;
pthread_t
thread
;
double
t_now
;
};
/*---------------------------------------------------------------------
...
...
@@ -81,21 +85,26 @@ mpl_alloc(const struct mempool *mpl)
/*---------------------------------------------------------------------
* Pool-guard
* Attempt to keep number of free items in pool inside bounds with
* minimum locking activity.
* minimum locking activity, and keep an eye on items at the tail
* of the list not getting too old.
*/
#include <stdio.h>
static
void
*
mpl_guard
(
void
*
priv
)
{
struct
mempool
*
mpl
;
struct
memitem
*
mi
=
NULL
;
double
mpl_slp
__state_variable__
(
mpl_slp
);
double
last
=
0
;
CAST_OBJ_NOTNULL
(
mpl
,
priv
,
MEMPOOL_MAGIC
);
mpl_slp
=
0
.
15
;
// random
while
(
1
)
{
VTIM_sleep
(
mpl_slp
);
mpl_slp
=
0
.
814
;
// random
mpl
->
t_now
=
VTIM_real
();
if
(
mi
!=
NULL
&&
(
mpl
->
n_pool
>
mpl
->
param
->
max_pool
||
mi
->
size
<
*
mpl
->
cur_size
))
{
...
...
@@ -106,45 +115,69 @@ mpl_guard(void *priv)
if
(
mi
==
NULL
&&
mpl
->
n_pool
<
mpl
->
param
->
min_pool
)
mi
=
mpl_alloc
(
mpl
);
if
(
mpl
->
n_pool
<
mpl
->
param
->
min_pool
&&
mi
!=
NULL
)
{
/* can do */
}
else
if
(
mpl
->
n_pool
>
mpl
->
param
->
max_pool
&&
mi
==
NULL
)
{
/* can do */
}
else
if
(
!
VTAILQ_EMPTY
(
&
mpl
->
surplus
))
{
/* can do */
}
else
if
(
last
+
.
1
*
mpl
->
param
->
max_age
<
mpl
->
t_now
)
{
/* should do */
}
else
{
continue
;
/*
cannot
do */
continue
;
/*
nothing to
do */
}
mpl_slp
=
0
.
314
;
mpl_slp
=
0
.
314
;
// random
if
(
Lck_Trylock
(
mpl
->
mtx
))
continue
;
mpl_slp
=
.
01
;
if
(
mpl
->
n_pool
<
mpl
->
param
->
min_pool
&&
mi
!=
NULL
&&
mi
->
size
>=
*
mpl
->
cur_size
)
{
CHECK_OBJ_NOTNULL
(
mi
,
MEMITEM_MAGIC
);
mpl
->
vsc
->
pool
++
;
mpl
->
n_pool
++
;
mi
->
touched
=
mpl
->
t_now
;
VTAILQ_INSERT_HEAD
(
&
mpl
->
list
,
mi
,
list
);
mi
=
NULL
;
mpl_slp
=
.
01
;
// random
}
if
(
mpl
->
n_pool
>
mpl
->
param
->
max_pool
&&
mi
==
NULL
)
{
mi
=
VTAILQ_FIRST
(
&
mpl
->
list
);
CHECK_OBJ_NOTNULL
(
mi
,
MEMITEM_MAGIC
);
mpl
->
vsc
->
pool
--
;
mpl
->
vsc
->
surplus
++
;
mpl
->
n_pool
--
;
VTAILQ_REMOVE
(
&
mpl
->
list
,
mi
,
list
);
mpl_slp
=
.
01
;
// random
}
if
(
mi
==
NULL
)
{
mi
=
VTAILQ_FIRST
(
&
mpl
->
surplus
);
if
(
mi
!=
NULL
)
{
CHECK_OBJ_NOTNULL
(
mi
,
MEMITEM_MAGIC
);
VTAILQ_REMOVE
(
&
mpl
->
surplus
,
mi
,
list
);
mpl_slp
=
.
01
;
// random
}
}
if
(
mi
==
NULL
&&
mpl
->
n_pool
>
mpl
->
param
->
min_pool
)
{
mi
=
VTAILQ_LAST
(
&
mpl
->
list
,
memhead_s
);
CHECK_OBJ_NOTNULL
(
mi
,
MEMITEM_MAGIC
);
if
(
mi
->
touched
+
mpl
->
param
->
max_age
<
mpl
->
t_now
)
{
mpl
->
vsc
->
pool
--
;
mpl
->
vsc
->
timeout
++
;
mpl
->
n_pool
--
;
VTAILQ_REMOVE
(
&
mpl
->
list
,
mi
,
list
);
mpl_slp
=
.
01
;
// random
}
else
{
mi
=
NULL
;
last
=
mpl
->
t_now
;
}
}
else
if
(
mpl
->
n_pool
<=
mpl
->
param
->
min_pool
)
{
last
=
mpl
->
t_now
;
}
Lck_Unlock
(
mpl
->
mtx
);
if
(
mi
!=
NULL
)
{
...
...
@@ -250,6 +283,7 @@ MPL_Free(struct mempool *mpl, void *item)
}
else
{
mpl
->
vsc
->
pool
++
;
mpl
->
n_pool
++
;
mi
->
touched
=
mpl
->
t_now
;
VTAILQ_INSERT_HEAD
(
&
mpl
->
list
,
mi
,
list
);
}
...
...
bin/varnishtest/tests/c00050.vtc
0 → 100644
View file @
676064df
varnishtest "Memory pool gymnastics"
server s1 { } -start
varnish v1 -vcl+backend {} -start
delay 1
varnish v1 -expect MEMPOOL.vbc.pool == 10
varnish v1 -cliok "param.set vbc_pool 90,100,100"
delay 1
varnish v1 -expect MEMPOOL.vbc.pool == 90
varnish v1 -cliok "param.set vbc_pool 50,80,100"
delay 1
varnish v1 -expect MEMPOOL.vbc.pool == 80
varnish v1 -expect MEMPOOL.vbc.surplus == 10
varnish v1 -cliok "param.set vbc_pool 10,80,1"
delay 1
varnish v1 -expect MEMPOOL.vbc.pool == 10
varnish v1 -expect MEMPOOL.vbc.timeout == 70
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