Skip to content

V
vlc
Commit 7e1ef2be authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

variables: vector mutex locking

parent 748474bf
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 18 deletions
src/misc/variables.c
View file @ 7e1ef2be
...@@ -157,7 +157,7 @@ static variable_t *Lookup( vlc_object_t *obj, const char *psz_name ) ...@@ -157,7 +157,7 @@ static variable_t *Lookup( vlc_object_t *obj, const char *psz_name )
vlc_object_internals_t *priv = vlc_internals( obj ); vlc_object_internals_t *priv = vlc_internals( obj );
variable_t **pp_var; variable_t **pp_var;
vlc_assert_locked( &priv->var_lock ); vlc_mutex_lock(&priv->var_lock);
pp_var = tfind( &psz_name, &priv->var_root, varcmp ); pp_var = tfind( &psz_name, &priv->var_root, varcmp );
return (pp_var != NULL) ? *pp_var : NULL; return (pp_var != NULL) ? *pp_var : NULL;
} }
...@@ -436,8 +436,6 @@ int var_Destroy( vlc_object_t *p_this, const char *psz_name ) ...@@ -436,8 +436,6 @@ int var_Destroy( vlc_object_t *p_this, const char *psz_name )
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var == NULL ) if( p_var == NULL )
{ {
...@@ -493,8 +491,6 @@ int var_Change( vlc_object_t *p_this, const char *psz_name, ...@@ -493,8 +491,6 @@ int var_Change( vlc_object_t *p_this, const char *psz_name,
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var == NULL ) if( p_var == NULL )
{ {
...@@ -716,7 +712,6 @@ int var_GetAndSet( vlc_object_t *p_this, const char *psz_name, int i_action, ...@@ -716,7 +712,6 @@ int var_GetAndSet( vlc_object_t *p_this, const char *psz_name, int i_action,
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var == NULL ) if( p_var == NULL )
{ {
...@@ -784,8 +779,6 @@ int var_Type( vlc_object_t *p_this, const char *psz_name ) ...@@ -784,8 +779,6 @@ int var_Type( vlc_object_t *p_this, const char *psz_name )
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var != NULL ) if( p_var != NULL )
{ {
...@@ -809,8 +802,6 @@ int var_SetChecked( vlc_object_t *p_this, const char *psz_name, ...@@ -809,8 +802,6 @@ int var_SetChecked( vlc_object_t *p_this, const char *psz_name,
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var == NULL ) if( p_var == NULL )
{ {
...@@ -869,8 +860,6 @@ int var_GetChecked( vlc_object_t *p_this, const char *psz_name, ...@@ -869,8 +860,6 @@ int var_GetChecked( vlc_object_t *p_this, const char *psz_name,
variable_t *p_var; variable_t *p_var;
int err = VLC_SUCCESS; int err = VLC_SUCCESS;
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var != NULL ) if( p_var != NULL )
{ {
...@@ -914,8 +903,6 @@ static int AddCallback( vlc_object_t *p_this, const char *psz_name, ...@@ -914,8 +903,6 @@ static int AddCallback( vlc_object_t *p_this, const char *psz_name,
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var == NULL ) if( p_var == NULL )
{ {
...@@ -982,8 +969,6 @@ static int DelCallback( vlc_object_t *p_this, const char *psz_name, ...@@ -982,8 +969,6 @@ static int DelCallback( vlc_object_t *p_this, const char *psz_name,
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var == NULL ) if( p_var == NULL )
{ {
...@@ -1063,8 +1048,6 @@ int var_TriggerCallback( vlc_object_t *p_this, const char *psz_name ) ...@@ -1063,8 +1048,6 @@ int var_TriggerCallback( vlc_object_t *p_this, const char *psz_name )
vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name ); p_var = Lookup( p_this, psz_name );
if( p_var == NULL ) if( p_var == NULL )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment