Changeset 561 for trunk/kernel/kern

Timestamp:

Sep 21, 2018, 10:26:47 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Remove y_max in all functions except dqdt_init()

Location:

trunk/kernel/kern

Files:

• cluster.c (modified) (2 diffs)
• cluster.h (modified) (1 diff)
• kernel_init.c (modified) (1 diff)

trunk/kernel/kern/cluster.c

@@ -45 +45 @@
 #include <process.h>
 #include <dqdt.h>
+#include <cluster_info.h>
 
 /////////////////////////////////////////////////////////////////////////////////////
@@ -212 +213 @@
 } // end cluster_init()
 
+/////////////////////////////////
+cxy_t cluster_random_select( void )
+{
+    uint32_t  x_size;
+    uint32_t  y_size;
+    uint32_t  y_width;
+    uint32_t  index;
+    uint32_t  x;
+    uint32_t  y;
+
+    do {
+        x_size     = LOCAL_CLUSTER->x_size;
+        y_size     = LOCAL_CLUSTER->y_size;
+        y_width   = LOCAL_CLUSTER->y_width;
+        index     = ( hal_get_cycles() + hal_get_gid() ) % (x_size * y_size);
+        x         = index / y_size;
+        y         = index % y_size;
+    } while ( cluster_info_is_active( LOCAL_CLUSTER->cluster_info[x][y] ) == 0 );
+
+    return (x<<y_width) + y;
+}
+
 ////////////////////////////////////////
 bool_t cluster_is_undefined( cxy_t cxy )

trunk/kernel/kern/cluster.h

@@ -176 +176 @@
 error_t cluster_init( boot_info_t * info );
 
+/****************************************************************************************** 
+ * This function randomly selects a cluster.
+ ******************************************************************************************
+ * @ returns the selected cluster identifier.
+ *****************************************************************************************/
+cxy_t cluster_random_select( void );
+
 /******************************************************************************************
  * This function checks the validity of a cluster identifier. 

trunk/kernel/kern/kernel_init.c

@@ -621 +621 @@
 
                 // compute target cluster for chdev[func,channel,direction]
-                uint32_t offset     = ext_chdev_gid % ( info->x_size * (info->y_max) ); // [FIXME]
-                uint32_t cx         = offset / (info->y_max); // [FIXME]
-                uint32_t cy         = offset % (info->y_max); // [FIXME]
-                uint32_t target_cxy = (cx<<info->y_width) + cy;
-
+                uint32_t offset;
+                uint32_t cx;
+                uint32_t cy;
+                uint32_t target_cxy;
+                while (1) {
+                    offset     = ext_chdev_gid % ( info->x_size * (info->y_size) );
+                    cx         = offset / (info->y_size);
+                    cy         = offset % (info->y_size);
+                    target_cxy = (cx<<info->y_width) + cy;
+                    // ext_chdev_gid that results in empty target clusters are skipped
+                    if ( cluster_info_is_active( LOCAL_CLUSTER->cluster_info[cx][cy] ) == 0 ) {
+                        ext_chdev_gid++;
+                    } else { // The ext_chdev_gid resulted in a full target cluster
+                        break;
+                    }
+                }
                 // allocate and initialize a local chdev
                 // when local cluster matches target cluster