Changeset 564 for trunk/kernel/kern/dqdt.c

Timestamp:

Oct 4, 2018, 11:47:36 PM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

• trunk/kernel/kern/dqdt.c (modified) (18 diffs)

trunk/kernel/kern/dqdt.c

@@ -40 +40 @@
 extern chdev_directory_t  chdev_dir;  // defined in chdev.h / allocated in kernel_init.c
 
-
+/*
 ///////////////////////////////////////////////////////////////////////////////////////////
 // This static recursive function traverse the DQDT quad-tree from root to bottom.
@@ -65 +65 @@
     }
 }
-
-///////////////////
+*/
+
+/////////////////////////
 void dqdt_display( void )
 {
-    /*
-    reg_t   save_sr;
-
+    return;
+
+/*
     // build extended pointer on DQDT root node
         cluster_t * cluster = LOCAL_CLUSTER;
@@ -82 +83 @@
     chdev_t * txt0_ptr = GET_PTR( txt0_xp );
 
-    // get extended pointer on remote TXT0 chdev lock
+    // get extended pointer on remote TXT0 lock
     xptr_t  lock_xp = XPTR( txt0_cxy , &txt0_ptr->wait_lock );
 
-    // get TXT0 lock in busy waiting mode
-    remote_spinlock_lock_busy( lock_xp , &save_sr );
+    // get TXT0 lock
+    remote_busylock_acquire( lock_xp );
 
     // print header
@@ -95 +96 @@
 
     // release lock
-    remote_spinlock_unlock_busy( lock_xp , save_sr );
-    */
+    remote_busylock_release( lock_xp );
+*/
+
 }
 
 ////////////////////////////////////
 uint32_t dqdt_init( uint32_t x_size,
-                    uint32_t y_size,
-                    uint32_t y_width )
+                    uint32_t y_size )
 {
     assert( ((x_size <= 32) && (y_size <= 32)) , "illegal mesh size\n");
-
+ 
+    // compute level_max
+    uint32_t  x_size_ext = POW2_ROUNDUP( x_size );
+    uint32_t  y_size_ext = POW2_ROUNDUP( y_size );
+    uint32_t  size_ext   = MAX(x_size_ext , y_size_ext);
+    uint32_t  level_max  = (bits_log2(size_ext * size_ext) >> 1) + 1;
+
+return level_max;
+
+/*
         dqdt_node_t * node;
     cxy_t         p_cxy;         // cluster coordinates for parent node
@@ -114 +124 @@
     cluster_t   * cluster;       // pointer on local cluster
 
-    cluster = LOCAL_CLUSTER;
-
-    // compute level_max
-    uint32_t  x_size_ext = POW2_ROUNDUP( x_size );
-    uint32_t  y_size_ext = POW2_ROUNDUP( y_size );
-    uint32_t  size_ext   = MAX(x_size_ext , y_size_ext);
-    uint32_t  level_max  = (bits_log2(size_ext * size_ext) >> 1) + 1;
-
-    return level_max;
-
-    /*
+    cluster_t   * cluster = LOCAL_CLUSTER;
+
     // get cluster coordinates
-    uint32_t    x       = local_cxy >> y_width;
-    uint32_t    y       = local_cxy & ((1<<y_width)-1);
+    uint32_t    x       = HAL_X_FROM_CXY( local_cxy );
+    uint32_t    y       = HAL_Y_FROM_CXY( local_cxy );
 
     // loop on local dqdt nodes (at most one node per level)
@@ -154 +155 @@
         {
             // set parent extended pointer
-            p_cxy = ((x & ~pmask)<<y_width) + (y & ~pmask);
+            p_cxy = HAL_CXY_FROM_XY( (x & ~pmask) , (y & ~pmask) );
             node->parent = XPTR( p_cxy , &cluster->dqdt_tbl[level+1] );
 
@@ -168 +169 @@
             if ( (level > 0) && ((y + (1<<(level-1))) < y_size) )
             {
-                c_cxy = local_cxy + (1<<(level-1));
+                c_cxy = local_cxy + HAL_CXY_FROM_XY( 0 , (1<<(level-1) );
                 node->children[1] = XPTR( c_cxy , &cluster->dqdt_tbl[level-1] );
                 node->arity++;
@@ -176 +177 @@
             if ( (level > 0) && ((x + (1<<(level-1))) < x_size) )
             {
-                c_cxy = local_cxy + ((1<<(level-1))<<y_width);
+                c_cxy = local_cxy + HAL_CXY_FROM_XY( (1<<(level-1)) , 0 );
                 node->children[2] = XPTR( c_cxy , &cluster->dqdt_tbl[level-1]);
                 node->arity++;
@@ -186 +187 @@
                  ((y + (1<<(level-1))) < y_size) )
             {
-                c_cxy = local_cxy + ((1<<(level-1))<<y_width) + (1<<(level-1));
+                c_cxy = local_cxy + HAL_CXY_FROM_XY( (1<<(level-1)) , (1<<(level-1) );
                 node->children[3] = XPTR( c_cxy , &cluster->dqdt_tbl[level-1]);
                 node->arity++;
@@ -194 +195 @@
 
     return level_max;
-    */
+*/
 
 } // end dqdt_init()
 
+/*
 ///////////////////////////////////////////////////////////////////////////
 // This recursive function is called by the dqdt_update_threads() function.
@@ -216 +218 @@
 
     // get extended pointer on parent node
-    xptr_t parent = (xptr_t)hal_remote_lwd( XPTR( cxy , &ptr->parent ) );
+    xptr_t parent = (xptr_t)hal_remote_l64( XPTR( cxy , &ptr->parent ) );
 
     // propagate if required
     if ( parent != XPTR_NULL ) dqdt_propagate_threads( parent, increment );
 }
-
+*/
+
+/*
 ///////////////////////////////////////////////////////////////////////////
 // This recursive function is called by the dqdt_update_pages() function.
@@ -240 +244 @@
 
     // get extended pointer on parent node
-    xptr_t parent = (xptr_t)hal_remote_lwd( XPTR( cxy , &ptr->parent ) );
+    xptr_t parent = (xptr_t)hal_remote_l64( XPTR( cxy , &ptr->parent ) );
 
     // propagate if required
     if ( parent != XPTR_NULL ) dqdt_propagate_pages( parent, increment );
 }
+*/
 
 /////////////////////////////////////////////
-void dqdt_update_threads( int32_t increment )
-{
-    return;
-    /*
+void dqdt_update_threads( int32_t increment __attribute__ ((__unused__)) )
+{
+
+return;
+
+/*
         cluster_t   * cluster = LOCAL_CLUSTER;
     dqdt_node_t * node    = &cluster->dqdt_tbl[0];
@@ -259 +266 @@
     // propagate to DQDT upper levels
     if( node->parent != XPTR_NULL ) dqdt_propagate_threads( node->parent , increment );
-    */
+*/
+
 }
 
 ///////////////////////////////////////////
-void dqdt_update_pages( int32_t increment )
-{
-    return;
-    /*
+void dqdt_update_pages( int32_t increment  __attribute__ ((__unused__)) )
+{
+
+return;
+
+/*
         cluster_t   * cluster = LOCAL_CLUSTER;
     dqdt_node_t * node    = &cluster->dqdt_tbl[0];
@@ -275 +285 @@
     // propagate to DQDT upper levels
     if( node->parent != XPTR_NULL ) dqdt_propagate_pages( node->parent , increment );
-    */
-}
-
-
+*/
+
+}
+
+/*
 ////////////////////////////////////////////////////////////////////////////////
 // This recursive function is called by both the dqdt_get_cluster_for_process()
@@ -313 +324 @@
             cxy  = (cxy_t)GET_CXY( child );
             ptr  = (dqdt_node_t *)GET_PTR( child );
-            if( for_memory ) load = hal_remote_lw( XPTR( cxy , &ptr->pages ) );
-            else             load = hal_remote_lw( XPTR( cxy , &ptr->threads ) );
+            if( for_memory ) load = hal_remote_l32( XPTR( cxy , &ptr->pages ) );
+            else             load = hal_remote_l32( XPTR( cxy , &ptr->threads ) );
             if( load < load_min )
             {
@@ -326 +337 @@
     return dqdt_select_cluster( node_copy.children[select], for_memory );
 }
-
-////////////////////////////////////
+*/
+
+//////////////////////////////////////////
 cxy_t dqdt_get_cluster_for_process( void )
 {
-    return cluster_random_select();
-    /*
+
+return cluster_random_select();
+
+/*
     // build extended pointer on DQDT root node
         cluster_t * cluster = LOCAL_CLUSTER;
@@ -339 +353 @@
     // call recursive function
     return dqdt_select_cluster( root_xp , false );
-    */
-}
-
-////////////////////////////////////
+*/
+
+}
+
+/////////////////////////////////////////
 cxy_t dqdt_get_cluster_for_memory( void )
 {
-    return cluster_random_select();
-    /*
+
+return cluster_random_select();
+ 
+/*
     // build extended pointer on DQDT root node
         cluster_t * cluster = LOCAL_CLUSTER;
@@ -354 +371 @@
     // call recursive function
     return dqdt_select_cluster( root_xp , true );
-    */
-}
-
+*/
+
+}
+