Changeset 5f6a4a2 in rtems

Timestamp:

Jun 10, 2009, 3:28:10 PM (12 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 5, master

Children:

293a0a4

Parents:

e050d9a

Message:

2009-06-10 Joel Sherrill <joel.sherrill@…>

• heapwalk/init.c: Add test code for first free block pointer not aligned.

Location:

testsuites/libtests

Files:

• ChangeLog (modified) (1 diff)
• heapwalk/init.c (modified) (9 diffs)

testsuites/libtests/ChangeLog

@@ +1 @@
+2009-06-10      Joel Sherrill <joel.sherrill@OARcorp.com>
+
+        * heapwalk/init.c: Add test code for first free block pointer not
+        aligned.
+
 2009-06-08      Joel Sherrill <joel.sherrill@OARcorp.com>
 

testsuites/libtests/heapwalk/init.c

@@ -2 +2 @@
  *  Test of Heap Walker
  *
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -33 +33 @@
 }
 
-void test_heap_walk( int source, bool do_dump )
+void test_heap_walk_body( int source, bool do_dump );
+
+void test_heap_walk( int source )
+{
+  test_heap_walk_body( source, true );
+  test_heap_walk_body( source, false );
+}
+
+void test_heap_walk_body( int source, bool do_dump )
 {
   int i, j, original;
 
   _Heap_Walk( &TestHeap, source, do_dump );
- 
+
   /*
    *  Now corrupt all non-zero values
@@ -48 +56 @@
 
     /* mark it free -- may or may not have already been */
-printf( "%p -- free\n", i );
-    TestHeapMemory[i] &= ~0x01;    
+    TestHeapMemory[i] &= ~0x01;
     _Heap_Walk( &TestHeap, source, do_dump );
 
     /* mark it used -- may or may not have already been */
-printf( "%p -- used\n", i );
-    TestHeapMemory[i] |= 0x01;    
+    TestHeapMemory[i] |= 0x01;
     _Heap_Walk( &TestHeap, source, do_dump );
 
+    /* try values of 2-7 in the last three bits -- push alignment issues */
+    for (j=2 ; j<=7 ; j++) {
+      TestHeapMemory[i] = (TestHeapMemory[i] & ~0x7) | j;
+      _Heap_Walk( &TestHeap, source, do_dump );
+    }
+
+
     /* try 0 and see what that does */
-printf( "%p -- 0x00\n", i );
-    TestHeapMemory[i] = 0x00;    
+    TestHeapMemory[i] = 0x00;
     _Heap_Walk( &TestHeap, source, do_dump );
 
     /* try 0xffffffff and see what that does */
-printf( "%p -- 0xff\n", i );
-    TestHeapMemory[i] = 0xffffffff;    
+    TestHeapMemory[i] = 0xffffffff;
     _Heap_Walk( &TestHeap, source, do_dump );
 
@@ -75 +86 @@
   puts( "Walk freshly initialized heap" );
   test_heap_init();
-  test_heap_walk(1, true);
+  test_heap_walk(1);
 }
 
@@ -86 +97 @@
   puts( "Passing negative value for source" );
   test_heap_init();
-  test_heap_walk( -1, true );
+  test_heap_walk( -1 );
 }
 
@@ -96 +107 @@
    */
   puts( "Calling Heap Walk without initialising" );
-  test_heap_walk( 1, true );
+  test_heap_walk( 1 );
 }
 
@@ -110 +121 @@
   test_heap_init();
   TestHeap.page_size = 128;
-  test_heap_walk( -1, true );
+  test_heap_walk( -1 );
+}
+
+void test_first_block_not_aligned(void)
+{
+  /*
+   * Hack to get to the error case where the blocks are
+   * not on the page size.  We initialize a heap with
+   * default settings and change the page size to something
+   * large.
+   */
+  puts( "Testing case of blocks not on page size" );
+  test_heap_init();
+  _Heap_Head(&TestHeap)->next = (void *)1;
+  test_heap_walk( -1 );
 }
 
@@ -129 +154 @@
   p3 =_Heap_Allocate( &TestHeap, 32 );
   _Heap_Free( &TestHeap, p2 );
-  test_heap_walk( -1, true );
+  test_heap_walk( -1 );
 }
 
@@ -143 +168 @@
   test_not_aligned();
   test_not_in_free_list();
+  test_first_block_not_aligned();
 
   puts( "*** END OF HEAP WALK TEST ***" );