Changeset 492 for trunk/kernel/mm

Timestamp:

Aug 22, 2018, 11:55:48 PM (6 years ago)

Author:

viala@…

Message:

Refactoring assert calling to conform with new assert macro.

Made with this command for the general case.
find ./kernel/ hal/ -name "*.c" | xargs sed -i -e '/assert(/ s/,[ ]*FUNCTION[ ]*,/,/'

And some done by hand.

Location:

trunk/kernel/mm

Files:

• kcm.c (modified) (4 diffs)
• khm.c (modified) (2 diffs)
• kmem.c (modified) (3 diffs)
• ppm.c (modified) (2 diffs)
• vmm.c (modified) (10 diffs)
• vseg.c (modified) (2 diffs)

trunk/kernel/mm/kcm.c

@@ -56 +56 @@
 #endif
 
-        assert( kcm_page->active , __FUNCTION__ , "kcm_page should be active" );
+        assert( kcm_page->active , "kcm_page should be active" );
 
         // get first block available
         int32_t index = bitmap_ffs( kcm_page->bitmap , kcm->blocks_nr );
 
-        assert( (index != -1) , __FUNCTION__ , "kcm_page should not be full" );
+        assert( (index != -1) , "kcm_page should not be full" );
 
         // allocate block
@@ -113 +113 @@
         index = ((uint8_t *)ptr - (uint8_t *)kcm_page - CONFIG_KCM_SLOT_SIZE) / kcm->block_size;
 
-        assert( !bitmap_state( kcm_page->bitmap , index ) , __FUNCTION__ , "page already freed" );
-        assert( (kcm_page->count > 0) , __FUNCTION__ , "count already zero" );
+        assert( !bitmap_state( kcm_page->bitmap , index ) , "page already freed" );
+        assert( (kcm_page->count > 0) , "count already zero" );
 
         bitmap_set( kcm_page->bitmap , index );
@@ -216 +216 @@
         // the kcm_page descriptor mut fit in the KCM slot
         assert( (sizeof(kcm_page_t) <= CONFIG_KCM_SLOT_SIZE) ,
-                 __FUNCTION__ , "KCM slot too small\n" );
+                "KCM slot too small\n" );
 
         // initialize lock
@@ -329 +329 @@
         kcm_t      * kcm;
 
-        assert( (ptr != NULL) , __FUNCTION__ , "pointer cannot be NULL" );
+        assert( (ptr != NULL) , "pointer cannot be NULL" );
 
         kcm_page = (kcm_page_t *)((intptr_t)ptr & ~CONFIG_PPM_PAGE_MASK);

trunk/kernel/mm/khm.c

@@ -40 +40 @@
 {
         // check config parameters
-        assert( ((CONFIG_PPM_PAGE_SHIFT + CONFIG_PPM_HEAP_ORDER) < 32 ) , __FUNCTION__ ,
+        assert( ((CONFIG_PPM_PAGE_SHIFT + CONFIG_PPM_HEAP_ORDER) < 32 ) ,
                  "CONFIG_PPM_HEAP_ORDER too large" );
 
@@ -142 +142 @@
         spinlock_lock(&khm->lock);
 
-        assert( (current->busy == 1) , __FUNCTION__ , "page already freed" );
+        assert( (current->busy == 1) , "page already freed" );
 
         // release block

trunk/kernel/mm/kmem.c

@@ -143 +143 @@
         kcm_t    * kcm;
 
-        assert( ((type > 1) && (type < KMEM_TYPES_NR) ) , __FUNCTION__ , "illegal KCM type" );
+        assert( ((type > 1) && (type < KMEM_TYPES_NR) ) , "illegal KCM type" );
 
 #if DEBUG_KMEM
@@ -198 +198 @@
         flags = req->flags;
 
-        assert( (type < KMEM_TYPES_NR) , __FUNCTION__ , "illegal KMEM request type" );
+        assert( (type < KMEM_TYPES_NR) , "illegal KMEM request type" );
 
 #if DEBUG_KMEM
@@ -293 +293 @@
         if( req->type >= KMEM_TYPES_NR )
         {
-                assert( false , __FUNCTION__ , "illegal request type\n" );
+                assert( false , "illegal request type\n" );
         }
 

trunk/kernel/mm/ppm.c

@@ -152 +152 @@
         page_t   * pages_tbl   = ppm->pages_tbl;
 
-        assert( !page_is_flag( page , PG_FREE ) , __FUNCTION__ , 
+        assert( !page_is_flag( page , PG_FREE ) ,
     "page already released : ppn = %x\n" , ppm_page2ppn(XPTR(local_cxy,page)) );
 
-        assert( !page_is_flag( page , PG_RESERVED ) , __FUNCTION__ , 
+        assert( !page_is_flag( page , PG_RESERVED ) ,
     "reserved page : ppn = %x\n" , ppm_page2ppn(XPTR(local_cxy,page)) );
 
@@ -215 +215 @@
         ppm_t    * ppm = &LOCAL_CLUSTER->ppm;
 
-        assert( (order < CONFIG_PPM_MAX_ORDER) , __FUNCTION__ ,
+        assert( (order < CONFIG_PPM_MAX_ORDER) ,
     "illegal order argument = %x\n" , order );
 

trunk/kernel/mm/vmm.c

@@ -79 +79 @@
 
     assert( ((CONFIG_VMM_KENTRY_SIZE + CONFIG_VMM_ARGS_SIZE + CONFIG_VMM_ENVS_SIZE) 
-            <= CONFIG_VMM_ELF_BASE) , __FUNCTION__ , "UTILS zone too small\n" );
-
-    assert( (CONFIG_THREAD_MAX_PER_CLUSTER <= 32) , __FUNCTION__ ,
+            <= CONFIG_VMM_ELF_BASE) , "UTILS zone too small\n" );
+
+    assert( (CONFIG_THREAD_MAX_PER_CLUSTER <= 32) ,
             "no more than 32 threads per cluster for a single process\n");
 
     assert( ((CONFIG_VMM_STACK_SIZE * CONFIG_THREAD_MAX_PER_CLUSTER) <=
-             (CONFIG_VMM_VSPACE_SIZE - CONFIG_VMM_STACK_BASE)) , __FUNCTION__ ,
+             (CONFIG_VMM_VSPACE_SIZE - CONFIG_VMM_STACK_BASE)) ,
              "STACK zone too small\n");
 
@@ -274 +274 @@
 
     // check cluster is reference
-    assert( (GET_CXY( process->ref_xp ) == local_cxy) , __FUNCTION__,
+    assert( (GET_CXY( process->ref_xp ) == local_cxy) ,
     "not called in reference cluster\n");
 
@@ -346 +346 @@
 
     // check cluster is reference
-    assert( (GET_CXY( process->ref_xp ) == local_cxy) , __FUNCTION__,
+    assert( (GET_CXY( process->ref_xp ) == local_cxy) ,
     "local cluster is not process reference cluster\n");
 
@@ -386 +386 @@
             vseg     = GET_PTR( vseg_xp );
 
-            assert( (GET_CXY( vseg_xp ) == local_cxy) , __FUNCTION__,
+            assert( (GET_CXY( vseg_xp ) == local_cxy) ,
             "all vsegs in reference VSL must be local\n" );
 
@@ -1112 +1112 @@
 
             // check small page
-            assert( (attr & GPT_SMALL) , __FUNCTION__ ,
+            assert( (attr & GPT_SMALL) ,
             "an user vseg must use small pages" );
 
@@ -1380 +1380 @@
     uint32_t     flags = vseg->flags;
 
-    assert( ( type != VSEG_TYPE_FILE ) , __FUNCTION__ , "illegal vseg type\n" );
+    assert( ( type != VSEG_TYPE_FILE ) , "illegal vseg type\n" );
 
     if( flags & VSEG_DISTRIB )    // distributed => cxy depends on vpn LSB
@@ -1448 +1448 @@
         xptr_t mapper_xp = vseg->mapper_xp;
 
-        assert( (mapper_xp != XPTR_NULL), __FUNCTION__,
+        assert( (mapper_xp != XPTR_NULL),
         "mapper not defined for a FILE vseg\n" );
         
@@ -1486 +1486 @@
             xptr_t     mapper_xp = vseg->mapper_xp;
 
-            assert( (mapper_xp != XPTR_NULL), __FUNCTION__,
+            assert( (mapper_xp != XPTR_NULL),
             "mapper not defined for a CODE or DATA vseg\n" );
         
@@ -1655 +1655 @@
 
     // vseg has been checked by the vmm_handle_page_fault() function
-    assert( (vseg != NULL) , __FUNCTION__,
-    "vseg undefined / vpn %x / thread %x in process %x / core[%x,%d] / cycle %d\n", 
-    vpn, this->trdid, process->pid, local_cxy, this->core->lid,
-    (uint32_t)hal_get_cycles() );
+    assert( (vseg != NULL) , "vseg undefined / vpn %x\n");
 
     if( cow )  //////////////// copy_on_write request //////////////////////
@@ -1669 +1666 @@
         hal_gpt_get_pte( &vmm->gpt , vpn , &old_attr , &old_ppn );
 
-        assert( (old_attr & GPT_MAPPED), __FUNCTION__,
-        "PTE unmapped for a COW exception / vpn %x / thread %x in process %x / cycle %d\n",
-        vpn, this, process->pid, (uint32_t)hal_get_cycles() );
+        assert( (old_attr & GPT_MAPPED),
+          "PTE unmapped for a COW exception / vpn %x\n" );
 
 #if( DEBUG_VMM_GET_PTE & 1 )

trunk/kernel/mm/vseg.c

@@ -145 +145 @@
     else
     {
-            assert( false , __FUNCTION__ , "illegal vseg type\n" );
+            assert( false , "illegal vseg type\n" );
     }
 
@@ -191 +191 @@
         default: 
         {
-            assert( false, __FUNCTION__, "Illegal vseg type" );
+            assert( false, "Illegal vseg type" );
             break;
         }