Changeset 561 for trunk/kernel/mm

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()

File:

• trunk/kernel/mm/vmm.c (modified) (2 diffs)

trunk/kernel/mm/vmm.c

@@ -45 +45 @@
 #include <kmem.h>
 #include <vmm.h>
+#include <cluster_info.h>
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -1384 +1385 @@
     if( flags & VSEG_DISTRIB )    // distributed => cxy depends on vpn LSB
     {
-        uint32_t x_max   = LOCAL_CLUSTER->x_max; // [FIXME]
-        uint32_t y_max   = LOCAL_CLUSTER->y_max; // [FIXME]
+        uint32_t x_size  = LOCAL_CLUSTER->x_size;
+        uint32_t y_size  = LOCAL_CLUSTER->y_size;
         uint32_t y_width = LOCAL_CLUSTER->y_width;
-        uint32_t index   = vpn & ((x_max * y_max) - 1); // [FIXME]
-        uint32_t x       = index / y_max; // [FIXME]
-        uint32_t y       = index % y_max; // [FIXME]
-        page_cxy         = (x<<y_width) + y;
+        uint32_t index   = vpn & ((x_size * y_size) - 1);
+        uint32_t x       = index / y_size;
+        uint32_t y       = index % y_size;
+
+        // If the cluster selected from VPN's LSBs is empty, then we select one randomly
+        // cluster_random_select() ensures that its randomly selected cluster is not empty
+        if ( cluster_info_is_active( LOCAL_CLUSTER->cluster_info[x][y] ) == 0 ) {
+            cxy_t cxy = cluster_random_select();
+            x = ( ( cxy >> y_width ) & 0xF);
+            y = ( cxy & 0xF );
+        }
+        page_cxy = ( x << y_width ) + y;
     }
     else                          // other cases => cxy specified in vseg
     {
-        page_cxy         = vseg->cxy;
+        page_cxy = vseg->cxy;
     }