Changeset 56040f0bb0de6f862deb28bcd62a1373403a6ce8

Timestamp:

19/08/07 19:15:11 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[46c366a825accfc0d1b7b7f446c820f6713037fd]

git-author:

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

Message:

Hide b_attached.
Also remove the volatile qualifier.
No, volatile does not magically solve threading bugs, sorry
I too have tried this "easy" path, it does REALLY NOT WORK.
volatile only solves signals concurrency, not threads concurrency.

Files:

• include/vlc_common.h (modified) (1 diff)
• src/libvlc-common.c (modified) (1 diff)
• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (8 diffs)

include/vlc_common.h

@@ -556 +556 @@
-    volatile vlc_bool_t b_die;                   /**< set by the outside */ \
-    volatile vlc_bool_t b_dead;                   /**< set by the object */ \
-    volatile vlc_bool_t b_attached;               /**< set by the object */ \
-    vlc_bool_t b_force;      /**< set by the outside (eg. module_Need()) */ \
-                                                                            \

src/libvlc-common.c

@@ -219 +219 @@
-    vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
-#endif
-    /* Fake attachment */
-    p_libvlc->b_attached = VLC_TRUE;
-    /* Store data for the non-reentrant API */
-    p_static_vlc = p_libvlc;

src/libvlc.h

@@ -113 +113 @@
-    vlc_thread_t thread_id;
-    vlc_bool_t   b_thread;
+
+    /* Objects management */
+    vlc_bool_t      b_attached;
-};
-

src/misc/objects.c

@@ -121 +121 @@
-    p_new->b_error = VLC_FALSE;
-    p_new->b_dead = VLC_FALSE;
-new
+priv
-    p_new->b_force = VLC_FALSE;
-
@@ -154 +154 @@
-        p_libvlc_global->pp_objects = malloc( sizeof(vlc_object_t *) );
-        p_libvlc_global->pp_objects[0] = p_new;
-new
+priv
-    }
-    else
-    {
-        libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-
+
+
+
+
+
+
+
+
+
-
-        vlc_mutex_lock( &structure_lock );
@@ -676 +683 @@
-
-    /* Climb up the tree to see whether we are connected with the root */
-
+p_internals->
-    {
-        SetAttachment( p_this, VLC_TRUE );
@@ -703 +710 @@
-
-    /* Climb up the tree to see whether we are connected with the root */
-
+p_internals->
-    {
-        SetAttachment( p_this, VLC_FALSE );
@@ -738 +745 @@
-        for( ; pp_current < pp_end ; pp_current++ )
-        {
-
+p_internals->
-                 && (*pp_current)->i_object_type == i_type )
-            {
@@ -750 +757 @@
-        for( ; pp_current < pp_end ; pp_current++ )
-        {
-
+p_internals->
-                 && (*pp_current)->i_object_type == i_type )
-            {
@@ -810 +817 @@
-        for( ; pp_current < pp_end ; pp_current++ )
-        {
-
+p_internals->
-            {
-                PrintObject( *pp_current, "" );
@@ -1180 +1187 @@
-    }
-
-
+p_internals->
-}
-