Changeset 492 for trunk/kernel/fs

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/fs

Files:

• devfs.c (modified) (4 diffs)
• fatfs.c (modified) (12 diffs)
• vfs.c (modified) (23 diffs)

trunk/kernel/fs/devfs.c

@@ -108 +108 @@
                                      devfs_dev_inode_xp ); 
 
-    assert( (error == 0) , __FUNCTION__ , "cannot create <dev>\n" );
+    assert( (error == 0) , "cannot create <dev>\n" );
 
 #if( DEBUG_DEVFS_INIT & 1 )
@@ -124 +124 @@
                                      devfs_external_inode_xp ); 
 
-    assert( (error == 0) , __FUNCTION__ , "cannot create <external>\n" );
+    assert( (error == 0) , "cannot create <external>\n" );
 
 #if DEBUG_DEVFS_INIT
@@ -372 +372 @@
                      uint32_t   size )
 {
-    assert( ( file_xp != XPTR_NULL ) , __FUNCTION__ , "file_xp == XPTR_NULL" );
-
-    assert( ( size < CONFIG_TXT_KBUF_SIZE ) , __FUNCTION__ , "string size too large" );
+    assert( ( file_xp != XPTR_NULL ) , "file_xp == XPTR_NULL" );
+
+    assert( ( size < CONFIG_TXT_KBUF_SIZE ) , "string size too large" );
 
     xptr_t             chdev_xp;
@@ -471 +471 @@
     else
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "%s does not support direct user access", chdev_func_str(func) );
 

trunk/kernel/fs/fatfs.c

@@ -259 +259 @@
     uint32_t   next_cluster_id;        // content of current FAT slot
 
-    assert( (searched_page_index > 0) , __FUNCTION__ , 
+    assert( (searched_page_index > 0) ,
     "no FAT access required for first page\n");
 
@@ -352 +352 @@
 #endif
 
-    assert( (fatfs_ctx != NULL) , __FUNCTION__ ,
+    assert( (fatfs_ctx != NULL) ,
     "cannot allocate memory for FATFS context\n" );
 
@@ -360 +360 @@
         buffer      = (uint8_t *)kmem_alloc( &req );
 
-    assert( (buffer != NULL) , __FUNCTION__ ,
+    assert( (buffer != NULL) ,
     "cannot allocate memory for 512 bytes buffer\n" );
      
@@ -367 +367 @@
     error = dev_ioc_sync_read( buffer , 0 , 1 );
 
-    assert( (error == 0) , __FUNCTION__ , 
+    assert( (error == 0) ,
     "cannot access boot record\n" );
 
@@ -393 +393 @@
     uint32_t sector_size = fatfs_get_record( BPB_BYTSPERSEC , buffer , 1 );
 
-    assert( (sector_size == 512) , __FUNCTION__ ,
+    assert( (sector_size == 512) ,
             "sector size must be 512 bytes\n" );
 
@@ -399 +399 @@
     uint32_t nb_sectors = fatfs_get_record( BPB_SECPERCLUS , buffer , 1 );
 
-    assert( (nb_sectors == 8) , __FUNCTION__ ,
+    assert( (nb_sectors == 8) ,
     "cluster size must be 8 sectors\n" );
 
@@ -405 +405 @@
     uint32_t nb_fats = fatfs_get_record( BPB_NUMFATS , buffer , 1 );
 
-    assert( (nb_fats == 1) , __FUNCTION__ ,
+    assert( (nb_fats == 1) ,
     "number of FAT copies must be 1\n" );
 
@@ -411 +411 @@
     uint32_t fat_sectors = fatfs_get_record( BPB_FAT32_FATSZ32 , buffer , 1 );
 
-    assert( ((fat_sectors & 0xF) == 0) , __FUNCTION__ ,
+    assert( ((fat_sectors & 0xF) == 0) ,
     "FAT not multiple of 16 sectors\n");
 
@@ -417 +417 @@
     uint32_t root_cluster = fatfs_get_record( BPB_FAT32_ROOTCLUS , buffer , 1 );
 
-    assert( (root_cluster == 2) , __FUNCTION__ ,
+    assert( (root_cluster == 2) ,
     "root cluster index must be  2\n");
 
@@ -431 +431 @@
     mapper_t * fat_mapper = mapper_create( FS_TYPE_FATFS );
 
-    assert( (fat_mapper != NULL) , __FUNCTION__ ,
+    assert( (fat_mapper != NULL) ,
     "no memory for FAT mapper" );
 
@@ -632 +632 @@
     mapper_t * mapper = parent_inode->mapper;
 
-    assert( (mapper != NULL) , __FUNCTION__ , "parent mapper undefined\n");
+    assert( (mapper != NULL) , "parent mapper undefined\n");
     
     char       cname[CONFIG_VFS_MAX_NAME_LENGTH];  // name extracter from each directory entry
@@ -659 +659 @@
         page = mapper_get_page( mapper , index );
 
-        assert( (page != NULL) , __FUNCTION__ , "bad parent mapper\n");
+        assert( (page != NULL) , "bad parent mapper\n");
 
         // get page base

trunk/kernel/fs/vfs.c

@@ -171 +171 @@
     {
         ctx = NULL;
-                assert( false , __FUNCTION__ , "illegal file system type = %d\n" , fs_type );
+                assert( false , "illegal file system type = %d\n" , fs_type );
     }
 
@@ -250 +250 @@
 error_t vfs_inode_destroy( vfs_inode_t * inode )
 {
-    assert( (inode->refcount == 0), __FUNCTION__ , "inode refcount non zero\n" );
+    assert( (inode->refcount == 0) , "inode refcount non zero\n" );
 
     // release memory allocated for mapper
@@ -280 +280 @@
     error_t error = 0;
 
-    assert( (parent != NULL) , __FUNCTION__ , "parent pointer is NULL\n");
-
-    assert( (child_xp != XPTR_NULL) , __FUNCTION__ , "child pointer is NULL\n");
+    assert( (parent != NULL) , "parent pointer is NULL\n");
+
+    assert( (child_xp != XPTR_NULL) , "child pointer is NULL\n");
 
     // get parent inode FS type
@@ -294 +294 @@
     else if( fs_type == FS_TYPE_RAMFS )
     {
-        assert( false , __FUNCTION__ , "should not be called for RAMFS\n" );
+        assert( false , "should not be called for RAMFS\n" );
     }
     else if( fs_type == FS_TYPE_DEVFS )
     {
-        assert( false , __FUNCTION__ , "should not be called for DEVFS\n" );
+        assert( false , "should not be called for DEVFS\n" );
     }
     else
     {
-        assert( false , __FUNCTION__ , "undefined file system type\n" );
+        assert( false , "undefined file system type\n" );
     }
 
@@ -581 +581 @@
     if( file->refcount )
     {
-        assert( false , __FUNCTION__ , "refcount non zero\n" );
+        assert( false , "refcount non zero\n" );
     }       
 
@@ -713 +713 @@
                    uint32_t size )
 {
-    assert( ( file_xp != XPTR_NULL ) , __FUNCTION__ , "file_xp == XPTR_NULL" );
+    assert( ( file_xp != XPTR_NULL ) , "file_xp == XPTR_NULL" );
 
     cxy_t              file_cxy;     // remote file descriptor cluster 
@@ -729 +729 @@
     inode_type = hal_remote_lw( XPTR( file_cxy , &file_ptr->type   ) );
    
-    assert( (inode_type == INODE_TYPE_FILE) , __FUNCTION__ ,
+    assert( (inode_type == INODE_TYPE_FILE) ,
     "inode type is not INODE_TYPE_FILE" );
 
@@ -768 +768 @@
                          uint32_t size )
 {
-    assert( ( file_xp != XPTR_NULL ) , __FUNCTION__ , "file_xp == XPTR_NULL" );
+    assert( ( file_xp != XPTR_NULL ) , "file_xp == XPTR_NULL" );
 
     cxy_t              file_cxy;     // remote file descriptor cluster 
@@ -835 +835 @@
     uint32_t       new;
 
-    assert( (file_xp != XPTR_NULL) , __FUNCTION__ , "file_xp == XPTR_NULL" );
+    assert( (file_xp != XPTR_NULL) , "file_xp == XPTR_NULL" );
 
     // get cluster and local pointer on remote file descriptor
@@ -899 +899 @@
     process_t  * process_ptr;      // process copy local pointer
 
-    assert( (file_xp != XPTR_NULL) , __FUNCTION__ , "file_xp == XPTR_NULL" );
-
-    assert( (file_id < CONFIG_PROCESS_FILE_MAX_NR) , __FUNCTION__ , "illegal file_id" );
+    assert( (file_xp != XPTR_NULL) , "file_xp == XPTR_NULL" );
+
+    assert( (file_id < CONFIG_PROCESS_FILE_MAX_NR) , "illegal file_id" );
 
     thread_t  * this    = CURRENT_THREAD;
@@ -996 +996 @@
                     char   * path )
 {
-    assert( false , __FUNCTION__ , "not implemented\n", cwd_xp, path );
+    assert( false , "not implemented cwd_xp %x, path <%s> \n",
+      cwd_xp, path );   
     return 0;
 } 
@@ -1004 +1005 @@
                   struct stat * k_stat )
 {
-    assert( false , __FUNCTION__ , "not implemented\n", file_xp, k_stat );
+    assert( false , "not implemented file_xp: %x, k_stat ptr %x\n",
+      file_xp, k_stat );
     return 0;
 }
@@ -1012 +1014 @@
                      struct dirent * k_dirent )
 {
-    assert( false , __FUNCTION__ , "not implemented\n", file_xp, k_dirent );
+    assert( false , "not implemented file_xp: %x, k_dirent ptr %x\n",
+      file_xp, k_dirent );
     return 0;
 }
@@ -1021 +1024 @@
                    uint32_t   mode )
 {
-    assert( false , __FUNCTION__ , "not implemented\n", file_xp, path, mode );
+    assert( false , "not implemented file_xp: %x, path <%s>, mode: %x\n",
+      file_xp, path, mode );
     return 0;
 }
@@ -1029 +1033 @@
                    char   * path )
 {
-    assert( false , __FUNCTION__ , "not implemented\n", file_xp, path );
+    assert( false , "not implemented file_xp: %x, path <%s>\n",
+      file_xp, path );
     return 0;
 }
@@ -1065 +1070 @@
     }
 
-    assert( false , __FUNCTION__ , "not implemented\n" );
+    assert( false , "not implemented\n" );
     return 0;
 }
@@ -1097 +1102 @@
 
     
-    assert( false , __FUNCTION__ , "not implemented\n" );
+    assert( false , "not implemented\n" );
     return 0;
 }
@@ -1106 +1111 @@
                     uint32_t rights )
 {
-    assert( false , __FUNCTION__ , "not implemented\n", cwd_xp, path, rights );
+    assert( false , "not implemented cwd_xp: %x, path <%s>, rights %x\n",
+      cwd_xp, path, rights );
     return 0;
 }
@@ -1168 +1174 @@
                                         "                              " };  // level 15
 
-    assert( (inode_xp != XPTR_NULL) , __FUNCTION__ , "inode_xp cannot be NULL\n" );
-    assert( (name_xp  != XPTR_NULL) , __FUNCTION__ , "name_xp cannot be NULL\n" );
-    assert( (indent < 16)           , __FUNCTION__ , "depth cannot be larger than 15\n" );
+    assert( (inode_xp != XPTR_NULL) , "inode_xp cannot be NULL\n" );
+    assert( (name_xp  != XPTR_NULL) , "name_xp cannot be NULL\n" );
+    assert( (indent < 16)           , "depth cannot be larger than 15\n" );
     
     // get inode cluster and local pointer
@@ -1944 +1950 @@
     error_t error = 0;
 
-    assert( (page != NULL) , __FUNCTION__ , "page pointer is NULL\n" );
+    assert( (page != NULL) , "page pointer is NULL\n" );
 
     mapper_t    * mapper = page->mapper;
 
-    assert( (mapper != NULL) , __FUNCTION__ , "no mapper for page\n" );
+    assert( (mapper != NULL) , "no mapper for page\n" );
 
 #if DEBUG_VFS_MAPPER_MOVE
@@ -1969 +1975 @@
     else if( fs_type == FS_TYPE_RAMFS )
     {
-        assert( false , __FUNCTION__ , "should not be called for RAMFS\n" );
+        assert( false , "should not be called for RAMFS\n" );
     }
     else if( fs_type == FS_TYPE_DEVFS )
     {
-        assert( false , __FUNCTION__ , "should not be called for DEVFS\n" );
+        assert( false , "should not be called for DEVFS\n" );
     }
     else
     {
-        assert( false , __FUNCTION__ , "undefined file system type\n" );
+        assert( false , "undefined file system type\n" );
     }
 
@@ -1994 +2000 @@
 error_t vfs_mapper_load_all( vfs_inode_t * inode )
 {
-    assert( (inode != NULL) , __FUNCTION__ , "inode pointer is NULL\n" );
+    assert( (inode != NULL) , "inode pointer is NULL\n" );
 
     uint32_t   index;
@@ -2002 +2008 @@
     uint32_t   size   = inode->size;
 
-    assert( (mapper != NULL) , __FUNCTION__ , "mapper pointer is NULL\n" );
+    assert( (mapper != NULL) , "mapper pointer is NULL\n" );
 
 #if DEBUG_VFS_MAPPER_LOAD