X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2Fnative%2Falgo.c;h=4b8df13f501b342246977f7fb3056285eeb2cbd0;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=28c9f12581cfc5ce96a2d13d33079bbf315b395f;hpb=0fbf13c30976400ed00ccf72ce8d7c84c981d628;p=vlc

diff --git a/test/native/algo.c b/test/native/algo.c
index 28c9f12581..4b8df13f50 100644
--- a/test/native/algo.c
+++ b/test/native/algo.c
@@ -22,6 +22,91 @@
 #include "../pyunit.h"
 #include <vlc/vlc.h>
 
+/**********************************************************************
+ * Arrays
+ *********************************************************************/
+
+TYPEDEF_ARRAY(long,long_array_t);
+
+PyObject *arrays_test( PyObject *self, PyObject *args )
+{
+    mtime_t one, two;
+    int number = 1000000;
+    int number2 = 50000; /* For slow with memmove */
+    printf("\n");
+    {
+        int i_items = 0;
+        int *p_items = NULL;
+        int i;
+        one = mdate();
+        for( i = 0 ; i<number;i++) {
+            INSERT_ELEM(p_items,i_items, i_items, i+50);
+        }
+        two = mdate();
+        printf( " Std array %i items appended in "I64Fi" µs\n", number,
+                (two-one) );
+        for( i = number-1 ; i>=0; i--) {
+            REMOVE_ELEM( p_items, i_items, i );
+        }
+        one = mdate();
+        printf( " Std array %i items removed in  "I64Fi" µs\n", number,
+                (one-two) );
+
+        for( i = 0 ; i<number2;i++) {
+            int pos = i_items == 0  ? 0 : rand() % i_items;
+            INSERT_ELEM(p_items, i_items, pos, pos + 50);
+        }
+        two = mdate();
+        printf( " Std array %i items inserted in  "I64Fi" µs\n", number2,
+                (two-one) );
+    }
+    {
+        DECL_ARRAY(int) int_array;
+        int i = 0;
+        ARRAY_INIT(int_array);
+        ASSERT(int_array.i_size == 0, "" );
+        ASSERT(int_array.i_alloc == 0, "" );
+        ASSERT(int_array.p_elems == 0, "" );
+
+        ARRAY_APPEND(int_array, 42 );
+        ASSERT(int_array.i_size == 1, "" );
+        ASSERT(int_array.i_alloc > 1, "" );
+        ASSERT(int_array.p_elems[0] == 42, "" );
+        ARRAY_REMOVE(int_array,0);
+        ASSERT(int_array.i_size == 0, "" );
+
+        one = mdate();
+        for( i = 0 ; i<number;i++) {
+            ARRAY_APPEND(int_array, i+50);
+        }
+        two = mdate();
+        printf( " New array %i items appended in "I64Fi" µs\n", number,
+                (two-one) );
+        ASSERT(int_array.p_elems[1242] == 1292 , "");
+        for( i = number-1 ; i>=0; i--) {
+            ARRAY_REMOVE(int_array,i);
+        }
+        one = mdate();
+        printf( " New array %i items removed in  "I64Fi" µs\n", number,
+                (one-two) );
+
+        /* Now random inserts */
+        for( i = 0 ; i<number2;i++) {
+            int pos = int_array.i_size == 0  ? 0 : rand() % int_array.i_size;
+            ARRAY_INSERT(int_array, pos+50, pos);
+        }
+        two = mdate();
+        printf( " New array %i items inserted in  "I64Fi" µs\n", number2,
+                (two-one) );
+    }
+    {
+        long_array_t larray;
+        ARRAY_INIT(larray);
+    }
+    Py_INCREF( Py_None);
+    return Py_None;
+}
+
 /**********************************************************************
  * Binary search
  *********************************************************************/
@@ -66,7 +151,7 @@ PyObject *bsearch_member_test( PyObject *self, PyObject *args )
 {
     struct bsearch_tester array[] =
     {
-        { 0, 12 }, { 1, 22 } , { 2, 33 } , { 3, 68 } , { 4, 56 } 
+        { 0, 12 }, { 1, 22 } , { 2, 33 } , { 3, 68 } , { 4, 56 }
     };
 #define MEMBCHECK( checked, expected ) { \
     int answer = -1;  \
@@ -87,17 +172,19 @@ PyObject *bsearch_member_test( PyObject *self, PyObject *args )
 /**********************************************************************
  * 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" );
 }
@@ -105,42 +192,59 @@ static void DumpDict( dict_t *p_dict )
 PyObject *dict_test( PyObject *self, PyObject *args )
 {
     int i42 = 42,i40 = 40,i12 = 12, i0 = 0, i00 = 0;
+    int answer;
 
-    dict_t *p_dict = vlc_DictNew();
+    printf("\n");
+
+    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;