Changeset 657 for trunk/kernel/libk/xhtab.c

Timestamp:

Mar 18, 2020, 11:16:59 PM (5 years ago)

Author:

alain

Message:

Introduce remote_buf.c/.h & socket.c/.h files.
Update dev_nic.c/.h files.

File:

• trunk/kernel/libk/xhtab.c (modified) (10 diffs)

trunk/kernel/libk/xhtab.c

@@ -53 +53 @@
 
         return (name[0] % XHASHTAB_SIZE);
-/*
-    uint32_t   index = 0;
-        while( *name )
-    {
-        index = index + (*(name++) ^ index);
-    }
-        return index % XHASHTAB_SIZE;
-*/
-
 } 
 
@@ -128 +119 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////
-void xhtab_init( xhtab_t          * xhtab,
+/////////////////////////////////////////////
+void xhtab_init( xptr_t             xhtab_xp,
                  xhtab_item_type_t  type )
 {
-        uint32_t i;
+    uint32_t i;
+
+    // get cluster and local pointer
+    xhtab_t * ptr = GET_PTR( xhtab_xp );
+    cxy_t     cxy = GET_CXY( xhtab_xp );
 
     // initialize lock
-    remote_busylock_init( XPTR( local_cxy , &xhtab->lock), LOCK_XHTAB_STATE );
-
-    xhtab->items            = 0;
-    xhtab->current_index    = 0;
-    xhtab->current_xlist_xp = XPTR_NULL;
-
+    remote_busylock_init( XPTR( cxy , &ptr->lock), LOCK_XHTAB_STATE );
+
+    // initialise various fiels
+    hal_remote_s32( XPTR( cxy , &ptr->items ) , 0 );
+    hal_remote_s32( XPTR( cxy , &ptr->current_index ) , 0 );
+    hal_remote_s64( XPTR( cxy , &ptr->current_xlist_xp ) , XPTR_NULL );
+   
+    // initialize functions pointers
     if( type == XHTAB_DENTRY_TYPE )
     {
-        xhtab->item_match_key  = &xhtab_dentry_item_match_key;
-        xhtab->index_from_key  = &xhtab_dentry_index_from_key;
-        xhtab->item_from_xlist = &xhtab_dentry_item_from_xlist;
-        xhtab->item_print_key  = &xhtab_dentry_item_print_key;
+        hal_remote_spt( XPTR( cxy , &ptr->item_match_key  ) , &xhtab_dentry_item_match_key );
+        hal_remote_spt( XPTR( cxy , &ptr->index_from_key  ) , &xhtab_dentry_index_from_key );
+        hal_remote_spt( XPTR( cxy , &ptr->item_from_xlist ) , &xhtab_dentry_item_from_xlist );
+        hal_remote_spt( XPTR( cxy , &ptr->item_print_key  ) , &xhtab_dentry_item_print_key );
     }
     else
@@ -153 +150 @@
     }
 
+    // initialize all lists
+    for( i=0 ; i < XHASHTAB_SIZE ; i++ )
+    {
+        xlist_root_init( XPTR( cxy , &ptr->roots[i] ) );
+    }
+ 
 #if DEBUG_XHTAB
 printk("\n[%s] for xhtab (%x,%x)\n"
-" - index_from_key  = %x (@ %x)\n"
-" - item_match_key  = %x (@ %x)\n"
-" - item_from_xlist = %x (@ %x)\n",
-__FUNCTION__, local_cxy, xhtab,
-xhtab->index_from_key , &xhtab->index_from_key,
-xhtab->item_match_key , &xhtab->item_match_key,
-xhtab->item_from_xlist, &xhtab->item_from_xlist );
-#endif
-
-        for( i=0 ; i < XHASHTAB_SIZE ; i++ )
-    {
-                xlist_root_init( XPTR( local_cxy , &xhtab->roots[i] ) );
-
-#if (DEBUG_XHTAB & 1)
-printk("\n - initialize root[%d] / %x\n", i , &xhtab->roots[i] ); 
-#endif
-
-    }  
+" - index_from_key  = %x\n"
+" - item_match_key  = %x\n"
+" - item_from_xlist = %x\n",
+__FUNCTION__, cxy, ptr,
+hal_remote_lpt( XPTR( cxy , &ptr->index_from_key ) ),
+hal_remote_lpt( XPTR( cxy , &ptr->item_match_key ) ), 
+hal_remote_lpt( XPTR( cxy , &ptr->item_from_xlist ) ) ); 
+#endif
 
 }  // end xhtab_init()
@@ -200 +193 @@
     xhtab_ptr = GET_PTR( xhtab_xp );
 
+#if DEBUG_XHTAB
+printk("\n[%s] enter : index = %d / key = %s\n", __FUNCTION__ , index , key );
+#endif
+
     // get pointer on "item_from_xlist" function
     item_from_xlist = (item_from_xlist_t *)hal_remote_lpt( XPTR( xhtab_cxy , 
@@ -206 +203 @@
     item_match_key = (item_match_key_t *)hal_remote_lpt( XPTR( xhtab_cxy , 
                                                          &xhtab_ptr->item_match_key ) );
-
     // scan sub-list[index]
     XLIST_FOREACH( XPTR( xhtab_cxy , &xhtab_ptr->roots[index] ) , xlist_xp )
@@ -216 +212 @@
         if( item_match_key( item_xp , key ) ) return item_xp;
     }
+
+#if DEBUG_XHTAB
+printk("\n[%s] exit\n", __FUNCTION__ );
+#endif
+
 
     // No matching item found
@@ -248 +249 @@
     index_from_key = (index_from_key_t *)hal_remote_lpt( XPTR( xhtab_cxy , 
                                                          &xhtab_ptr->index_from_key ) );
-#if DEBUG_XHTAB
-printk("\n[%s] remote = %x / direct = %x / @ = %x\n",
-__FUNCTION__, index_from_key, xhtab_ptr->index_from_key, &xhtab_ptr->index_from_key );
-#endif
-
     // compute index from key
         index = index_from_key( key );
-
-#if DEBUG_XHTAB
-printk("\n[%s] index = %x\n", __FUNCTION__, index );
-#endif
 
     // take the lock protecting hash table
@@ -285 +277 @@
     
 #if DEBUG_XHTAB
-printk("\n[%s] success / <%s>\n", __FUNCTION__, key );
+printk("\n[%s] success for <%s>\n", __FUNCTION__, key );
 #endif
 
@@ -362 +354 @@
     
 #if DEBUG_XHTAB
-printk("\n[%s] enter / %s\n", __FUNCTION__, key );
+printk("\n[%s] enter\n", __FUNCTION__ );
 #endif
 
@@ -368 +360 @@
     remote_busylock_acquire( XPTR( xhtab_cxy , &xhtab_ptr->lock ) );
     
-#if DEBUG_XHTAB
-printk("\n[%s] after lock acquire / %s\n", __FUNCTION__, key );
-#endif
-
     // scan sub-list
     item_xp = xhtab_scan( xhtab_xp , index , key );
 
-#if DEBUG_XHTAB
-printk("\n[%s] after xhtab scan / %s\n", __FUNCTION__, key );
-#endif
-
     // release the lock protecting hash table
     remote_busylock_release( XPTR( xhtab_cxy , &xhtab_ptr->lock ) );
 
 #if DEBUG_XHTAB
-printk("\n[%s] after lock release / %s\n", __FUNCTION__, key );
+printk("\n[%s] exit\n", __FUNCTION__ );
 #endif