Changeset 180 for trunk/kernel/mm/kmem.c

Timestamp:

Jul 11, 2017, 1:09:51 PM (7 years ago)

Author:

max@…

Message:

don't memset ptr if it's null...

File:

• trunk/kernel/mm/kmem.c (modified) (6 diffs)

trunk/kernel/mm/kmem.c

@@ -154 +154 @@
         cluster_t * cluster = LOCAL_CLUSTER;
 
-        // allocates memory for the requested KCM allocator
+        // allocate memory for the requested KCM allocator
         // from the KCM allocator embedded in cluster descriptor
         kcm = kcm_alloc( &cluster->kcm );
@@ -165 +165 @@
         }
 
-        // initializes the new KCM allocator
+        // initialize the new KCM allocator
         kcm_init( kcm , type );
 
@@ -200 +200 @@
 
         // analyse request type
-        if( type ==  KMEM_PAGE )                       // PPM allocator
+        if( type == KMEM_PAGE )                        // PPM allocator
         {
                 // allocate the number of requested pages
                 ptr = (void *)ppm_alloc_pages( size );
+                if( ptr == NULL )
+                {
+                        printk("\n[ERROR] in %s : failed for type %d / size %d in cluster %x\n",
+                            __FUNCTION__ , type , size , local_cxy );
+                        return NULL;
+                }
 
                 // reset page if requested
@@ -216 +222 @@
                 // allocate memory from KHM
                 ptr = khm_alloc( &cluster->khm , size );
+                if( ptr == NULL )
+                {
+                        printk("\n[ERROR] in %s : failed for type %d / size %d in cluster %x\n",
+                            __FUNCTION__ , type , size , local_cxy );
+                        return NULL;
+                }
 
                 // reset memory if requested
@@ -237 +249 @@
                 // allocate memory from KCM
                 ptr = kcm_alloc( cluster->kcm_tbl[type] );
+                if( ptr == NULL )
+                {
+                        printk("\n[ERROR] in %s : failed for type %d / size %d in cluster %x\n",
+                            __FUNCTION__ , type , size , local_cxy );
+                        return NULL;
+                }
 
                 // reset memory if requested
@@ -246 +264 @@
         }
 
-        if( ptr == NULL )
-        {
-                printk("\n[ERROR] in %s : failed for type %d / size %d in cluster %x\n",
-                   __FUNCTION__ , type , size , local_cxy );
-
-                return NULL;
-        }
-
         return ptr;
 }