Changeset 266fb28cd7fdd0db6926f807bf4f9bcdd1b29010

Timestamp:

19/10/06 23:00:14 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[531bbc546238a0067f76869d123fae139d3f2157]

git-author:

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

Message:

Dynamic array with log allocation

Files:

• include/vlc_arrays.h (added)
• include/vlc_common.h (modified) (1 diff)
• test/NativeAlgoTest.py (modified) (1 diff)
• test/native/algo.c (modified) (2 diffs)
• test/native/init.c (modified) (1 diff)
• test/native/tests.h (modified) (1 diff)
• test/test.sh (modified) (2 diffs)

include/vlc_common.h

@@ -634 +634 @@
-#define FREE(a) if( a ) { free( a ); }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/* MSB (big endian)/LSB (little endian) conversions - network order is always

test/NativeAlgoTest.py

@@ -4 +4 @@
-
-class NativeAlgoTestCase( unittest.TestCase ):
+    def test_arrays( self ):
+        """[Algo] Check dynamic arrays"""
+        native_libvlc_test.arrays_test()
-    def test_bsearch_direct( self ):
-        """[Algo] Check Bsearch with simple types"""

test/native/algo.c

@@ -24 +24 @@
-
-/**********************************************************************
+ * 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
- *********************************************************************/
@@ -67 +152 @@
-    struct bsearch_tester array[] =
-    {
- 
+
-    };
-#define MEMBCHECK( checked, expected ) { \

test/native/init.c

@@ -21 +21 @@
-   DEF_METHOD( gui_chains_test, "Test interactions between chains and GUI" )
-   DEF_METHOD( psz_chains_test, "Test building of chain strings" )
+   DEF_METHOD( arrays_test, "Test arrays")
-   DEF_METHOD( bsearch_direct_test, "Test Bsearch without structure" )
-   DEF_METHOD( bsearch_member_test, "Test Bsearch with structure" )

test/native/tests.h

@@ -20 +20 @@
-
-/* Algo */
+PyObject *arrays_test( PyObject *self, PyObject *args );
-PyObject *bsearch_direct_test( PyObject *self, PyObject *args );
-PyObject *bsearch_member_test( PyObject *self, PyObject *args );

test/test.sh

@@ -13 +13 @@
-ulimit -c unlimited
-
-
+
+
+
+
+
-'$bold = "\033[1m";
-$grey  = "\033[37m";
@@ -43 +47 @@
-     }
-}'
-
+