Changeset 603 for trunk/kernel/libk/grdxt.c

Timestamp:

Dec 3, 2018, 12:17:35 PM (6 years ago)

Author:

alain

Message:

Improve the FAT32 file system to support cat, rm, cp commands.

File:

• trunk/kernel/libk/grdxt.c (modified) (14 diffs)

trunk/kernel/libk/grdxt.c

@@ -24 +24 @@
 #include <hal_kernel_types.h>
 #include <hal_special.h>
+#include <hal_remote.h>
 #include <errno.h>
 #include <printk.h>
-#include <vseg.h>
 #include <kmem.h>
 #include <grdxt.h>
@@ -53 +53 @@
 
         return 0;
-}
+
+}  // end grdxt_init()
 
 //////////////////////////////////
@@ -70 +71 @@
         uint32_t   ix1;
         uint32_t   ix2;
+
+// check rt
+assert( (rt != NULL) , "pointer on radix tree is NULL\n" );
 
         req.type = KMEM_GENERIC;
@@ -107 +111 @@
 }  // end grdxt_destroy()
 
-///////////////////////////////
-void grdxt_print( grdxt_t * rt,
-                  char    * name )
-{
-        uint32_t        ix1;  
-        uint32_t        ix2;
-        uint32_t        ix3;
-
-    uint32_t        w1 = rt->ix1_width;
-    uint32_t        w2 = rt->ix2_width;
-    uint32_t        w3 = rt->ix3_width;
-
-    void         ** ptr1 = rt->root;
-    void         ** ptr2;
-    void         ** ptr3;
-
-    intptr_t        key; 
-    intptr_t        value;
-
-        printk("\n***** Generic Radix tree %s : n1 = %d / n2 = %d / n3 = %d\n\n", 
-           name, 1<<w1 , 1<<w2 , 1<<w3 );
+////////////////////////////////////
+void grdxt_display( xptr_t    rt_xp,
+                    char    * name )
+{
+        uint32_t       ix1;  
+        uint32_t       ix2;
+        uint32_t       ix3;
+
+// check rt_xp
+assert( (rt_xp != XPTR_NULL) , "pointer on radix tree is NULL\n" );
+
+    // get cluster and local pointer on remote rt descriptor
+    grdxt_t      * rt_ptr = GET_PTR( rt_xp );
+    cxy_t          rt_cxy = GET_CXY( rt_xp );
+
+    // get widths
+    uint32_t       w1 = hal_remote_l32( XPTR( rt_cxy , &rt_ptr->ix1_width ) );
+    uint32_t       w2 = hal_remote_l32( XPTR( rt_cxy , &rt_ptr->ix2_width ) );
+    uint32_t       w3 = hal_remote_l32( XPTR( rt_cxy , &rt_ptr->ix3_width ) );
+
+    void ** ptr1 = hal_remote_lpt( XPTR( rt_cxy , &rt_ptr->root ) );
+
+        printk("\n***** Generic Radix Tree for <%s> : %d / %d / %d\n", 
+    name, 1<<w1 , 1<<w2 , 1<<w3 );
 
         for( ix1=0 ; ix1 < (uint32_t)(1<<w1) ; ix1++ )
         {
-        ptr2 = ptr1[ix1];
+            void ** ptr2 = hal_remote_lpt( XPTR( rt_cxy , &ptr1[ix1] ) );
         if( ptr2 == NULL )  continue;
     
         for( ix2=0 ; ix2 < (uint32_t)(1<<w2) ; ix2++ )
         {
-            ptr3 = ptr2[ix2];
+                void ** ptr3 = hal_remote_lpt( XPTR( rt_cxy , &ptr2[ix2] ) );
             if( ptr3 == NULL ) continue;
 
             for( ix3=0 ; ix3 < (uint32_t)(1<<w3) ; ix3++ )
             {
-                value = (intptr_t)ptr3[ix3];
-                if( value == 0 )  continue;
-
-                key = (ix1<<(w2+w3)) + (ix2<<w3) + ix3;
-                printk(" - key = %x / value = %x\n", key , value );
+                void * value = hal_remote_lpt( XPTR( rt_cxy , &ptr3[ix3] ) );
+                if( value == NULL )  continue;
+
+                uint32_t key = (ix1<<(w2+w3)) + (ix2<<w3) + ix3;
+                printk(" - key = %x / value = %x\n", key , (intptr_t)value );
             }
         }
         }
-} // end grdxt_print()
+
+} // end grdxt_display()
 
 ////////////////////////////////////
@@ -162 +170 @@
     uint32_t        w3 = rt->ix3_width;
 
-    // Check key
-    if( (key >> (w1 + w2 + w3)) != 0 )
-    {
-        assert( false ,
-        "key value %x exceed (%d + %d + %d) bits", key , w1 , w2 , w3 );
-    }
+// Check key value
+assert( ((key >> (w1 + w2 + w3)) == 0 ), "illegal key value %x\n", key );
 
     // compute indexes
@@ -179 +183 @@
 
     // If required, we must allocate memory for the selected level 2 array,
-    // and atomically update the level 1 array.
+    // and update the level 1 array.
         if( ptr1[ix1] == NULL )
         {
@@ -198 +202 @@
 
     // If required, we must allocate memory for the selected level 3 array,
-    // and atomically update the level 2 array.
+    // and update the level 2 array.
         if( ptr2[ix2] == NULL )
         {
@@ -224 +228 @@
 
         return 0;
-}
+
+}  // end grdxt_insert()
 
 ///////////////////////////////////
@@ -234 +239 @@
     uint32_t        w3 = rt->ix3_width;
 
-    // Check key
-    if( (key >> (w1 + w2 + w3)) != 0 )
-    {
-        assert( false ,
-        "key value %x exceed (%d + %d + %d) bits", key , w1 , w2 , w3 );
-    }
+// Check key value
+assert( ((key >> (w1 + w2 + w3)) == 0 ), "illegal key value %x\n", key );
 
     // compute indexes
@@ -266 +267 @@
 
         return value;
-}
+
+}  // end grdxt_remove()
 
 ///////////////////////////////////
@@ -276 +278 @@
     uint32_t        w3 = rt->ix3_width;
 
-    // Check key
-    if( (key >> (w1 + w2 + w3)) != 0 )
-    {
-        assert( false ,
-        "key value %x exceed (%d + %d + %d) bits", key , w1 , w2 , w3 );
-    }
+// Check key value
+assert( ((key >> (w1 + w2 + w3)) == 0 ), "illegal key value %x\n", key );
 
     void         ** ptr1 = rt->root;
@@ -304 +302 @@
 
         return value;
-}
+
+}  // end grdxt_lookup()
+
+////////////////////////////////////////////
+xptr_t grdxt_remote_lookup( xptr_t    rt_xp,
+                            uint32_t  key )
+{
+    // get cluster and local pointer on remote rt descriptor
+    grdxt_t       * rt_ptr = GET_PTR( rt_xp );
+    cxy_t           rt_cxy = GET_CXY( rt_xp );
+
+    // get widths
+    uint32_t        w1 = hal_remote_l32( XPTR( rt_cxy , &rt_ptr->ix1_width ) );
+    uint32_t        w2 = hal_remote_l32( XPTR( rt_cxy , &rt_ptr->ix2_width ) );
+    uint32_t        w3 = hal_remote_l32( XPTR( rt_cxy , &rt_ptr->ix3_width ) );
+
+// Check key value
+assert( ((key >> (w1 + w2 + w3)) == 0 ), "illegal key value %x\n", key );
+
+    // compute indexes
+    uint32_t        ix1 = key >> (w2 + w3);              // index in level 1 array
+        uint32_t        ix2 = (key >> w3) & ((1 << w2) -1);  // index in level 2 array
+        uint32_t        ix3 = key & ((1 << w3) - 1);         // index in level 3 array
+
+    // get ptr1
+    void         ** ptr1 = hal_remote_lpt( XPTR( rt_cxy , &rt_ptr->root ) );
+
+    // get ptr2
+        void         ** ptr2 = hal_remote_lpt( XPTR( rt_cxy , &ptr1[ix1] ) );
+        if( ptr2 == NULL ) return XPTR_NULL;
+
+    // get ptr3
+        void         ** ptr3 = hal_remote_lpt( XPTR( rt_cxy , &ptr2[ix2] ) );
+        if( ptr3 == NULL ) return XPTR_NULL;
+
+    // get value
+        xptr_t      value = XPTR( rt_cxy , ptr3[ix3] );
+
+        return value;
+
+}  // end grdxt_remote_lookup()
 
 //////////////////////////////////////
@@ -319 +357 @@
     uint32_t        w3 = rt->ix3_width;
 
-    // Check start_key
-    if( (start_key >> (w1 + w2 + w3)) != 0 )
-    {
-        assert( false ,
-        "start_key value %x exceed (%d + %d + %d) bits", start_key , w1 , w2 , w3 );
-    }
+// Check key value
+assert( ((start_key >> (w1 + w2 + w3)) == 0 ), "illegal key value %x\n", start_key );
 
     // compute max indexes
@@ -363 +397 @@
 
     return NULL;
-}
+
+}  // end grdxt_get_first()