Changeset 21724f580a769fdb2205218bb2e1e1acb8f645b6

Timestamp:

17/09/07 16:29:59 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1190039399 +0000

git-parent:

[8440f6c09557f0f7ba39c5302b93376bcea4a7b1]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1190039399 +0000

Message:

Signal the playlist BEFORE unlocking it.
One should never signal a condition without the corresponding lock:

"if predictable scheduling behavior is required, then that mutex shall

be locked by the thread calling pthread_cond_broadcast()
or pthread_cond_signal()." -- POSIX

This only fixes the most obvious cases. There might be others.

Files:

• src/playlist/control.c (modified) (2 diffs)
• src/playlist/engine.c (modified) (2 diffs)

src/playlist/control.c

@@ -185 +185 @@
-                 p_playlist->p_preparse->i_waiting,
-                 p_item );
+    vlc_cond_signal( &p_playlist->p_preparse->object_wait );
-    vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
-    vlc_cond_signal( &p_playlist->p_preparse->object_wait );
-    return VLC_SUCCESS;
-}
@@ -219 +219 @@
-                 p_playlist->p_fetcher->i_waiting,
-                 i, p );
+    vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
-    vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
-    vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
-    return VLC_SUCCESS;
-}

src/playlist/engine.c

@@ -545 +545 @@
-                             p_playlist->p_fetcher->i_waiting,
-                             p_playlist->p_fetcher->i_waiting, p);
+                vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
-                vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
-                vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
-            }
-            /* We already have all needed meta, but we need art right now */
@@ -560 +560 @@
-                             p_playlist->p_fetcher->i_waiting,
-                             p_playlist->p_fetcher->i_waiting, p);
+                vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
-                vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
-                vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
-            }
-            else