Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
a22e0f27
Commit
a22e0f27
authored
Mar 05, 2009
by
Rémi Denis-Courmont
Browse files
Privatize the object pipe lock
parent
31bdf929
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/misc/objects.c
View file @
a22e0f27
...
...
@@ -370,6 +370,8 @@ error:
#define close( a ) closesocket (a)
#endif
/* WIN32 */
static
vlc_mutex_t
pipe_lock
=
VLC_STATIC_MUTEX
;
/**
* Returns the readable end of a pipe that becomes readable once termination
* of the object is requested (vlc_object_kill()).
...
...
@@ -386,7 +388,7 @@ int vlc_object_waitpipe( vlc_object_t *obj )
{
vlc_object_internals_t
*
internals
=
vlc_internals
(
obj
);
vlc_
object
_lock
(
obj
);
vlc_
mutex
_lock
(
&
pipe_lock
);
if
(
internals
->
pipes
[
0
]
==
-
1
)
{
/* This can only ever happen if someone killed us without locking: */
...
...
@@ -407,7 +409,7 @@ int vlc_object_waitpipe( vlc_object_t *obj )
write
(
internals
->
pipes
[
1
],
&
(
uint64_t
){
1
},
sizeof
(
uint64_t
));
}
}
vlc_
object
_unlock
(
obj
);
vlc_
mutex
_unlock
(
&
pipe_lock
);
return
internals
->
pipes
[
0
];
}
...
...
@@ -422,7 +424,7 @@ void __vlc_object_kill( vlc_object_t *p_this )
int
fd
=
-
1
;
vlc_thread_cancel
(
p_this
);
vlc_
object
_lock
(
p_this
);
vlc_
mutex
_lock
(
&
pipe_lock
);
if
(
!
p_this
->
b_die
)
{
fd
=
priv
->
pipes
[
1
];
...
...
@@ -430,7 +432,7 @@ void __vlc_object_kill( vlc_object_t *p_this )
}
/* This also serves as a memory barrier toward vlc_object_alive(): */
vlc_
object
_unlock
(
p_this
);
vlc_
mutex
_unlock
(
&
pipe_lock
);
if
(
fd
!=
-
1
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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