X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_arrays.h;h=e6525c01f12f23bf28a7bacdae637dc148d6dc54;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=aa19662d8dfecd0640072a878db58cc53b30d760;hpb=fbf4c8060d35617e39b50ae739307152d02ed951;p=vlc diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index aa19662d8d..e6525c01f1 100644 --- a/include/vlc_arrays.h +++ b/include/vlc_arrays.h @@ -28,6 +28,8 @@ #ifndef _VLC_ARRAYS_H_ #define _VLC_ARRAYS_H_ +#include + /** * Simple dynamic array handling. Array is realloced at each insert/removal */ @@ -73,40 +75,55 @@ } \ while( 0 ) +#define TAB_INIT( count, tab ) \ + do { \ + (count) = 0; \ + (tab) = NULL; \ + } while(0) -#define TAB_APPEND( count, tab, p ) \ +#define TAB_CLEAN( count, tab ) \ + do { \ + if( tab ) free( tab ); \ + (count)= 0; \ + (tab)= NULL; \ + } while(0) + +#define TAB_APPEND_CAST( cast, count, tab, p ) \ + do { \ if( (count) > 0 ) \ - { \ - (tab) = realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \ - } \ + (tab) = cast realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \ else \ - { \ - (tab) = malloc( sizeof( void ** ) ); \ - } \ - (tab)[count] = (p); \ - (count)++ + (tab) = cast malloc( sizeof( void ** ) ); \ + (tab)[count] = (p); \ + (count)++; \ + } while(0) + +#define TAB_APPEND( count, tab, p ) \ + TAB_APPEND_CAST( , count, tab, p ) +#define TAB_APPEND_CPP( type, count, tab, p ) \ + TAB_APPEND_CAST( (type**), count, tab, p ) #define TAB_FIND( count, tab, p, index ) \ - { \ + do { \ int _i_; \ (index) = -1; \ for( _i_ = 0; _i_ < (count); _i_++ ) \ { \ - if( (tab)[_i_] == (p) ) \ + if( (tab)[_i_] == (p) ) \ { \ (index) = _i_; \ break; \ } \ } \ - } + } while(0) #define TAB_REMOVE( count, tab, p ) \ - { \ + do { \ int _i_index_; \ TAB_FIND( count, tab, p, _i_index_ ); \ if( _i_index_ >= 0 ) \ { \ - if( (count) > 1 ) \ + if( (count) > 1 ) \ { \ memmove( ((void**)(tab) + _i_index_), \ ((void**)(tab) + _i_index_+1), \ @@ -119,7 +136,23 @@ (tab) = NULL; \ } \ } \ - } + } while(0) + +#define TAB_INSERT_CAST( cast, count, tab, p, index ) do { \ + if( (count) > 0 ) \ + (tab) = cast realloc( tab, sizeof( void ** ) * ( (count) + 1 ) ); \ + else \ + (tab) = cast malloc( sizeof( void ** ) ); \ + if( (count) - (index) > 0 ) \ + memmove( (void**)(tab) + (index) + 1, \ + (void**)(tab) + (index), \ + ((count) - (index)) * sizeof(*(tab)) );\ + (tab)[(index)] = (p); \ + (count)++; \ +} while(0) + +#define TAB_INSERT( count, tab, p, index ) \ + TAB_INSERT_CAST( , count, tab, p, index ) /** * Binary search in a sorted array. The key must be comparable by < and > @@ -130,7 +163,8 @@ * \param key value of the key * \param answer index of answer within the array. -1 if not found */ -#define BSEARCH( entries, count, elem, zetype, key, answer ) { \ +#define BSEARCH( entries, count, elem, zetype, key, answer ) \ + do { \ int low = 0, high = count - 1; \ answer = -1; \ while( low <= high ) {\ @@ -145,35 +179,14 @@ answer = mid; break; \ }\ } \ -} - -/* Dictionnary handling */ -struct dict_entry_t -{ - int i_int; - char *psz_string; - uint64_t i_hash; - void *p_data; -}; - -struct dict_t -{ - dict_entry_t *p_entries; - int i_entries; -}; + } 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 * ) ); /************************************************************************ * 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 * \ @@ -265,4 +278,252 @@ VLC_EXPORT( int, vlc_DictLookup, (dict_t *, int, const char * ) ); #define FOREACH_END() } } +/************************************************************************ + * Dictionaries + ************************************************************************/ + +/* 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 hashsize ) +{ + 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 % hashsize; +} + +struct vlc_dictionary_entry_t +{ + char * psz_key; + void * p_value; + struct vlc_dictionary_entry_t * p_next; +}; + +typedef struct vlc_dictionary_t +{ + int i_size; + struct vlc_dictionary_entry_t ** p_entries; +} vlc_dictionary_t; + +static void * const kVLCDictionaryNotFound = NULL; + +static inline void vlc_dictionary_init( vlc_dictionary_t * p_dict, int i_size ) +{ + if( i_size > 0 ) + { + p_dict->p_entries = (struct vlc_dictionary_entry_t **)malloc(sizeof(struct vlc_dictionary_entry_t *) * i_size); + assert( p_dict->p_entries ); + memset( p_dict->p_entries, 0, sizeof(struct vlc_dictionary_entry_t *) * i_size ); + } + else + p_dict->p_entries = NULL; + p_dict->i_size = i_size; +} + +static inline void vlc_dictionary_clear( vlc_dictionary_t * p_dict ) +{ + int i; + struct vlc_dictionary_entry_t * p_current, * p_next; + for( i = 0; i < p_dict->i_size; i++ ) + { + p_current = p_dict->p_entries[i]; + while( p_current ) + { + p_next = p_dict->p_entries[i]->p_next; + free( p_dict->p_entries[i]->psz_key ); + free( p_current ); + p_current = p_next; + } + } + free( p_dict->p_entries ); + p_dict->i_size = 0; +} + + + +static inline void * +vlc_dictionary_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_key ) +{ + if( !p_dict->p_entries ) + return kVLCDictionaryNotFound; + + int i_pos = DictHash( psz_key, p_dict->i_size ); + struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; + + if( p_entry && !p_entry->p_next ) + return p_entry->p_value; + + if( !p_entry ) + return kVLCDictionaryNotFound; + + /* Hash collision */ + do { + if( !strcmp( psz_key, p_entry->psz_key ) ) + return p_entry->p_value; + p_entry = p_entry->p_next; + } while( p_entry ); + + return kVLCDictionaryNotFound; +} + +static inline int +vlc_dictionary_keys_count( const vlc_dictionary_t * p_dict ) +{ + struct vlc_dictionary_entry_t * p_entry; + int i, count = 0; + for( i = 0; i < p_dict->i_size; i++ ) + { + for( p_entry = p_dict->p_entries[i]; p_entry; p_entry = p_entry->p_next ) count++; + } + return count; +} + +static inline char ** +vlc_dictionary_all_keys( const vlc_dictionary_t * p_dict ) +{ + struct vlc_dictionary_entry_t * p_entry; + char ** ppsz_ret; + int i, count = vlc_dictionary_keys_count( p_dict ); + + ppsz_ret = (char**)malloc(sizeof(char *) * (count + 1)); + assert( ppsz_ret ); + + count = 0; + for( i = 0; i < p_dict->i_size; i++ ) + { + for( p_entry = p_dict->p_entries[i]; p_entry; p_entry = p_entry->p_next ) + { + ppsz_ret[count++] = strdup( p_entry->psz_key ); + assert( ppsz_ret ); + } + } + ppsz_ret[count] = NULL; + return ppsz_ret; +} + +static inline void +__vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, + void * p_value, vlc_bool_t rebuild ) +{ + if( !p_dict->p_entries ) + vlc_dictionary_init( p_dict, 1 ); + + int i_pos = DictHash( psz_key, p_dict->i_size ); + struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; + + if( !p_entry ) + { + p_entry = p_dict->p_entries[i_pos] = (struct vlc_dictionary_entry_t *)malloc( + sizeof(struct vlc_dictionary_entry_t)); + assert( p_entry ); + + p_entry->psz_key = strdup( psz_key ); + assert( p_entry->psz_key ); + p_entry->p_value = p_value; + p_dict->p_entries[i_pos]->p_next = NULL; + return; + } + if( p_entry->p_value == kVLCDictionaryNotFound ) + { + /* This one is fine, just high jack */ + p_entry->psz_key = strdup( psz_key ); + p_entry->p_value = p_value; + return; + } + + /* Hash collision here */ + p_entry = (struct vlc_dictionary_entry_t *)malloc(sizeof(struct vlc_dictionary_entry_t)); + assert( p_entry ); + p_entry->psz_key = strdup( psz_key ); + p_entry->p_value = p_value; + p_entry->p_next = p_dict->p_entries[i_pos]; + p_dict->p_entries[i_pos] = p_entry; + + if( rebuild ) + { + /* Count how many items there was */ + int count; + for( count = 1; p_entry->p_next; count++ ) p_entry = p_entry->p_next; + if( count > 3 ) /* XXX: this need tuning */ + { + /* Here it starts to be not good, rebuild a bigger dictionary */ + struct vlc_dictionary_t new_dict; + int i_new_size = ( (p_dict->i_size+2) * 3) / 2; /* XXX: this need tuning */ + int i; + + vlc_dictionary_init( &new_dict, i_new_size ); + for( i = 0; i < p_dict->i_size; i++ ) + { + p_entry = p_dict->p_entries[i]; + while( p_entry ); + { + __vlc_dictionary_insert( &new_dict, p_entry->psz_key, + p_entry->p_value, + 0 /* To avoid multiple rebuild loop */); + p_entry = p_entry->p_next; + } + } + vlc_dictionary_clear( p_dict ); + p_dict->i_size = new_dict.i_size; + p_dict->p_entries= new_dict.p_entries; + } + } +} + +static inline void +vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, void * p_value ) +{ + __vlc_dictionary_insert( p_dict, psz_key, p_value, 1 ); +} + +static inline void +vlc_dictionary_remove_value_for_key( const vlc_dictionary_t * p_dict, const char * psz_key ) +{ + if( !p_dict->p_entries ) + return; + + int i_pos = DictHash( psz_key, p_dict->i_size ); + struct vlc_dictionary_entry_t * p_entry = p_dict->p_entries[i_pos]; + struct vlc_dictionary_entry_t * p_prev; + + if( !p_entry ) + return; /* Not found, nothing to do */ + + if( !p_entry->p_next ) + { + free( p_entry->psz_key ); + free( p_entry ); + p_dict->p_entries[i_pos] = NULL; + return; + } + + /* Hash collision */ + p_prev = NULL; + do { + if( !strcmp( psz_key, p_entry->psz_key ) ) + { + if( !p_prev ) + p_dict->p_entries[i_pos] = p_entry->p_next; + else + p_prev->p_next = p_entry->p_next; + free( p_entry->psz_key ); + free( p_entry ); + return; + } + p_prev = p_entry; + p_entry = p_entry->p_next; + } while( p_entry ); + + /* No key was found */ +} + #endif