Changeset 2f27884905b95e2480c90b1c98e5322ed08fee6b

Timestamp:

14/10/02 21:04:51 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1034622291 +0000

git-parent:

[bf7985b74afcef9103b35a3c47eeae5845ae681b]

git-author:

Sam Hocevar <sam@videolan.org> 1034622291 +0000

Message:

• ./modules/misc/testsuite/test4.c: made the 4th test less CPU intensive
  by making the spawned threads wait a bit longer.
  
• ./src/misc/variables.c: added a usage count to the variables; trying to
  create a variable with the same name only increments its refcount.
  

Files:

• include/variables.h (modified) (3 diffs)
• modules/misc/testsuite/test4.c (modified) (2 diffs)
• src/misc/variables.c (modified) (6 diffs)

include/variables.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/10/14 16:46:55
+3 2002/10/14 19:04:51
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -32 +32 @@
-#define VLC_VAR_ADDRESS   0x0600
-#define VLC_VAR_COMMAND   0x0700
+#define VLC_VAR_MUTEX     0x0800
-
-/*****************************************************************************
@@ -46 +47 @@
-
-    /* Lots of other things that can be added */
+    int          i_usage;
-    vlc_bool_t   b_set;
-    vlc_bool_t   b_active;

modules/misc/testsuite/test4.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2002/10/14 16:34:17
+2 2002/10/14 19:04:51
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -229 +229 @@
-    while( !p_this->b_die )
-    {
-
+0
-    }
-

src/misc/variables.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/10/14 16:46:56
+3 2002/10/14 19:04:51
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -50 +50 @@
-{
-    int i_new;
+    variable_t *p_var;
-
-    vlc_mutex_lock( &p_this->var_lock );
+
+    /* FIXME: if the variable already exists, we don't duplicate it. But we
+     * duplicate the lookups. It's not that serious, but if anyone finds some
+     * time to rework Insert() so that only one lookup has to be done, feel
+     * free to do so. */
+    i_new = Lookup( p_this->p_vars, p_this->i_vars, psz_name );
+
+    if( i_new >= 0 )
+    {
+        /* If the types differ, variable creation failed. */
+        if( i_type != p_this->p_vars[i_new].i_type )
+        {
+            vlc_mutex_unlock( &p_this->var_lock );
+            return VLC_EBADVAR;
+        }
+
+        p_this->p_vars[i_new].i_usage++;
+        vlc_mutex_unlock( &p_this->var_lock );
+        return VLC_SUCCESS;
+    }
+
+    i_new = Insert( p_this->p_vars, p_this->i_vars, psz_name );
-
-    if( (p_this->i_vars & 15) == 15 )
@@ -58 +81 @@
-                                  (p_this->i_vars+17) * sizeof(variable_t) );
-    }
-
-    i_new = Insert( p_this->p_vars, p_this->i_vars, psz_name );
-
-    memmove( p_this->p_vars + i_new + 1,
@@ -65 +86 @@
-             (p_this->i_vars - i_new) * sizeof(variable_t) );
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    p_this->i_vars++;
@@ -90 +114 @@
-{
-    int i_del;
+    variable_t *p_var;
-
-    vlc_mutex_lock( &p_this->var_lock );
@@ -102 +127 @@
-    }
-
+    p_var = &p_this->p_vars[i_del];
+
+    if( p_var->i_usage > 1 )
+    {
+        p_var->i_usage--;
+        vlc_mutex_unlock( &p_this->var_lock );
+        return VLC_SUCCESS;
+    }
+
-    /* Free value if needed */
-this->p_vars[i_del].
+var->
-    {
-        case VLC_VAR_STRING:
-        case VLC_VAR_MODULE:
-        case VLC_VAR_FILE:
-
-
+
-            {
-this->p_vars[i_del].
+var->
-            }
-            break;
-    }
-
-this->p_vars[i_del].
+var->
-
-    memmove( p_this->p_vars + i_del,