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
22881138
Commit
22881138
authored
May 31, 2021
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Blindly attempt to fix space accounting in storage_umem.c
(analog of storage_malloc.c)
parent
d69149c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
storage_umem.c
bin/varnishd/storage/storage_umem.c
+9
-9
No files found.
bin/varnishd/storage/storage_umem.c
View file @
22881138
...
@@ -58,8 +58,8 @@ struct smu_sc {
...
@@ -58,8 +58,8 @@ struct smu_sc {
unsigned
magic
;
unsigned
magic
;
#define SMU_SC_MAGIC 0x7695f68e
#define SMU_SC_MAGIC 0x7695f68e
struct
lock
smu_mtx
;
struct
lock
smu_mtx
;
size_t
smu_max
;
VCL_INT
smu_max
;
size_t
smu_alloc
;
VCL_INT
smu_alloc
;
struct
VSC_smu
*
stats
;
struct
VSC_smu
*
stats
;
umem_cache_t
*
smu_cache
;
umem_cache_t
*
smu_cache
;
};
};
...
@@ -151,7 +151,7 @@ smu_alloc(const struct stevedore *st, size_t size)
...
@@ -151,7 +151,7 @@ smu_alloc(const struct stevedore *st, size_t size)
CAST_OBJ_NOTNULL
(
smu_sc
,
st
->
priv
,
SMU_SC_MAGIC
);
CAST_OBJ_NOTNULL
(
smu_sc
,
st
->
priv
,
SMU_SC_MAGIC
);
Lck_Lock
(
&
smu_sc
->
smu_mtx
);
Lck_Lock
(
&
smu_sc
->
smu_mtx
);
smu_sc
->
stats
->
c_req
++
;
smu_sc
->
stats
->
c_req
++
;
if
(
smu_sc
->
smu_alloc
+
size
>
smu_sc
->
smu_max
)
{
if
(
smu_sc
->
smu_alloc
+
(
int64_t
)
size
>
smu_sc
->
smu_max
)
{
smu_sc
->
stats
->
c_fail
++
;
smu_sc
->
stats
->
c_fail
++
;
size
=
0
;
size
=
0
;
}
else
{
}
else
{
...
@@ -159,7 +159,7 @@ smu_alloc(const struct stevedore *st, size_t size)
...
@@ -159,7 +159,7 @@ smu_alloc(const struct stevedore *st, size_t size)
smu_sc
->
stats
->
c_bytes
+=
size
;
smu_sc
->
stats
->
c_bytes
+=
size
;
smu_sc
->
stats
->
g_alloc
++
;
smu_sc
->
stats
->
g_alloc
++
;
smu_sc
->
stats
->
g_bytes
+=
size
;
smu_sc
->
stats
->
g_bytes
+=
size
;
if
(
smu_sc
->
smu_max
!=
SIZE
_MAX
)
if
(
smu_sc
->
smu_max
!=
VRT_INTEGER
_MAX
)
smu_sc
->
stats
->
g_space
-=
size
;
smu_sc
->
stats
->
g_space
-=
size
;
}
}
Lck_Unlock
(
&
smu_sc
->
smu_mtx
);
Lck_Unlock
(
&
smu_sc
->
smu_mtx
);
...
@@ -194,7 +194,7 @@ smu_alloc(const struct stevedore *st, size_t size)
...
@@ -194,7 +194,7 @@ smu_alloc(const struct stevedore *st, size_t size)
smu_sc
->
stats
->
c_bytes
-=
size
;
smu_sc
->
stats
->
c_bytes
-=
size
;
smu_sc
->
stats
->
g_alloc
--
;
smu_sc
->
stats
->
g_alloc
--
;
smu_sc
->
stats
->
g_bytes
-=
size
;
smu_sc
->
stats
->
g_bytes
-=
size
;
if
(
smu_sc
->
smu_max
!=
SIZE
_MAX
)
if
(
smu_sc
->
smu_max
!=
VRT_INTEGER
_MAX
)
smu_sc
->
stats
->
g_space
+=
size
;
smu_sc
->
stats
->
g_space
+=
size
;
Lck_Unlock
(
&
smu_sc
->
smu_mtx
);
Lck_Unlock
(
&
smu_sc
->
smu_mtx
);
return
(
NULL
);
return
(
NULL
);
...
@@ -224,7 +224,7 @@ smu_free(struct storage *s)
...
@@ -224,7 +224,7 @@ smu_free(struct storage *s)
sc
->
stats
->
g_alloc
--
;
sc
->
stats
->
g_alloc
--
;
sc
->
stats
->
g_bytes
-=
smu
->
sz
;
sc
->
stats
->
g_bytes
-=
smu
->
sz
;
sc
->
stats
->
c_freed
+=
smu
->
sz
;
sc
->
stats
->
c_freed
+=
smu
->
sz
;
if
(
sc
->
smu_max
!=
SIZE
_MAX
)
if
(
sc
->
smu_max
!=
VRT_INTEGER
_MAX
)
sc
->
stats
->
g_space
+=
smu
->
sz
;
sc
->
stats
->
g_space
+=
smu
->
sz
;
Lck_Unlock
(
&
sc
->
smu_mtx
);
Lck_Unlock
(
&
sc
->
smu_mtx
);
...
@@ -300,8 +300,8 @@ smu_init(struct stevedore *parent, int ac, char * const *av)
...
@@ -300,8 +300,8 @@ smu_init(struct stevedore *parent, int ac, char * const *av)
ASSERT_MGT
();
ASSERT_MGT
();
ALLOC_OBJ
(
sc
,
SMU_SC_MAGIC
);
ALLOC_OBJ
(
sc
,
SMU_SC_MAGIC
);
AN
(
sc
);
AN
(
sc
);
sc
->
smu_max
=
SIZE
_MAX
;
sc
->
smu_max
=
VRT_INTEGER
_MAX
;
assert
(
sc
->
smu_max
==
SIZE
_MAX
);
assert
(
sc
->
smu_max
==
VRT_INTEGER
_MAX
);
parent
->
priv
=
sc
;
parent
->
priv
=
sc
;
AZ
(
av
[
ac
]);
AZ
(
av
[
ac
]);
...
@@ -409,7 +409,7 @@ smu_open(struct stevedore *st)
...
@@ -409,7 +409,7 @@ smu_open(struct stevedore *st)
CAST_OBJ_NOTNULL
(
smu_sc
,
st
->
priv
,
SMU_SC_MAGIC
);
CAST_OBJ_NOTNULL
(
smu_sc
,
st
->
priv
,
SMU_SC_MAGIC
);
Lck_New
(
&
smu_sc
->
smu_mtx
,
lck_smu
);
Lck_New
(
&
smu_sc
->
smu_mtx
,
lck_smu
);
smu_sc
->
stats
=
VSC_smu_New
(
NULL
,
NULL
,
st
->
ident
);
smu_sc
->
stats
=
VSC_smu_New
(
NULL
,
NULL
,
st
->
ident
);
if
(
smu_sc
->
smu_max
!=
SIZE
_MAX
)
if
(
smu_sc
->
smu_max
!=
VRT_INTEGER
_MAX
)
smu_sc
->
stats
->
g_space
=
smu_sc
->
smu_max
;
smu_sc
->
stats
->
g_space
=
smu_sc
->
smu_max
;
smu_open_init
();
smu_open_init
();
...
...
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