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

Timestamp:

Aug 29, 2017, 12:03:37 PM (7 years ago)

Author:

alain

Message:

This version executed successfully the user "init" process on a mono-processor TSAR architecture.

File:

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

trunk/kernel/mm/mapper.c

@@ -143 +143 @@
     error_t       error;
 
-    mapper_dmsg("\n[INFO] %s : enters for page %d in mapper %x\n",
+    mapper_dmsg("\n[DMSG] %s : enters for page %d / mapper %x\n",
                 __FUNCTION__ , index , mapper );
 
@@ -170 +170 @@
         if ( page == NULL )   // missing page => create it and load it from file system
         {
-            mapper_dmsg("\n[INFO] %s : missing page => load from device\n", __FUNCTION__ );
+            mapper_dmsg("\n[DMSG] %s : missing page => load from device\n", __FUNCTION__ );
 
             // allocate one page from PPM
@@ -212 +212 @@
             }
 
-            // update the mapper and index fields in page descriptor
-            // required by the vfs_move_page_to_mapper()
-            page->mapper = mapper;
-            page->index  = index;
-
             // launch I/O operation to load page from file system
             error = vfs_mapper_move_page( page, 
@@ -259 +254 @@
     }
 
-    mapper_dmsg("\n[INFO] %s : exit for page %d in mapper %x / page_desc = %x\n",
+    mapper_dmsg("\n[DMSG] %s : exit for page %d / mapper %x / page_desc = %x\n",
                 __FUNCTION__ , index , mapper , page );
 
@@ -315 +310 @@
     uint8_t  * buf_ptr;        // current buffer  address
 
-    mapper_dmsg("\n[INFO] %s : enters / to_buf = %d / buffer = %x\n",
+    mapper_dmsg("\n[DMSG] %s : enters / to_buf = %d / buffer = %x\n",
                 __FUNCTION__ , to_buffer , buffer );
 
@@ -341 +336 @@
         else                       page_count = CONFIG_PPM_PAGE_SIZE;
 
-        mapper_dmsg("\n[INFO] %s : index = %d / offset = %d / count = %d\n",
+        mapper_dmsg("\n[DMSG] %s : index = %d / offset = %d / count = %d\n",
                     __FUNCTION__ , index , page_offset , page_count );
 
@@ -356 +351 @@
         buf_ptr = (uint8_t *)buffer + done;
 
-        mapper_dmsg("\n[INFO] %s : index = %d / buf_ptr = %x / map_ptr = %x\n",
+        mapper_dmsg("\n[DMSG] %s : index = %d / buf_ptr = %x / map_ptr = %x\n",
                     __FUNCTION__ , index , buf_ptr , map_ptr );
 
@@ -373 +368 @@
     }
 
-    mapper_dmsg("\n[INFO] %s : exit for buffer %x\n",
+    mapper_dmsg("\n[DMSG] %s : exit for buffer %x\n",
                 __FUNCTION__, buffer );
 
@@ -398 +393 @@
     cxy_t      dst_cxy;        // destination cluster
 
-    mapper_dmsg("\n[INFO] %s : enters / to_buf = %d / buffer = %l / size = %x / cycle %d\n",
-                __FUNCTION__ , to_buffer , buffer_xp , size , hal_time_stamp() );
+    // get buffer cluster and local pointer
+    cxy_t     buffer_cxy = GET_CXY( buffer_xp );
+    uint8_t * buffer_ptr = (uint8_t *)GET_PTR( buffer_xp );
+
+    mapper_dmsg("\n[DMSG] %s : to_buf = %d / buf_cxy = %x / buf_ptr = %x / size = %x\n",
+    __FUNCTION__ , to_buffer , buffer_cxy , buffer_ptr , size );
 
     // compute offsets of first and last bytes in file
@@ -409 +408 @@
     uint32_t last  = max_byte >> CONFIG_PPM_PAGE_SHIFT;
 
-    // get buffer cluster and local pointer
-    cxy_t     buffer_cxy = GET_CXY( buffer_xp );
-    uint8_t * buffer_ptr = (uint8_t *)GET_PTR( buffer_xp );
+    mapper_dmsg("\n[DMSG] %s : first_page = %d / last_page = %d\n",
+    __FUNCTION__ , first , last );
 
     // compute source and destination clusters
@@ -440 +438 @@
         else                       page_count = CONFIG_PPM_PAGE_SIZE;
 
-        mapper_dmsg("\n[INFO] %s : page_index = %d / offset = %d / count = %d\n",
+        mapper_dmsg("\n[DMSG] %s : page_index = %d / offset = %d / bytes = %d\n",
                     __FUNCTION__ , index , page_offset , page_count );
 
@@ -466 +464 @@
         }
 
-        mapper_dmsg("\n[INFO] %s : index = %d\n", __FUNCTION__ , index );
-
         // move fragment
         hal_remote_memcpy( XPTR( dst_cxy , dst_ptr ), XPTR( src_cxy , src_ptr ), page_count );
@@ -474 +470 @@
     }
 
-    mapper_dmsg("\n[INFO] %s : exit for buffer %l / size = %x / cycle %d\n",
-                __FUNCTION__ , buffer_xp , size , hal_time_stamp() );
+    mapper_dmsg("\n[DMSG] %s : exit / buf_cxy = %x / buf_ptr = %x / size = %x\n",
+    __FUNCTION__ , buffer_cxy , buffer_ptr , size );
 
     return 0;
 
-}  // end mapper_move_kernel_buffer()
-
+}  // end mapper_move_kernel()
+