Changeset 562 for trunk

Timestamp:

Sep 21, 2018, 10:27:06 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Disable DQDT and remove y_max FOR GOOD

Location:

trunk

Files:

• boot/tsar_mips32/boot.c (modified) (1 diff)
• kernel/kern/cluster.c (modified) (2 diffs)
• kernel/kern/cluster.h (modified) (1 diff)
• kernel/kern/dqdt.c (modified) (12 diffs)
• tools/arch_info/boot_info.h (modified) (1 diff)

trunk/boot/tsar_mips32/boot.c

@@ -405 +405 @@
     boot_info->x_width      = header->x_width;
     boot_info->y_width      = header->y_width;
-    boot_info->x_max        = header->x_size; // [FIXME]
-    boot_info->y_max        = header->name[5] == 'l' ? header->y_size - 1 : header->y_size; // [FIXME]
     boot_info->paddr_width  = header->paddr_width;
     boot_info->io_cxy       = header->io_cxy;

trunk/kernel/kern/cluster.c

@@ -72 +72 @@
         cluster->x_size          = info->x_size;
         cluster->y_size          = info->y_size;
-    cluster->x_max           = info->x_max; // [FIXME]
-        cluster->y_max           = info->y_max; // [FIXME]
         cluster->io_cxy          = info->io_cxy;
 
@@ -109 +107 @@
 
     // initialises DQDT
-    cluster->dqdt_root_level = dqdt_init( info->x_max, // [FIXME]
-                                          info->y_max, // [FIXME]
+    cluster->dqdt_root_level = dqdt_init( info->x_size,
+                                          info->y_size,
                                           info->y_width ) - 1;
 

trunk/kernel/kern/cluster.h

@@ -105 +105 @@
         uint32_t        x_size;            /*! number of clusters in a row    (can be 1)      */
         uint32_t        y_size;            /*! number of clusters in a column (can be 1)      */
-    uint32_t        x_max;             // [FIXME]
-    uint32_t        y_max;             // [FIXME]
     uint32_t        cluster_info[CONFIG_MAX_CLUSTERS_X][CONFIG_MAX_CLUSTERS_Y];
         cxy_t           io_cxy;            /*! io cluster identifier                          */

trunk/kernel/kern/dqdt.c

@@ -69 +69 @@
 void dqdt_display( void )
 {
+    /*
     reg_t   save_sr;
 
@@ -95 +96 @@
     // release lock
     remote_spinlock_unlock_busy( lock_xp , save_sr );
+    */
 }
 
@@ -120 +122 @@
     uint32_t  level_max  = (bits_log2(size_ext * size_ext) >> 1) + 1;
 
+    return level_max;
+
+    /*
     // get cluster coordinates
     uint32_t    x       = local_cxy >> y_width;
@@ -189 +194 @@
 
     return level_max;
+    */
 
 } // end dqdt_init()
@@ -243 +249 @@
 void dqdt_update_threads( int32_t increment )
 {
+    return;
+    /*
         cluster_t   * cluster = LOCAL_CLUSTER;
     dqdt_node_t * node    = &cluster->dqdt_tbl[0];
@@ -251 +259 @@
     // propagate to DQDT upper levels
     if( node->parent != XPTR_NULL ) dqdt_propagate_threads( node->parent , increment );
+    */
 }
 
@@ -256 +265 @@
 void dqdt_update_pages( int32_t increment )
 {
+    return;
+    /*
         cluster_t   * cluster = LOCAL_CLUSTER;
     dqdt_node_t * node    = &cluster->dqdt_tbl[0];
@@ -264 +275 @@
     // propagate to DQDT upper levels
     if( node->parent != XPTR_NULL ) dqdt_propagate_pages( node->parent , increment );
+    */
 }
 
@@ -318 +330 @@
 cxy_t dqdt_get_cluster_for_process( void )
 {
+    return cluster_random_select();
+    /*
     // build extended pointer on DQDT root node
         cluster_t * cluster = LOCAL_CLUSTER;
@@ -325 +339 @@
     // call recursive function
     return dqdt_select_cluster( root_xp , false );
+    */
 }
 
@@ -330 +345 @@
 cxy_t dqdt_get_cluster_for_memory( void )
 {
+    return cluster_random_select();
+    /*
     // build extended pointer on DQDT root node
         cluster_t * cluster = LOCAL_CLUSTER;
@@ -337 +354 @@
     // call recursive function
     return dqdt_select_cluster( root_xp , true );
-}
-
+    */
+}
+

trunk/tools/arch_info/boot_info.h

@@ -112 +112 @@
         uint32_t      x_size;                        /*! number of cluster in a row             */
         uint32_t      y_size;                        /*! number of cluster in a column          */
-    uint32_t      x_max;                         /*! [FIXME] Nb of non-empty cluster in row */
-    uint32_t      y_max;                         /*! [FIXME] Nb of non_empty cluster in col */
     uint32_t      cluster_info[CONFIG_MAX_CLUSTERS_X][CONFIG_MAX_CLUSTERS_Y];
                                                  /*! An array of infos about all clusters   */