Changeset 573 for trunk/libs/libalmosmkh/almosmkh.c

Timestamp:

Oct 5, 2018, 12:21:52 AM (6 years ago)

Author:

alain

Message:

Cosmetic.

File:

• trunk/libs/libalmosmkh/almosmkh.c (modified) (11 diffs)

trunk/libs/libalmosmkh/almosmkh.c

@@ -32 +32 @@
 #include <mman.h>
 
+#define  MALLOC_DEBUG    0
+ 
 /////////////     Non standard system calls    /////////////////////////////////
 
@@ -216 +218 @@
 } 
 
-/////////////////
+///////////////////////
 int display_vfs( void )
 {
@@ -231 +233 @@
 } 
 
-//////////////////////////////////
+///////////////////////////////
 int trace( unsigned int active,
            unsigned int cxy, 
@@ -242 +244 @@
 }
 
-//////////////////
+////////////////////////
 int display_dqdt( void )
 {
@@ -249 +251 @@
 } 
 
-///////////
+/////////////////
 void idbg( void )
 {
@@ -327 +329 @@
 ///////////////    non standard malloc functions    //////////////////////////
 
-#define  MALLOC_DEBUG  0
- 
 /////////////////////////////////////////////////////////////////////////////////////////
 // Global variable defining the allocator array (one per cluster)
@@ -377 +377 @@
 ////////////////////////////////////////////////////////////////////////////////////////////
 
-#if 0
+#if MALLOC_DEBUG
 static void display_free_array( unsigned int cxy )
 {
@@ -487 +487 @@
     }
 
-    // DEPRECATED: we don't reset the alloc_size array 
+    // DEPRECATED: we don't reset the alloc_base array 
     // because we don't want to allocate the physical memory
     // when the heap is created  [AG]
@@ -591 +591 @@
                       unsigned int cxy )
 {
+    int error;
 
 #if MALLOC_DEBUG
@@ -631 +632 @@
 
     // take the lock protecting access to store[cxy]
-    pthread_mutex_lock( &store[cxy].mutex );
+    error = pthread_mutex_lock( &store[cxy].mutex );
+
+    if( error )
+    {
+        printf("\n[ERROR] in %s : cannot take the lock protecting store in cluster %x\n",
+        __FUNCTION__ , cxy );
+        return NULL;
+    }
 
     // call the recursive function get_block
@@ -651 +659 @@
     unsigned char * ptr    = (unsigned char*)(store[cxy].alloc_base + offset);
 
-    // DEPRECATED : we don't check the alloc[] array,
-    // because it has not been initialised, to avoid 
-    // physical memory allocation at heap creation [AG]
+    // DEPRECATED : we cannot check the alloc[] array,
+    // because it has not been initialised by store_init,
+    // to avoid physical memory allocation at heap creation [AG]
     // if ( *ptr != 0 )
     // {