Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
35289585
Commit
35289585
authored
Oct 12, 2007
by
Damien Fouilleul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vlc_threads: document gibalou's comment, and fix a small bug in win32 vlc_cond_timedwait()
parent
55709f03
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
9 deletions
+16
-9
include/vlc_threads_funcs.h
include/vlc_threads_funcs.h
+16
-9
No files found.
include/vlc_threads_funcs.h
View file @
35289585
...
...
@@ -261,6 +261,11 @@ static inline int __vlc_cond_signal( const char * psz_file, int i_line,
* by a mutex. This will prevent another thread from stealing the signal */
if
(
!
p_condvar
->
semaphore
)
{
/*
** PulseEvent() only works if none of the waiting threads is suspended.
** this is particularily problematic under a debug session.
** as documented in http://support.microsoft.com/kb/q173260/
*/
PulseEvent
(
p_condvar
->
event
);
}
else
if
(
p_condvar
->
i_win9x_cv
==
1
)
...
...
@@ -570,7 +575,7 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
DWORD
result
;
if
(
delay_ms
<
0
)
delay_ms
=
0
;
delay_ms
=
0
;
p_condvar
->
i_waiting_threads
++
;
LeaveCriticalSection
(
&
p_mutex
->
csection
);
...
...
@@ -587,7 +592,7 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
mtime_t
delay_ms
=
(
deadline
-
mdate
())
/
1000
;
if
(
delay_ms
<
0
)
delay_ms
=
0
;
delay_ms
=
0
;
if
(
!
p_condvar
->
semaphore
)
{
...
...
@@ -618,17 +623,19 @@ static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
/* Wait for the gate to be open */
result
=
WaitForSingleObject
(
p_condvar
->
event
,
delay_ms
);
/* recaculate remaining delay */
delay_ms
=
(
deadline
-
mdate
())
/
1000
;
if
(
delay_ms
<
0
)
delay_ms
=
0
;
/* Increase our wait count */
p_condvar
->
i_waiting_threads
++
;
LeaveCriticalSection
(
&
p_mutex
->
csection
);
if
(
!
result
)
result
=
WaitForSingleObject
(
p_condvar
->
semaphore
,
delay_ms
);
if
(
!
result
)
{
/* recaculate remaining delay */
delay_ms
=
(
deadline
-
mdate
())
/
1000
;
if
(
delay_ms
<
0
)
delay_ms
=
0
;
result
=
WaitForSingleObject
(
p_condvar
->
semaphore
,
delay_ms
);
}
/* Decrement and test must be atomic */
EnterCriticalSection
(
&
p_condvar
->
csection
);
...
...
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