Changeset 610 for trunk/kernel/libk/xlist.h

Timestamp:

Dec 27, 2018, 7:38:58 PM (5 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/xlist.h (modified) (7 diffs)

trunk/kernel/libk/xlist.h

@@ -5 +5 @@
  * xlist.h - Double Circular Linked lists, using extended pointers.
  *
- * Author : Alain Greiner (2016)
+ * Author : Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -31 +31 @@
 #include <hal_kernel_types.h>
 #include <hal_remote.h>
+#include <printk.h>
 
 /**** global variables ***/
@@ -190 +191 @@
  * double linked list. Four extended pointers must be modified.
  * The lock protecting the list should have been previously taken.
- * @ root   : extended pointer on the root xlist_entry_t
- * @ entry  : extended pointer on the xlist_entry_t to be inserted
- **************************************************************************/
-static inline void xlist_add_first( xptr_t root, 
-                                    xptr_t entry )
+ * @ root_xp   : extended pointer on the root xlist_entry_t
+ * @ entry_xp  : extended pointer on the xlist_entry_t to be inserted
+ **************************************************************************/
+static inline void xlist_add_first( xptr_t root_xp, 
+                                    xptr_t entry_xp )
 {
     // get the extended pointer on the first element in list
-    xptr_t first = (xptr_t)hal_remote_l64( root );
-
-    // update root.next <= entry
-    hal_remote_s64( root , (uint64_t)entry );
-
-    // update entry.next <= first
-    hal_remote_s64( entry , (uint64_t)first );
-
-    // entry.pred <= root 
-    hal_remote_s64( entry + sizeof(xptr_t) , (uint64_t)root );
+    xptr_t first_xp = hal_remote_l64( root_xp );
+
+    // update root_xp->next <= entry_xp
+    hal_remote_s64( root_xp , entry_xp );
+
+    // update entry_xp->next <= first_xp
+    hal_remote_s64( entry_xp , first_xp );
+
+    // update entry_xp->pred <= root_xp 
+    hal_remote_s64( entry_xp + sizeof(xptr_t) , root_xp );
     
-    // first.pred <= new
-    hal_remote_s64( first + sizeof(xptr_t) , (uint64_t)entry );
+    // update first_xp->pred <= entry_xp
+    hal_remote_s64( first_xp + sizeof(xptr_t) , entry_xp );
 }
 
@@ -216 +217 @@
  * double linked list.  Four extended pointers must be modified.
  * The lock protecting the list should have been previously taken.
- * @ root   : extended pointer on the root xlist_entry_t
- * @ entry  : extended pointer on the xlist_entry_t to be inserted
- **************************************************************************/
-static inline void xlist_add_last( xptr_t root, 
-                                   xptr_t entry )
+ * @ root_xp   : extended pointer on the root xlist_entry_t
+ * @ entry_xp  : extended pointer on the xlist_entry_t to be inserted
+ **************************************************************************/
+static inline void xlist_add_last( xptr_t root_xp, 
+                                   xptr_t entry_xp )
 {
     // get the extended pointer on the last element in list
-    xptr_t last = (xptr_t)hal_remote_l64( root + sizeof(xptr_t) );
-
-    // update root.pred <= entry
-    hal_remote_s64( root + sizeof(xptr_t) , (uint64_t)entry );
-
-    // update entry.pred <= last
-    hal_remote_s64( entry + sizeof(xptr_t) , (uint64_t)last );
-
-    // entry.next <= root 
-    hal_remote_s64( entry , (uint64_t)root );
+    xptr_t last_xp = hal_remote_l64( root_xp + sizeof(xptr_t) );
+
+    // update root_xp->pred <= entry_xp
+    hal_remote_s64( root_xp + sizeof(xptr_t) , entry_xp );
+
+    // update entry_xp->pred <= last_xp
+    hal_remote_s64( entry_xp + sizeof(xptr_t) , last_xp );
+
+    // update entry_xp->next <= root_xp
+    hal_remote_s64( entry_xp , root_xp );
     
-    // last.next <= entry
-    hal_remote_s64( last , (uint64_t)entry );
+    // update last_xp->next <= entry_xp
+    hal_remote_s64( last_xp , entry_xp );
 }
 
@@ -241 +242 @@
 /***************************************************************************
  * This function returns true if the list is empty.
- * @ root  : extended pointer on the root xlist_entry_t
- **************************************************************************/
-static inline bool_t xlist_is_empty( xptr_t root )
+ * @ root_xp  : extended pointer on the root xlist_entry_t.
+ **************************************************************************/
+static inline bool_t xlist_is_empty( xptr_t root_xp )
 {
     // get the extended pointer root.next value
-    xptr_t next = (xptr_t)hal_remote_l64( root );
-
-    return ( root == next );
+    xptr_t next = (xptr_t)hal_remote_l64( root_xp );
+
+    return ( root_xp == next );
 } 
 
@@ -279 +280 @@
  * Four extended pointers must be modified.
  * The memory allocated to the removed entry is not released.
- * @old      : extended pointer on the xlist_entry_t to be removed.
- * @new      : extended pointer on the xlist_entry_t to be inserted.
+ * @ old      : extended pointer on the xlist_entry_t to be removed.
+ * @ new      : extended pointer on the xlist_entry_t to be inserted.
  **************************************************************************/
 static inline void xlist_replace( xptr_t old,
@@ -307 +308 @@
 }
 
+/***************************************************************************
+ * This debug function displays all entries of an xlist.
+ * @ root_xp : extended pointer on the root xlist_entry_t.
+ * @ string  : list identifier displayed in header.
+ * @ max     : max number of éléments to display.
+ **************************************************************************/
+static inline void xlist_display( xptr_t  root_xp,
+                                  char  * string,
+                                  uint32_t max )
+{
+    cxy_t           root_cxy;
+    xlist_entry_t * root_ptr;
+
+    xptr_t          iter_xp;
+    cxy_t           iter_cxy;
+    xlist_entry_t * iter_ptr;
+
+    xptr_t          next_xp;
+    cxy_t           next_cxy;
+    xlist_entry_t * next_ptr;
+
+    xptr_t          pred_xp;
+    cxy_t           pred_cxy;
+    xlist_entry_t * pred_ptr;
+
+    uint32_t        index;
+
+    root_cxy = GET_CXY( root_xp );
+    root_ptr = GET_PTR( root_xp );
+
+    next_xp  = hal_remote_l64( XPTR( root_cxy , &root_ptr->next ) );
+    next_cxy = GET_CXY( next_xp );
+    next_ptr = GET_PTR( next_xp );
+
+    pred_xp  = hal_remote_l64( XPTR( root_cxy , &root_ptr->pred ) );
+    pred_cxy = GET_CXY( pred_xp );
+    pred_ptr = GET_PTR( pred_xp );
+
+    printk("\n***** root (%x,%x) / next (%x,%x) / pred (%x,%x) / %s *****\n",
+    root_cxy, root_ptr, next_cxy, next_ptr, pred_cxy, pred_ptr, string );
+
+    if( xlist_is_empty( root_xp ) == false )
+    {
+        for( iter_xp = hal_remote_l64( XPTR( root_cxy , &root_ptr->next) ) , index = 0 ;
+             (iter_xp != root_xp) && (index < max) ;
+             iter_xp = next_xp , index++ )
+        {
+            iter_cxy = GET_CXY( iter_xp );
+            iter_ptr = GET_PTR( iter_xp );
+
+            next_xp  = hal_remote_l64( XPTR( iter_cxy , &iter_ptr->next ) );
+            next_cxy = GET_CXY( next_xp );
+            next_ptr = GET_PTR( next_xp );
+
+            pred_xp  = hal_remote_l64( XPTR( iter_cxy , &iter_ptr->pred ) );
+            pred_cxy = GET_CXY( pred_xp );
+            pred_ptr = GET_PTR( pred_xp );
+
+            printk(" - %d : iter (%x,%x) / next (%x,%x) / pred (%x,%x)\n",
+            index, iter_cxy, iter_ptr, next_cxy, next_ptr, pred_cxy, pred_ptr );
+        }
+    }
+}  // end xlist_display()
+
 #endif  /* _XLIST_H_ */