Changeset 606 for trunk/kernel/mm/vmm.c

Timestamp:

Dec 3, 2018, 12:20:18 PM (5 years ago)

Author:

alain

Message:

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

File:

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

trunk/kernel/mm/vmm.c

@@ -1507 +1507 @@
     error_t    error;
     xptr_t     page_xp;           // extended pointer on physical page descriptor
-    page_t   * page_ptr;          // local pointer on physical page descriptor
-    uint32_t   index;             // missing page index in vseg mapper
+    uint32_t   page_id;           // missing page index in vseg mapper
     uint32_t   type;              // vseg type;
 
     type      = vseg->type;
-    index     = vpn - vseg->vpn_base;
+    page_id   = vpn - vseg->vpn_base;
 
 #if DEBUG_VMM_GET_ONE_PPN 
@@ -1518 +1517 @@
 thread_t * this  = CURRENT_THREAD;
 if( DEBUG_VMM_GET_ONE_PPN < cycle )
-printk("\n[%s] thread[%x,%x] enter for vpn %x / type %s / index  %d / cycle %d\n",
-__FUNCTION__, this->process->pid, this->trdid, vpn, vseg_type_str(type), index, cycle );
+printk("\n[%s] thread[%x,%x] enter for vpn %x / type %s / page_id  %d / cycle %d\n",
+__FUNCTION__, this->process->pid, this->trdid, vpn, vseg_type_str(type), page_id, cycle );
 #endif
 
@@ -1531 +1530 @@
 "mapper not defined for a FILE vseg\n" );
         
-        // get mapper cluster and local pointer
-        cxy_t      mapper_cxy = GET_CXY( mapper_xp );
-        mapper_t * mapper_ptr = GET_PTR( mapper_xp );
-
-        // get page descriptor from mapper
-        if( mapper_cxy == local_cxy )             // mapper is local
-        {
-            page_ptr = mapper_get_page( mapper_ptr , index );
-        }
-        else                                      // mapper is remote
-        {
-            rpc_mapper_get_page_client( mapper_cxy , mapper_ptr , index , &page_ptr );
-        }
-
-        if ( page_ptr == NULL ) return EINVAL;
-
-        page_xp = XPTR( mapper_cxy , page_ptr );
+        // get extended pointer on page descriptor
+        page_xp = mapper_remote_get_page( mapper_xp , page_id );
+
+        if ( page_xp == XPTR_NULL ) return EINVAL;
     }
 
@@ -1569 +1555 @@
 "mapper not defined for a CODE or DATA vseg\n" );
         
-            // get mapper cluster and local pointer
-            cxy_t      mapper_cxy = GET_CXY( mapper_xp );
-            mapper_t * mapper_ptr = GET_PTR( mapper_xp );
-
             // compute missing page offset in vseg
-            uint32_t offset = index << CONFIG_PPM_PAGE_SHIFT;
+            uint32_t offset = page_id << CONFIG_PPM_PAGE_SHIFT;
 
             // compute missing page offset in .elf file
@@ -1615 +1597 @@
 __FUNCTION__, this->process->pid, this->trdid, vpn );
 #endif
-                if( mapper_cxy == local_cxy ) 
-                {
-                    error = mapper_move_kernel( mapper_ptr,
-                                                true,             // to_buffer
-                                                elf_offset,
-                                                base_xp,
-                                                CONFIG_PPM_PAGE_SIZE ); 
-                }
-                else 
-                {
-                    rpc_mapper_move_buffer_client( mapper_cxy,
-                                                   mapper_ptr,
-                                                   true,         // to buffer
-                                                   false,        // kernel buffer
-                                                   elf_offset,
-                                                   base_xp,
-                                                   CONFIG_PPM_PAGE_SIZE,
-                                                   &error );
-                }
+                error = mapper_move_kernel( mapper_xp,
+                                            true,             // to_buffer
+                                            elf_offset,
+                                            base_xp,
+                                            CONFIG_PPM_PAGE_SIZE ); 
                 if( error ) return EINVAL;
             }
@@ -1649 +1617 @@
 #endif
                 // initialize mapper part
-                if( mapper_cxy == local_cxy )
-                {
-                    error = mapper_move_kernel( mapper_ptr,
-                                                true,         // to buffer
-                                                elf_offset,
-                                                base_xp,
-                                                file_size - offset ); 
-                }
-                else                                
-                {
-                    rpc_mapper_move_buffer_client( mapper_cxy,
-                                                   mapper_ptr,
-                                                   true,         // to buffer
-                                                   false,        // kernel buffer
-                                                   elf_offset,
-                                                   base_xp,
-                                                   file_size - offset, 
-                                                   &error );
-                }
+                error = mapper_move_kernel( mapper_xp,
+                                            true,         // to buffer
+                                            elf_offset,
+                                            base_xp,
+                                            file_size - offset ); 
                 if( error ) return EINVAL;