Changeset 8d995e6f088eeee7d5ee5896b23c0a1347b27256

Timestamp:

02/04/06 00:52:45 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1139010765 +0000

git-parent:

[661a6c1357158cb970fd2b92fc5d126d65e021ac]

git-author:

Clément Stenac <zorglub@videolan.org> 1139010765 +0000

Message:

Use a hash for stats. Not finished

Files:

• Makefile.am (modified) (1 diff)
• include/vlc_common.h (modified) (2 diffs)
• include/vlc_messages.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (6 diffs)
• src/misc/hashtables.c (added)
• src/misc/stats.c (modified) (6 diffs)

Makefile.am

@@ -471 +471 @@
-    src/misc/vlm.c \
-    src/misc/xml.c \
+    src/misc/hashtables.c \
-    src/misc/version.c \
-    src/extras/libc.c \

include/vlc_common.h

@@ -203 +203 @@
-typedef struct variable_t variable_t;
-typedef struct date_t date_t;
+typedef struct hashtable_entry_t hashtable_entry_t;
-
-/* Messages */
@@ -643 +644 @@
-    }
-
+/* Hash tables handling */
+struct hashtable_entry_t
+{
+    int       i_id;
+    char     *psz_name;
+    uint64_t  i_hash;
+    void     *p_data;
+};
+
+VLC_EXPORT( void, vlc_HashInsert, (hashtable_entry_t **, int *, int, const char *, void *));
+VLC_EXPORT( void*, vlc_HashRetrieve, (hashtable_entry_t*, int, int, const char *) );
+VLC_EXPORT( int, vlc_HashLookup, (hashtable_entry_t *, int, int, const char *) );
+
+
-/* MSB (big endian)/LSB (little endian) conversions - network order is always
- * MSB, and should be used for both network communications and files. Note that

include/vlc_messages.h

@@ -244 +244 @@
-    VLC_COMMON_MEMBERS
-
-
-counter_t **p
+        
+hashtable_entry_t * 
-};
-

include/vlc_symbols.h

@@ -309 +309 @@
-int playlist_LockReplace (playlist_t *,playlist_item_t *, input_item_t*);
-int __intf_Eject (vlc_object_t *, const char *);
+void vlc_HashInsert (hashtable_entry_t **, int *, int, const char *, void *);
-int input_Control (input_thread_t *, int i_query, ...);
-int __aout_VolumeUp (vlc_object_t *, int, audio_volume_t *);
@@ -317 +318 @@
-sout_instance_t * __sout_NewInstance (vlc_object_t *, char *);
-subpicture_t * spu_CreateSubpicture (spu_t *);
+int vlc_HashLookup (hashtable_entry_t *, int, int, const char *);
-void httpd_MsgAdd (httpd_message_t *, char *psz_name, char *psz_value, ...);
-int vout_vaControlDefault (vout_thread_t *, int, va_list);
@@ -360 +362 @@
-decoder_t * input_DecoderNew (input_thread_t *, es_format_t *, vlc_bool_t b_force_decoder);
-xml_t * __xml_Create (vlc_object_t *);
+void* vlc_HashRetrieve (hashtable_entry_t*, int, int, const char *);
-msg_subscription_t* __msg_Subscribe (vlc_object_t *, int);
-const char * VLC_Version (void);
@@ -920 +923 @@
-    update_t * (*__update_New_inner) (vlc_object_t *);
-    void (*update_download_inner) (update_iterator_t *, char *);
+    void (*vlc_HashInsert_inner) (hashtable_entry_t **, int *, int, const char *, void *);
+    int (*vlc_HashLookup_inner) (hashtable_entry_t *, int, int, const char *);
+    void* (*vlc_HashRetrieve_inner) (hashtable_entry_t*, int, int, const char *);
-};
-#  if defined (__PLUGIN__)
@@ -1364 +1370 @@
-#  define __update_New (p_symbols)->__update_New_inner
-#  define update_download (p_symbols)->update_download_inner
+#  define vlc_HashInsert (p_symbols)->vlc_HashInsert_inner
+#  define vlc_HashLookup (p_symbols)->vlc_HashLookup_inner
+#  define vlc_HashRetrieve (p_symbols)->vlc_HashRetrieve_inner
-#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1811 +1820 @@
-    ((p_symbols)->__update_New_inner) = __update_New; \
-    ((p_symbols)->update_download_inner) = update_download; \
+    ((p_symbols)->vlc_HashInsert_inner) = vlc_HashInsert; \
+    ((p_symbols)->vlc_HashLookup_inner) = vlc_HashLookup; \
+    ((p_symbols)->vlc_HashRetrieve_inner) = vlc_HashRetrieve; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__stats_CounterGet_deprecated = NULL; \

src/misc/stats.c

@@ -58 +58 @@
-    {
-        int j;
-
+
+
-
-        for( j = p_counter->i_samples -1; j >= 0 ; j-- )
@@ -67 +68 @@
-        }
-        free( p_counter->psz_name );
-
+
+
-        free( p_counter );
-    }
@@ -110 +112 @@
-    p_counter->last_update = 0;
-
-
-
-
-
+
+
-
-    vlc_mutex_unlock( &p_handler->object_lock );
@@ -468 +468 @@
-    for ( i = 0 ; i< p_handler->i_counters; i++ )
-    {
-
-
-
+
+
+
+
-        }
-    }
@@ -614 +615 @@
-{
-    int i;
-
-
-
-
-
-
-
-
-
-
+
+
-}
-
@@ -665 +658 @@
-    }
-    p_handler->i_counters = 0;
-p_counters = NULL
+_counters = (hashtable_entry_t *) malloc( 5 * sizeof( variable_t ) )
-
-    /// \bug is it p_vlc or p_libvlc ?