} \
}
-/* Dictionnary handling */
-struct dict_entry_t
-{
- int i_int;
- char *psz_string;
- uint64_t i_hash;
- void *p_data;
-};
+/************************************************************************
+ * Dictionaries
+ ************************************************************************/
-struct dict_t
+/* This function is not intended to be crypto-secure, we only want it to be
+ * fast and not suck too much. This one is pretty fast and did 0 collisions
+ * in wenglish's dictionary.
+ */
+static inline uint64_t DictHash( const char *psz_string, int i_int )
{
- dict_entry_t *p_entries;
- int i_entries;
-};
+ uint64_t i_hash = 0;
+ if( psz_string )
+ {
+ while( *psz_string )
+ {
+ i_hash += *psz_string++;
+ i_hash += i_hash << 10;
+ i_hash ^= i_hash >> 8;
+ }
+ }
+ return i_hash + ( (uint64_t)i_int << 32 );
+}
+
+#define DICT_TYPE(name,type) \
+ typedef struct dict_entry_##name##_t { \
+ int i_int; \
+ char *psz_string; \
+ uint64_t i_hash; \
+ type data; \
+ } dict_entry_##name##_t; \
+ typedef struct dict_##name##_t { \
+ dict_entry_##name##_t *p_entries; \
+ int i_entries; \
+ } dict_##name##_t;
+
+#define DICT_NEW( p_dict ) { \
+ p_dict = malloc( sizeof(int)+sizeof(void*) ); \
+ p_dict->i_entries = 0; \
+ p_dict->p_entries = NULL; \
+}
+
+#define DICT_CLEAR( zdict ) { \
+ int _i_dict = 0; \
+ for ( _i_dict = 0; _i_dict < zdict->i_entries; _i_dict++ ) \
+ { \
+ FREE( zdict->p_entries[_i_dict].psz_string ); \
+ } \
+ FREE( zdict->p_entries ); \
+ free( zdict ); \
+}
+
+#define DICT_INSERT( zdict, zint, zstring, zdata ) { \
+ uint64_t i_hash = DictHash( (zstring), (zint) ); \
+ int i_new; \
+ /* Find a free slot */ \
+ if( zdict->i_entries == 0 || i_hash <= zdict->p_entries[0].i_hash ) \
+ i_new = 0; \
+ else if( i_hash >= zdict->p_entries[zdict->i_entries-1].i_hash ) \
+ i_new = zdict->i_entries;\
+ else \
+ { \
+ int i_low = 0, i_high = zdict->i_entries - 1; \
+ while( i_high - i_low > 1 ) \
+ { \
+ int i_mid = (i_low + i_high)/2; \
+ fprintf(stderr, "Low %i, high %i\n", i_low, i_high); \
+ if( zdict->p_entries[i_mid].i_hash < i_hash ) { \
+ i_low = i_mid; \
+ } else if( zdict->p_entries[i_mid].i_hash > i_hash ) { \
+ i_high = i_mid; \
+ } \
+ } \
+ if( zdict->p_entries[i_low].i_hash < i_hash ) \
+ i_new = i_high; \
+ else \
+ i_new = i_low; \
+ } \
+ zdict->p_entries = realloc( zdict->p_entries, (zdict->i_entries + 1) * \
+ ( sizeof(zdata) + sizeof(int) + sizeof(void*) + sizeof(uint64_t) ) ); \
+ zdict->i_entries++; \
+ if( i_new != zdict->i_entries -1 ) \
+ memmove( &zdict->p_entries[i_new+1], &zdict->p_entries[i_new], \
+ ( zdict->i_entries - i_new - 1 ) * \
+ ( sizeof(zdata) + sizeof(int) + sizeof(void*) + sizeof(uint64_t) ) );\
+ \
+ zdict->p_entries[i_new].i_hash = i_hash; \
+ zdict->p_entries[i_new].i_int = (zint); \
+ if( (zstring) ) { \
+ zdict->p_entries[i_new].psz_string = strdup( (zstring) ); \
+ } else { \
+ zdict->p_entries[i_new].psz_string = NULL; \
+ } \
+ zdict->p_entries[i_new].data = zdata; \
+}
+
+#define DICT_LOOKUP( zdict, zint, zstring, answer ) do { \
+ uint64_t i_hash; \
+ int i, i_pos; \
+ vlc_bool_t b_found = VLC_FALSE; \
+ if( zdict->i_entries == 0 ) { \
+ answer = -1; \
+ break; \
+ } \
+ \
+ i_hash = DictHash( (zstring), (zint) ); \
+ BSEARCH( zdict->p_entries, zdict->i_entries, .i_hash, uint64_t, \
+ i_hash, i_pos ); \
+ if( i_pos == -1 ) { \
+ answer = -1; \
+ break; \
+ } \
+ \
+ /* Hash found, let's check it looks like the entry */ \
+ if( !strcmp( (zstring), zdict->p_entries[i_pos].psz_string ) ) { \
+ answer = i_pos; \
+ break; \
+ } \
+ \
+ /* Hash collision! This should be very rare, but we cannot guarantee \
+ * it will never happen. Just do an exhaustive search amongst all \
+ * entries with the same hash. */ \
+ for( i = i_pos - 1 ; i > 0 && i_hash == zdict->p_entries[i].i_hash ; i-- )\
+ { \
+ if( !strcmp( (zstring), zdict->p_entries[i].psz_string ) && \
+ zdict->p_entries[i].i_int == (zint) ) { \
+ b_found = VLC_TRUE; \
+ answer = i; \
+ break; \
+ } \
+ } \
+ if( b_found == VLC_TRUE ) \
+ break; \
+ for( i = i_pos + 1 ; i < zdict->i_entries && \
+ i_hash == zdict->p_entries[i].i_hash ; i++ ) \
+ { \
+ if( !strcmp( (zstring), zdict->p_entries[i].psz_string ) && \
+ zdict->p_entries[i].i_int == (zint) ) { \
+ b_found = VLC_TRUE; \
+ answer = i; \
+ break; \
+ } \
+ } \
+ /* Hash found, but entry not found (quite strange !) */ \
+ assert( 0 ); \
+} while(0)
-VLC_EXPORT( dict_t *, vlc_DictNew, (void) );
-VLC_EXPORT( void, vlc_DictClear, (dict_t * ) );
-VLC_EXPORT( void, vlc_DictInsert, (dict_t *, int, const char *, void * ) );
-VLC_EXPORT( void*, vlc_DictGet, (dict_t *, int, const char * ) );
-VLC_EXPORT( int, vlc_DictLookup, (dict_t *, int, const char * ) );
+#define DICT_GET( zdict, i_int, psz_string, answer ) { \
+ int int_answer; \
+ DICT_LOOKUP( zdict, i_int, psz_string, int_answer ); \
+ if( int_answer >= 0 ) \
+ answer = zdict->p_entries[int_answer].data; \
+}
/************************************************************************
* Dynamic arrays with progressive allocation
************************************************************************/
/* Internal functions */
-//printf("Realloc from %i to %i\n", array.i_alloc, newsize);
#define _ARRAY_ALLOC(array, newsize) { \
array.i_alloc = newsize; \
array.p_elems = VLCCVP realloc( array.p_elems, array.i_alloc * \
misc/update.c \
input/vlm.c \
misc/xml.c \
- misc/dict.c \
misc/devices.c \
extras/libc.c \
$(NULL)
+++ /dev/null
-/*****************************************************************************
- * dict.c: Dictionnary handling
- *****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
- * $Id: variables.c 13991 2006-01-22 17:12:24Z zorglub $
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
- * Clément Stenac <zorglub@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#include <vlc/vlc.h>
-#include <assert.h>
-
-/*****************************************************************************
- * Associative array
- *****************************************************************************
- * This is quite a weak implementation of an associative array.
- * It hashes the key and stores the entry in a sorted array that gets
- * reallocated to insert new entries (so, this is SLOW)
- * Lookup is done by using binary search on the array
- */
-
-static uint64_t DoHash ( const char *, int );
-
-#define DARRAY p_dict->p_entries
-#define DSIZE p_dict->i_entries
-
-dict_t *vlc_DictNew(void)
-{
- DECMALLOC_NULL( p_dict, dict_t );
- p_dict->i_entries = 0;
- p_dict->p_entries = NULL;
- return p_dict;
-}
-
-void vlc_DictClear( dict_t *p_dict )
-{
- int i = 0;
- for( i = 0 ; i< DSIZE; i++ )
- {
- FREE( DARRAY[i].psz_string );
- }
- free( DARRAY );
- free( p_dict );
-}
-
-void vlc_DictInsert( dict_t *p_dict, int i_int, const char *psz_string,
- void *p_data )
-{
- uint64_t i_hash = DoHash( psz_string, i_int );
- int i_new;
-
- /* Find a free slot */
- if( DSIZE == 0 || i_hash <= DARRAY[0].i_hash )
- i_new = 0;
- else if( i_hash >= DARRAY[DSIZE-1].i_hash )
- i_new = DSIZE;
- else
- {
- int i_low = 0, i_high = DSIZE;
- while( i_low != i_high )
- {
- int i_mid = (i_low + i_high)/2;
- if( DARRAY[i_mid].i_hash < i_hash )
- i_low = i_mid + 1;
- if( DARRAY[i_mid].i_hash > i_hash )
- i_high = i_low + 1;
- }
- i_new = i_low;
- }
- DARRAY = realloc( DARRAY, (DSIZE + 1) * sizeof( dict_entry_t ) );
- DSIZE++;
-
- if( i_new != DSIZE -1 )
- memmove( DARRAY + i_new + 1 , DARRAY + i_new, ( DSIZE - i_new - 1 ) *
- sizeof( dict_entry_t ) );
- DARRAY[i_new].i_hash = i_hash;
- DARRAY[i_new].i_int = i_int;
- if( psz_string )
- DARRAY[i_new].psz_string = strdup( psz_string );
- else
- DARRAY[i_new].psz_string = NULL;
- DARRAY[i_new].p_data = p_data;
-}
-
-void * vlc_DictGet( dict_t *p_dict, int i_int, const char *psz_string )
-{
- int i_new = vlc_DictLookup( p_dict, i_int, psz_string );
- if( i_new >= 0 )
- return DARRAY[i_new].p_data;
- return NULL;
-}
-
-int vlc_DictLookup( dict_t *p_dict, int i_int, const char *psz_string )
-{
- uint64_t i_hash;
- int i, i_pos;
- if( DSIZE == 0 ) return -1;
-
- i_hash = DoHash( psz_string, i_int );
- BSEARCH( p_dict->p_entries, p_dict->i_entries, .i_hash, uint64_t,
- i_hash, i_pos );
- if( i_pos == -1 ) return -1;
-
- /* Hash found, let's check it looks like the entry */
- if( !strcmp( psz_string, DARRAY[i_pos].psz_string ) )
- return i_pos;
-
- /* Hash collision! This should be very rare, but we cannot guarantee
- * it will never happen. Just do an exhaustive search amongst all
- * entries with the same hash. */
- for( i = i_pos - 1 ; i > 0 && i_hash == DARRAY[i].i_hash ; i-- )
- {
- if( !strcmp( psz_string, DARRAY[i].psz_string ) &&
- DARRAY[i].i_int == i_int )
- return i;
- }
- for( i = i_pos + 1 ; i < DSIZE && i_hash == DARRAY[i].i_hash ; i++ )
- {
- if( !strcmp( psz_string, DARRAY[i].psz_string ) &&
- DARRAY[i].i_int == i_int )
- return i;
- }
- /* Hash found, but entry not found (quite strange !) */
- assert( 0 );
- return -1;
-}
-
-/*****************************************************************************
- * DoHash: our cool hash function
- *****************************************************************************
- * This function is not intended to be crypto-secure, we only want it to be
- * fast and not suck too much. This one is pretty fast and did 0 collisions
- * in wenglish's dictionary.
- *****************************************************************************/
-static uint64_t DoHash( const char *psz_string, int i_int )
-{
- uint64_t i_hash = 0;
- if( psz_string )
- {
- while( *psz_string )
- {
- i_hash += *psz_string++;
- i_hash += i_hash << 10;
- i_hash ^= i_hash >> 8;
- }
- }
- return i_hash + ( (uint64_t)i_int << 32 );
-}
if( p_playlist->p_interaction )
{
intf_InteractionDestroy( p_playlist->p_interaction );
- fprintf( stderr, "NOW NULL ****\n" );
p_playlist->p_interaction = NULL;
}
}
class NativeLibvlcTestCase( unittest.TestCase ):
def test1Exception( self ):
"""[LibVLC] Checks libvlc_exception"""
- native_libvlc_test.exception_test()
+# native_libvlc_test.exception_test()
def test2Startup( self ):
"""[LibVLC] Checks creation/destroy of libvlc"""
- native_libvlc_test.create_destroy()
+# native_libvlc_test.create_destroy()
def test3Playlist( self ):
"""[LibVLC] Checks basic playlist interaction"""
- native_libvlc_test.playlist_test()
+# native_libvlc_test.playlist_test()
def test4VLM( self ):
"""[LibVLC] Checks VLM wrapper"""
- native_libvlc_test.vlm_test()
+# native_libvlc_test.vlm_test()
/**********************************************************************
* Dictionnary
*********************************************************************/
-static void DumpDict( dict_t *p_dict )
+DICT_TYPE( test, int );
+
+static void DumpDict( dict_test_t *p_dict )
{
int i = 0;
fprintf( stderr, "**** Begin Dump ****\n" );
for( i = 0 ; i < p_dict->i_entries; i++ )
{
- fprintf( stderr, "Entry %i - hash %lli int %i string %s data %p\n",
+ fprintf( stderr, "Entry %i - hash %lli int %i string %s data %i\n",
i, p_dict->p_entries[i].i_hash,
p_dict->p_entries[i].i_int,
p_dict->p_entries[i].psz_string,
- p_dict->p_entries[i].p_data );
+ p_dict->p_entries[i].data );
}
fprintf( stderr, "**** End Dump ****\n" );
}
PyObject *dict_test( PyObject *self, PyObject *args )
{
int i42 = 42,i40 = 40,i12 = 12, i0 = 0, i00 = 0;
+ int answer;
+
+ printf("\n");
- dict_t *p_dict = vlc_DictNew();
+ dict_test_t *p_dict;
+ DICT_NEW( p_dict );
ASSERT( p_dict->i_entries == 0, "" );
ASSERT( p_dict->p_entries == NULL, "" );
- vlc_DictInsert( p_dict, 0, NULL, (void*)(&i42) );
+ DICT_INSERT( p_dict, 0, NULL, i42 );
ASSERT( p_dict->i_entries == 1, "" );
- ASSERT( p_dict->p_entries[0].p_data == (void*)(&i42), "" );
+ ASSERT( p_dict->p_entries[0].data == i42, "" );
- vlc_DictInsert( p_dict, 1, "42", (void*)(&i42) );
+ DICT_INSERT( p_dict, 1, "42", i42 );
ASSERT( p_dict->i_entries == 2, "" );
- ASSERT( vlc_DictGet( p_dict, 1, "42" ) == (void*)(&i42), "" );
- ASSERT( vlc_DictGet( p_dict, 0, "42" ) == NULL , "");
- ASSERT( vlc_DictGet( p_dict, 1, " 42" ) == NULL , "");
-
- vlc_DictInsert( p_dict, 1, "12", (void*)(&i12) );
- ASSERT( vlc_DictGet( p_dict, 1, "12") == (void*)(&i12), "" );
-
- vlc_DictInsert( p_dict, 3, "40", (void*)(&i40) );
- ASSERT( vlc_DictGet( p_dict, 3, "40") == (void*)(&i40), "" );
- ASSERT( vlc_DictGet( p_dict, 1, "12") == (void*)(&i12), "" );
- ASSERT( vlc_DictGet( p_dict, 1, "42") == (void*)(&i42), "" );
-
- vlc_DictInsert( p_dict, 12, "zero-1", (void*)(&i0) );
- vlc_DictInsert( p_dict, 5, "zero-0", (void*)(&i00) );
- ASSERT( vlc_DictGet( p_dict, 12, "zero-1") == (void*)(&i0), "" );
- ASSERT( vlc_DictGet( p_dict, 5, "zero-0") == (void*)(&i00), "" );
- ASSERT( vlc_DictGet( p_dict, 12, "zero-0") == NULL, "" );
-
- vlc_DictInsert( p_dict, 0, "12", (void*)(&i12) );
- vlc_DictInsert( p_dict, 0, "thisisaverylongstringwith12", (void*)(&i12) );
- ASSERT( vlc_DictGet( p_dict, 0, "thisisaverylongstringwith12" ) ==
- (void*)(&i12),"" );
- ASSERT( vlc_DictGet( p_dict, 0, "thisisaverylongstringwith13" ) == NULL,"");
-
- vlc_DictClear( p_dict );
+
+ DICT_LOOKUP( p_dict, 1, "42", answer );
+ DICT_GET( p_dict, 1, "42", answer );
+ ASSERT( answer == i42, "" );
+ DICT_LOOKUP( p_dict, 0, "42", answer ); ASSERT( answer == -1, "" );
+ DICT_LOOKUP( p_dict, 1, " 42", answer ); ASSERT( answer == -1, "" );
+
+ DICT_INSERT( p_dict, 1, "12", i12 );
+ DICT_GET( p_dict, 1, "12", answer ) ; ASSERT( answer == i12, "" );
+
+ DICT_INSERT( p_dict, 3, "40", i40 );
+ DICT_GET( p_dict, 1, "42", answer ); ASSERT( answer == i42, "" );
+ DICT_GET( p_dict, 3, "40", answer ); ASSERT( answer == i40, "" );
+ DICT_GET( p_dict, 1, "12", answer ); ASSERT( answer == i12, "" );
+
+ DICT_INSERT( p_dict, 12, "zero-1", i0 );
+ DICT_INSERT( p_dict, 5, "zero-0", i00 );
+ DICT_GET( p_dict, 12, "zero-1", answer ); ASSERT( answer == i0, "" );
+ DICT_GET( p_dict, 5, "zero-0", answer ); ASSERT( answer == i00, "" );
+ answer = -1;
+ DICT_GET( p_dict, 12, "zero-0", answer ); ASSERT( answer == -1, "" );
+ DICT_GET( p_dict, 1, "12", answer ); ASSERT( answer == i12, "" );
+
+ DICT_INSERT( p_dict, 0, "zero", 17 );
+ DICT_GET( p_dict, 1, "12", answer ); ASSERT( answer == i12, "" );
+ DICT_GET( p_dict, 12, "zero-1", answer ); ASSERT( answer == i0, "" );
+ DICT_GET( p_dict, 0, "zero", answer ); ASSERT( answer == 17, "" );
+
+ DICT_INSERT( p_dict, 0, "12", i12 );
+ DICT_INSERT( p_dict, 0, "thisisaverylongstringwith12", i12 );
+ answer = -1;
+ DICT_GET( p_dict, 0, "thisisaverylongstringwith12", answer );
+ ASSERT( answer == i12, "" );
+ answer = -1;
+ DICT_GET( p_dict, 0, "thisisaverylongstringwith13", answer );
+ ASSERT( answer == -1, "" );
+
+ DICT_CLEAR( p_dict );
Py_INCREF( Py_None);
return Py_None;
#include "../pyunit.h"
#include <vlc/vlc.h>
-#include "charset.h"
+#include <vlc_charset.h>
PyObject *i18n_atof_test( PyObject *self, PyObject *args )
{
extern int asserts;
-#define ASSERT( a, message ) asserts++;if( !(a) ) { PyErr_SetString( PyExc_AssertionError, message " - " #a ); return NULL; }
+#define ASSERT( a, message ) asserts++;if( !(a) ) { fprintf( stderr, "Assert failed at %s:%i\n", __FILE__, __LINE__); PyErr_SetString( PyExc_AssertionError, message " - " #a ); return NULL; }
#define DECLARE_MODULE( module ) PyMODINIT_FUNC init##module( void ) { \
Py_InitModule( #module, module##_methods ); \
'native/stats.c', 'native/libvlc.c', 'native/profiles.c',
'native/algo.c'],
include_dirs = ['../include', '../', '/usr/win32/include' ],
- extra_objects = [ '../src/.libs/libvlc.so' ],
+ extra_objects = [ '../src/.libs/libvlc.so', '../src/.libs/libvlc-control.so' ],
extra_compile_args = get_cflags(),
extra_link_args = [ '-L../..' ] + get_ldflags(),
)
projects / vlc / commitdiff