Changeset 1b3e854 in mainline

Timestamp:

2011-05-21T14:29:50Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

faeb7cc

Parents:

955f2a5

Message:

add library function for explicit heap structure consistency check
use extensive heap consistency checks in the heap allocator tests

Location:

uspace

Files:

• app/tester/mm/common.c (modified) (12 diffs)
• app/tester/mm/malloc3.c (modified) (1 diff)
• app/tester/tester.h (modified) (2 diffs)
• lib/c/generic/malloc.c (modified) (1 diff)
• lib/c/include/malloc.h (modified) (1 diff)

uspace/app/tester/mm/common.c

@@ -135 +135 @@
 }
 
+static void check_consistency(const char *loc)
+{
+        /* Check heap consistency */
+        void *prob = heap_check();
+        if (prob != NULL) {
+                TPRINTF("\nError: Heap inconsistency at %p in %s.\n",
+                    prob, loc);
+                TSTACKTRACE();
+                error_flag = true;
+        }
+}
+
 /** Checked malloc
  *
@@ -153 +165 @@
         /* Allocate the chunk of memory */
         data = malloc(size);
+        check_consistency("checked_malloc");
         if (data == NULL)
                 return NULL;
@@ -160 +173 @@
                 TPRINTF("\nError: Allocated block overlaps with another "
                     "previously allocated block.\n");
+                TSTACKTRACE();
                 error_flag = true;
         }
@@ -198 +212 @@
         if (block->addr == NULL) {
                 free(block);
+                check_consistency("alloc_block");
                 return NULL;
         }
@@ -228 +243 @@
         /* Free the memory */
         free(block->addr);
+        check_consistency("free_block (a)");
         free(block);
+        check_consistency("free_block (b)");
 }
 
@@ -257 +274 @@
             pos < end; pos++)
                 *pos = block_expected_value(block, pos);
+        
+        check_consistency("fill_block");
 }
 
@@ -273 +292 @@
                 if (*pos != block_expected_value(block, pos)) {
                         TPRINTF("\nError: Corrupted content of a data block.\n");
+                        TSTACKTRACE();
                         error_flag = true;
                         return;
@@ -296 +316 @@
         if (entry == NULL) {
                 TPRINTF("\nError: Corrupted list of allocated memory blocks.\n");
+                TSTACKTRACE();
                 error_flag = true;
         }
@@ -325 +346 @@
         if (addr == NULL) {
                 free(area);
+                check_consistency("map_area (a)");
                 return NULL;
         }
@@ -331 +353 @@
         if (area->addr == (void *) -1) {
                 free(area);
+                check_consistency("map_area (b)");
                 return NULL;
         }
@@ -361 +384 @@
         
         free(area);
+        check_consistency("unmap_area");
 }
 
@@ -389 +413 @@
             pos < end; pos++)
                 *pos = area_expected_value(area, pos);
-}
+        
+        check_consistency("fill_area");
+}

uspace/app/tester/mm/malloc3.c

@@ -236 +236 @@
                                         mem_area_t *area = map_area(AREA_SIZE);
                                         RETURN_IF_ERROR;
+                                        
                                         if (area != NULL) {
                                                 TPRINTF("*");

uspace/app/tester/tester.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <bool.h>
+#include <stacktrace.h>
 
 #define IPC_TEST_SERVICE  10240
@@ -59 +60 @@
                 if (!test_quiet) { \
                         fprintf(stderr, (format), ##__VA_ARGS__); \
+                } \
+        } while (0)
+
+#define TSTACKTRACE() \
+        do { \
+                if (!test_quiet) { \
+                        stacktrace_print(); \
                 } \
         } while (0)

uspace/lib/c/generic/malloc.c

@@ -904 +904 @@
 }
 
+void *heap_check(void)
+{
+        futex_down(&malloc_futex);
+        
+        if (first_heap_area == NULL) {
+                futex_up(&malloc_futex);
+                return (void *) -1;
+        }
+        
+        /* Walk all heap areas */
+        for (heap_area_t *area = first_heap_area; area != NULL;
+            area = area->next) {
+                
+                /* Check heap area consistency */
+                if ((area->magic != HEAP_AREA_MAGIC) ||
+                    ((void *) area != area->start) ||
+                    (area->start >= area->end) ||
+                    (((uintptr_t) area->start % PAGE_SIZE) != 0) ||
+                    (((uintptr_t) area->end % PAGE_SIZE) != 0)) {
+                        futex_up(&malloc_futex);
+                        return (void *) area;
+                }
+                
+                /* Walk all heap blocks */
+                for (heap_block_head_t *head = (heap_block_head_t *)
+                    AREA_FIRST_BLOCK_HEAD(area); (void *) head < area->end;
+                    head = (heap_block_head_t *) (((void *) head) + head->size)) {
+                        
+                        /* Check heap block consistency */
+                        if (head->magic != HEAP_BLOCK_HEAD_MAGIC) {
+                                futex_up(&malloc_futex);
+                                return (void *) head;
+                        }
+                        
+                        heap_block_foot_t *foot = BLOCK_FOOT(head);
+                        
+                        if ((foot->magic != HEAP_BLOCK_FOOT_MAGIC) ||
+                            (head->size != foot->size)) {
+                                futex_up(&malloc_futex);
+                                return (void *) foot;
+                        }
+                }
+        }
+        
+        futex_up(&malloc_futex);
+        
+        return NULL;
+}
+
 /** @}
  */

uspace/lib/c/include/malloc.h

@@ -46 +46 @@
 extern void *realloc(const void *addr, const size_t size);
 extern void free(const void *addr);
+extern void *heap_check(void);
 
 #endif