Changeset 610 for trunk/kernel/libk/htab.c

Timestamp:

Dec 27, 2018, 7:38:58 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in VFS to support the following
ksh commandis : cp, mv, rm, mkdir, cd, pwd

File:

• trunk/kernel/libk/htab.c (modified) (3 diffs)

trunk/kernel/libk/htab.c

@@ -34 +34 @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 //    Item type specific (static) functions (two functions for each item type).
-// Example below if for <vhs_inode_t>, where the identifier is the inum field. 
-///////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////////////////
-// These static functions compute the hash index from the key.
+// Example below if for <bloup_t> type, where the identifier is an uint32_t field. 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+typedef struct bloup_s
+{
+    uint32_t       key;
+    list_entry_t   list;
+}
+bloup_t;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// This static function computes the hash index from the key.
 ///////////////////////////////////////////////////////////////////////////////////////////
 // @ key      : local pointer on key.
 // @ return the index value, from 0 to (HASHTAB_SIZE - 1)
 ///////////////////////////////////////////////////////////////////////////////////////////
-static uint32_t htab_inode_index( void * key )
-{
-        uint32_t * inum = key;
-        return (((*inum) >> 16) ^ ((*inum) & 0xFFFF)) % HASHTAB_SIZE;
+static uint32_t htab_bloup_index( void * key )
+{
+        return (*(uint32_t *)key) % HASHTAB_SIZE;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-// These static functions are used by htab_lookup(), htab_insert(), and htab_remove().
+// This static function is used by htab_lookup(), htab_insert(), and htab_remove().
 // They scan one sub-list identified by  <index> to find an item  identified by <key>.
 // The sub-list is not modified, but the lock must have been taken by the caller.
@@ -59 +65 @@
 // @ return pointer on item if found / return NULL if not found.
 ///////////////////////////////////////////////////////////////////////////////////////
-static void * htab_inode_scan( htab_t  * htab,
+static void * htab_bloup_scan( htab_t  * htab,
                                uint32_t  index,
                                void    * key )
 {
     list_entry_t * list_entry;   // pointer on list_entry_t (iterator)
-    vfs_inode_t  * inode;        // pointer on item
+    bloup_t      * bloup;        // pointer on item
     
         LIST_FOREACH( &htab->roots[index] , list_entry )
         {
-        inode = (vfs_inode_t *)LIST_ELEMENT( list_entry , vfs_inode_t , list );
-        if( inode->inum == *(uint32_t *)key ) return inode; 
+        bloup = (bloup_t *)LIST_ELEMENT( list_entry , bloup_t , list );
+        if( bloup->key == *(uint32_t *)key ) return bloup; 
     }
 
@@ -91 +97 @@
     htab->items = 0;
 
-    if( type == HTAB_INODE_TYPE )
-    {
-        htab->scan    = &htab_inode_scan;
-        htab->index   = &htab_inode_index;
+    if( type == HTAB_BLOUP_TYPE )
+    {
+        htab->scan    = &htab_bloup_scan;
+        htab->index   = &htab_bloup_index;
     }
     else