Changeset 437 for trunk/kernel/fs

Timestamp:

Mar 28, 2018, 2:40:29 PM (7 years ago)

Author:

alain

Message:

Fix various bugs

Location:

trunk/kernel/fs

Files:

• devfs.c (modified) (2 diffs)
• vfs.c (modified) (8 diffs)
• vfs.h (modified) (1 diff)

trunk/kernel/fs/devfs.c

@@ -85 +85 @@
 }
 
-///////////////////////////////////////////////////
+/////////////////////////////////////////////////
 void devfs_global_init( xptr_t   parent_inode_xp,
                         xptr_t * devfs_dev_inode_xp,
@@ -109 +109 @@
 
     assert( (error == 0) , __FUNCTION__ , "cannot create <dev>\n" );
+
+#if( CONFIG_DEBUG_DEVFS_INIT & 1 )
+if( CONFIG_DEBUG_DEVFS_INIT < cycle )
+printk("\n[DBG] %s : created <dev> inode at cycle %d\n", __FUNCTION__, cycle );
+#endif
 
     // create DEVFS "external" inode in cluster IO

trunk/kernel/fs/vfs.c

@@ -3 +3 @@
  *
  * Author  Mohamed Lamine Karaoui (2015)
- *         Alain Greiner (2016,2017)
+ *         Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -455 +455 @@
     if( length >= CONFIG_VFS_MAX_NAME_LENGTH )
     {
-        printk("\n[ERROR] in %s : name too long\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : name <name> too long\n", __FUNCTION__ , name );
+#endif
         return EINVAL;
     }
@@ -467 +470 @@
     if( dentry == NULL )
     {
-        printk("\n[ERROR] in %s : cannot allocate dentry descriptor\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : cannot allocate dentry\n", __FUNCTION__ );
+#endif
         return ENOMEM;
     }
@@ -478 +484 @@
     strcpy( dentry->name , name );
 
+#if( CONFIG_DEBUG_VFS_DENTRY_CREATE & 1 )
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_VFS_DENTRY_CREATE < cycle )
+printk("\n[DBG] %s : dentry initialised\n", __FUNCTION__ );
+#endif
+
     // register dentry in hash table rooted in parent inode
     xhtab_insert( XPTR( local_cxy , &parent->children ),
                   name, 
                   XPTR( local_cxy , &dentry->list ) );
+
+#if( CONFIG_DEBUG_VFS_DENTRY_CREATE & 1 )
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_VFS_DENTRY_CREATE < cycle )
+printk("\n[DBG] %s : dentry registerd in htab\n", __FUNCTION__ );
+#endif
 
     // return extended pointer on dentry 
@@ -1637 +1655 @@
 
 #if (CONFIG_DEBUG_VFS_ADD_CHILD & 1)
-if( CONFIG_DEBUG_VFS_ADD_CHILD < cycle )
+if( (CONFIG_DEBUG_VFS_ADD_CHILD < cycle) && (error == 0) )
 printk("\n[DBG] %s : dentry <%s> created in cluster %x\n", __FUNCTION__, name, local_cxy );
 #endif
@@ -1652 +1670 @@
 
 #if (CONFIG_DEBUG_VFS_ADD_CHILD & 1)
-if( CONFIG_DEBUG_VFS_ADD_CHILD < cycle )
+if( (CONFIG_DEBUG_VFS_ADD_CHILD < cycle) && (error == 0) )
 printk("\n[DBG] %s : dentry <%s> created in cluster %x\n", __FUNCTION__, name, parent_cxy );
 #endif
@@ -1660 +1678 @@
     if( error )
     {
-        printk("\n[ERROR] in %s : cannot create dentry in cluster %x\n",
-        __FUNCTION__ , parent_cxy );
+        printk("\n[ERROR] in %s : cannot create dentry <%s> in cluster %x\n",
+        __FUNCTION__ , name , parent_cxy );
         return ENOMEM;
     }
@@ -1688 +1706 @@
 __FUNCTION__ , GET_PTR(inode_xp) , local_cxy );
 #endif
-
-vfs_dmsg("\n[DBG] %s : inode %x created in local cluster %x\n",
-__FUNCTION__ , GET_PTR(inode_xp) , local_cxy );
 
     }

trunk/kernel/fs/vfs.h

@@ -3 +3 @@
  *
  * Author  Mohamed Lamine Karaoui (2014,2015)
- *         Alain Greiner (2016,2017)
+ *         Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites