Changeset 610 for trunk/kernel/mm/mapper.c

Timestamp:

Dec 27, 2018, 7:38:58 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in VFS to support the following
ksh commandis : cp, mv, rm, mkdir, cd, pwd

File:

• trunk/kernel/mm/mapper.c (modified) (11 diffs)

trunk/kernel/mm/mapper.c

@@ -188 +188 @@
         {
 
+            if( mapper_cxy == local_cxy )   // mapper is local
+            {
+
 #if (DEBUG_MAPPER_GET_PAGE & 1)
 if( DEBUG_MAPPER_GET_PAGE < cycle )
-printk("\n[%s] missing page => load it from IOC device\n", __FUNCTION__ );
-#endif
-            if( mapper_cxy == local_cxy )   // mapper is local
-            {
+printk("\n[%s] missing page => load it from FS / local access \n", __FUNCTION__ );
+#endif
                  error = mapper_handle_miss( mapper_ptr,
                                              page_id, 
@@ -200 +201 @@
             else
             {
+
+#if (DEBUG_MAPPER_GET_PAGE & 1)
+if( DEBUG_MAPPER_GET_PAGE < cycle )
+printk("\n[%s] missing page => load it from FS / RPC access \n", __FUNCTION__ );
+#endif
                  rpc_mapper_handle_miss_client( mapper_cxy,
                                                 mapper_ptr,
@@ -253 +259 @@
 vfs_inode_t * inode = mapper->inode;
 vfs_inode_get_name( XPTR( local_cxy , inode ) , name );
-if( DEBUG_MAPPER_HANDLE_MISS < cycle )
-printk("\n[%s] enter for page %d in <%s> / cycle %d\n",
+// if( DEBUG_MAPPER_HANDLE_MISS < cycle )
+// if( (page_id == 1) && (cycle > 10000000) )
+printk("\n[%s] enter for page %d in <%s> / cycle %d",
 __FUNCTION__, page_id, name, cycle );
 if( DEBUG_MAPPER_HANDLE_MISS & 1 )
-grdxt_display( &mapper->rt , name );
-#endif
-
-    // allocate one page from the mapper cluster
+grdxt_display( XPTR( local_cxy , &mapper->rt ) , name );
+#endif
+
+    // allocate one page from the local cluster
     req.type  = KMEM_PAGE;
     req.size  = 0;
@@ -313 +320 @@
 #if DEBUG_MAPPER_HANDLE_MISS
 cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_MAPPER_HANDLE_MISS < cycle )
-printk("\n[%s] exit for page %d in <%s> / ppn %x / cycle %d\n",
+// if( DEBUG_MAPPER_HANDLE_MISS < cycle )
+// if( (page_id == 1) && (cycle > 10000000) )
+printk("\n[%s] exit for page %d in <%s> / ppn %x / cycle %d",
 __FUNCTION__, page_id, name, ppm_page2ppn( *page_xp ), cycle );
 if( DEBUG_MAPPER_HANDLE_MISS & 1 )
-grdxt_display( &mapper->rt , name );
+grdxt_display( XPTR( local_cxy , &mapper->rt ) , name );
 #endif
 
@@ -348 +356 @@
 }  // end mapper_release_page()
 
-////////////////////////////////////////////
-error_t mapper_move_user( mapper_t * mapper,
+///////////////////////////////////////////////
+error_t mapper_move_user( xptr_t     mapper_xp,
                           bool_t     to_buffer,
                           uint32_t   file_offset,
@@ -355 +363 @@
                           uint32_t   size )
 {
-    xptr_t     mapper_xp;      // extended pointer on local mapper
     uint32_t   page_offset;    // first byte to move to/from a mapper page
     uint32_t   page_count;     // number of bytes to move to/from a mapper page
@@ -371 +378 @@
 #endif
 
-    // build extended pointer on mapper
-    mapper_xp = XPTR( local_cxy , mapper );
-
     // compute offsets of first and last bytes in file
     uint32_t min_byte = file_offset;
@@ -384 +388 @@
 #if (DEBUG_MAPPER_MOVE_USER & 1)
 if( DEBUG_MAPPER_MOVE_USER < cycle )
-printk("\n[%s] first_page %d / last_page %d\n", __FUNCTION__, first, last );
+printk("\n[%s] thread[%x,%x] : first_page %d / last_page %d\n",
+__FUNCTION__, this->process->pid, this->trdid, first, last );
 #endif
 
@@ -404 +409 @@
 #if (DEBUG_MAPPER_MOVE_USER & 1)
 if( DEBUG_MAPPER_MOVE_USER < cycle )
-printk("\n[%s] page_id = %d / page_offset = %d / page_count = %d\n",
-__FUNCTION__ , page_id , page_offset , page_count );
+printk("\n[%s] thread[%x,%x] : page_id = %d / page_offset = %d / page_count = %d\n",
+__FUNCTION__, this->process->pid, this->trdid, page_id , page_offset , page_count );
 #endif
 
@@ -412 +417 @@
 
         if ( page_xp == XPTR_NULL ) return -1;
+
+#if (DEBUG_MAPPER_MOVE_USER & 1)
+if( DEBUG_MAPPER_MOVE_USER < cycle )
+printk("\n[%s] thread[%x,%x] : get page (%x,%x) from mapper\n",
+__FUNCTION__, this->process->pid, this->trdid, GET_CXY(page_xp), GET_PTR(page_xp) );
+#endif
 
         // compute pointer in mapper
@@ -547 +558 @@
         }
 
+#if (DEBUG_MAPPER_MOVE_KERNEL & 1)
+if( DEBUG_MAPPER_MOVE_KERNEL < cycle )
+printk("\n[%s] src_cxy %x / src_ptr %x / dst_cxy %x / dst_ptr %x\n",
+__FUNCTION__, src_cxy, src_ptr, dst_cxy, dst_ptr );
+#endif
+
         // move fragment
         hal_remote_memcpy( XPTR( dst_cxy , dst_ptr ), XPTR( src_cxy , src_ptr ), page_count );