Changeset 709 for soft/giet_vm/giet_libs/malloc.c

Timestamp:

Oct 1, 2015, 4:20:46 PM (9 years ago)

Author:

alain

Message:

Major release: Change the task model to implement the POSIX threads API.

• The shell "exec" and "kill" commands can be used to activate/de-activate the applications.
• The "pause", "resume", and "context" commands can be used to stop, restart, a single thtead or to display the thread context.

This version has been tested on the following multi-threaded applications,
that have been modified to use the POSIX threads:

• classif
• convol
• transpose
• gameoflife
• raycast

File:

• soft/giet_vm/giet_libs/malloc.c (modified) (7 diffs)

soft/giet_vm/giet_libs/malloc.c

@@ -98 +98 @@
 
     // checking heap segment constraints
-    if ( heap_size == 0 )                                    // heap segment exist
-    {
-        giet_exit("ERROR in malloc() : heap not found \n");
-    }
-    if ( heap_size != (1<<heap_index) )                      // heap size power of 2
-    {
-        giet_exit("ERROR in malloc() : heap size must be power of 2\n");
-    }
-    if ( heap_base % heap_size )                             // heap segment aligned
-    {
-        giet_exit("ERROR in malloc() : heap segment must be aligned\n");
-    }
+    giet_pthread_assert( (heap_size != 0) , 
+                         "error in heap_init() : heap not found"); 
+    giet_pthread_assert( (heap_size == (1<<heap_index)) ,
+                         "error in heap_init() : heap size must be power of 2");
+    giet_pthread_assert( (heap_base%heap_size == 0) ,
+                         "error in heap_init() : heap segment must be aligned\n");
 
     // compute size of block containin alloc[] array 
@@ -231 +225 @@
 
     // checking arguments
-    if (size == 0) 
-    {
-        giet_exit("\nERROR in remote_malloc() : requested size = 0 \n");
-    }
-    if ( x >= X_SIZE )
-    {
-        giet_exit("\nERROR in remote_malloc() : x coordinate too large\n");
-    }
-    if ( y >= Y_SIZE )
-    {
-        giet_exit("\nERROR in remote_malloc() : y coordinate too large\n");
-    }
-
-    // checking initialization
-    if ( heap[x][y].init != HEAP_INITIALIZED )
-    {
-        giet_exit("\nERROR in remote_malloc() : heap not initialized\n");
-    }
+    giet_pthread_assert( (size != 0) ,
+                         "error in remote_malloc() : requested size = 0 \n");
+    giet_pthread_assert( (x < X_SIZE) ,
+                         "error in remote_malloc() : x coordinate too large\n");
+    giet_pthread_assert( (y < Y_SIZE) ,
+                         "error in remote_malloc() : y coordinate too large\n");
+    giet_pthread_assert( (heap[x][y].init == HEAP_INITIALIZED) ,
+                         "error in remote_malloc() : heap not initialized\n");
 
     // normalize size
@@ -265 +249 @@
 
     // check block found
-    if ( base == 0 )
+    if (base == 0)
     {
         lock_release( &heap[x][y].lock );
-        giet_exit("\nERROR in remote_malloc() : no more space\n");
+        giet_pthread_assert( 0 , "error in remote_malloc() : no more space\n" );
     }
 
@@ -279 +263 @@
     {
         lock_release( &heap[x][y].lock );
-        giet_exit("\nERROR in remote_malloc() : block already allocated ???\n");
+        giet_pthread_assert( 0 , "error in remote_malloc() : block already allocated");
     }
 
@@ -390 +374 @@
     // check ptr value
     unsigned int base = (unsigned int)ptr;
-    if ( (base < heap[x][y].heap_base) || 
-         (base >= (heap[x][y].heap_base + heap[x][y].heap_size)) )
-    {
-        giet_exit("ERROR in free() : illegal pointer for released block");
-    }
+    giet_pthread_assert( (base >= heap[x][y].heap_base) && 
+                         (base < (heap[x][y].heap_base + heap[x][y].heap_size)) ,
+                         "error in free() : illegal pointer for released block" );
  
     // get the lock protecting heap[x][y]
@@ -410 +392 @@
     {
         lock_release( &heap[x][y].lock );
-        giet_exit("\nERROR in free() : released block not allocated ???\n");
+        giet_pthread_assert( 0 , "error in free() : released block not allocated");
     }
 
@@ -416 +398 @@
     if ( base % (1 << size_index) )
     {
-        giet_exit("\nERROR in free() : released block not aligned\n");
+        lock_release( &heap[x][y].lock );
+        giet_pthread_assert( 0 , "error in free() : released block not aligned");
     }