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
6f2fee0a
Commit
6f2fee0a
authored
Aug 05, 2019
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix locking mistake introduced in
5f97b89a
parent
93e6dd70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
14 deletions
+45
-14
common_vsmw.c
bin/varnishd/common/common_vsmw.c
+45
-14
No files found.
bin/varnishd/common/common_vsmw.c
View file @
6f2fee0a
...
...
@@ -70,9 +70,29 @@ vsmw_dummy_lock(void)
{
}
static
int
vsmw_haslock
;
vsm_lock_f
*
vsmw_lock
=
vsmw_dummy_lock
;
vsm_lock_f
*
vsmw_unlock
=
vsmw_dummy_lock
;
#define vsmw_assert_lock() AN(vsmw_haslock)
#define vsmw_do_lock() vsmw_do_lock_(__func__, __LINE__)
#define vsmw_do_lock_(f, l) \
do { \
vsmw_lock(); \
AZ(vsmw_haslock); \
vsmw_haslock = 1; \
} while(0)
#define vsmw_do_unlock() vsmw_do_unlock_(__func__, __LINE__)
#define vsmw_do_unlock_(f, l) \
do { \
AN(vsmw_haslock); \
vsmw_haslock = 0; \
vsmw_unlock(); \
} while(0)
/*--------------------------------------------------------------------*/
struct
vsmw_cluster
{
...
...
@@ -153,6 +173,7 @@ vsmw_mkent(const struct vsmw *vsmw, const char *pfx)
uint64_t
rn
;
AN
(
pfx
);
vsmw_assert_lock
();
while
(
1
)
{
VSB_clear
(
vsmw
->
vsb
);
VSB_printf
(
vsmw
->
vsb
,
"_.%s"
,
pfx
);
...
...
@@ -192,6 +213,7 @@ static void
vsmw_addseg
(
struct
vsmw
*
vsmw
,
struct
vsmwseg
*
seg
)
{
vsmw_assert_lock
();
VTAILQ_INSERT_TAIL
(
&
vsmw
->
segs
,
seg
,
list
);
vsmw_append_record
(
vsmw
,
seg
,
'+'
);
vsmw
->
nsegs
++
;
...
...
@@ -206,6 +228,7 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
int
fd
;
struct
vsmwseg
*
s2
;
vsmw_assert_lock
();
CHECK_OBJ_NOTNULL
(
vsmw
,
VSMW_MAGIC
);
CHECK_OBJ_NOTNULL
(
seg
,
VSMWSEG_MAGIC
);
...
...
@@ -283,7 +306,7 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
struct
vsmw_cluster
*
vc
;
struct
vsmwseg
*
seg
;
vsmw_lock
();
vsmw_
do_
lock
();
vc
=
vsmw_newcluster
(
vsmw
,
len
,
pfx
);
ALLOC_OBJ
(
seg
,
VSMWSEG_MAGIC
);
...
...
@@ -295,12 +318,12 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
REPLACE
(
seg
->
id
,
""
);
vsmw_addseg
(
vsmw
,
seg
);
vsmw_unlock
();
vsmw_
do_
unlock
();
return
(
vc
);
}
void
VSMW_DestroyCluster
(
struct
vsmw
*
vsmw
,
struct
vsmw_cluster
**
vsmcp
)
static
void
vsmw_DestroyCluster_locked
(
struct
vsmw
*
vsmw
,
struct
vsmw_cluster
**
vsmcp
)
{
struct
vsmw_cluster
*
vc
;
...
...
@@ -329,6 +352,15 @@ VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
FREE_OBJ
(
vc
);
}
void
VSMW_DestroyCluster
(
struct
vsmw
*
vsmw
,
struct
vsmw_cluster
**
vsmcp
)
{
vsmw_do_lock
();
vsmw_DestroyCluster_locked
(
vsmw
,
vsmcp
);
vsmw_do_unlock
();
}
/*--------------------------------------------------------------------*/
void
*
...
...
@@ -338,7 +370,7 @@ VSMW_Allocv(struct vsmw *vsmw, struct vsmw_cluster *vc,
{
struct
vsmwseg
*
seg
;
vsmw_lock
();
vsmw_
do_
lock
();
CHECK_OBJ_NOTNULL
(
vsmw
,
VSMW_MAGIC
);
(
void
)
vc
;
...
...
@@ -365,7 +397,7 @@ VSMW_Allocv(struct vsmw *vsmw, struct vsmw_cluster *vc,
vsmw_addseg
(
vsmw
,
seg
);
vsmw_unlock
();
vsmw_
do_
unlock
();
return
(
seg
->
ptr
);
}
...
...
@@ -390,7 +422,7 @@ VSMW_Free(struct vsmw *vsmw, void **pp)
struct
vsmwseg
*
seg
;
struct
vsmw_cluster
*
cp
;
vsmw_lock
();
vsmw_
do_
lock
();
CHECK_OBJ_NOTNULL
(
vsmw
,
VSMW_MAGIC
);
AN
(
pp
);
VTAILQ_FOREACH
(
seg
,
&
vsmw
->
segs
,
list
)
...
...
@@ -404,9 +436,8 @@ VSMW_Free(struct vsmw *vsmw, void **pp)
vsmw_delseg
(
vsmw
,
seg
,
1
);
if
(
!--
cp
->
refs
&&
cp
->
cseg
==
NULL
)
VSMW_DestroyCluster
(
vsmw
,
&
cp
);
vsmw_unlock
();
vsmw_DestroyCluster_locked
(
vsmw
,
&
cp
);
vsmw_do_unlock
();
}
/*--------------------------------------------------------------------*/
...
...
@@ -421,7 +452,7 @@ VSMW_New(int vdirfd, int mode, const char *idxname)
assert
(
mode
>
0
);
AN
(
idxname
);
vsmw_lock
();
vsmw_
do_
lock
();
ALLOC_OBJ
(
vsmw
,
VSMW_MAGIC
);
AN
(
vsmw
);
...
...
@@ -443,7 +474,7 @@ VSMW_New(int vdirfd, int mode, const char *idxname)
vsmw_idx_head
(
vsmw
,
fd
);
closefd
(
&
fd
);
vsmw_unlock
();
vsmw_
do_
unlock
();
return
(
vsmw
);
}
...
...
@@ -453,7 +484,7 @@ VSMW_Destroy(struct vsmw **pp)
struct
vsmw
*
vsmw
;
struct
vsmwseg
*
seg
,
*
s2
;
vsmw_lock
();
vsmw_
do_
lock
();
TAKE_OBJ_NOTNULL
(
vsmw
,
pp
,
VSMW_MAGIC
);
VTAILQ_FOREACH_SAFE
(
seg
,
&
vsmw
->
segs
,
list
,
s2
)
vsmw_delseg
(
vsmw
,
seg
,
0
);
...
...
@@ -463,5 +494,5 @@ VSMW_Destroy(struct vsmw **pp)
VSB_destroy
(
&
vsmw
->
vsb
);
closefd
(
&
vsmw
->
vdirfd
);
FREE_OBJ
(
vsmw
);
vsmw_unlock
();
vsmw_
do_
unlock
();
}
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