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

Timestamp:

Apr 4, 2018, 2:49:02 PM (6 years ago)

Author:

alain

Message:

Fix a bug in scheduler related to RPC blocking.

File:

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

trunk/kernel/mm/mapper.c

@@ -143 +143 @@
     error_t       error;
 
-#if CONFIG_DEBUG_MAPPER_GET_PAGE
+#if DEBUG_MAPPER_GET_PAGE
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_MAPPER_GET_PAGE < cycle )
+if( DEBUG_MAPPER_GET_PAGE < cycle )
 printk("\n[DBG] %s : thread %x enter for page %d / mapper %x / cycle %d\n",
 __FUNCTION__ , CURRENT_THREAD , index , mapper , cycle );
@@ -175 +175 @@
         {
 
-#if (CONFIG_DEBUG_MAPPER_GET_PAGE & 1)
-if( CONFIG_DEBUG_MAPPER_GET_PAGE < cycle )
+#if (DEBUG_MAPPER_GET_PAGE & 1)
+if( DEBUG_MAPPER_GET_PAGE < cycle )
 printk("\n[DBG] %s : missing page => load from device\n", __FUNCTION__ );
 #endif
@@ -257 +257 @@
     }
 
-#if CONFIG_DEBUG_MAPPER_GET_PAGE
+#if DEBUG_MAPPER_GET_PAGE
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_MAPPER_GET_PAGE < cycle )
+if( DEBUG_MAPPER_GET_PAGE < cycle )
 printk("\n[DBG] %s : thread %x exit for page %d / ppn %x / cycle %d\n",
 __FUNCTION__, CURRENT_THREAD, index, ppm_page2ppn(XPTR(local_cxy, page)), cycle );
@@ -317 +317 @@
     uint8_t  * buf_ptr;        // current buffer  address
 
-#if CONFIG_DEBUG_MAPPER_MOVE_USER
+#if DEBUG_MAPPER_MOVE_USER
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_MAPPER_MOVE_USER < cycle )
+if( DEBUG_MAPPER_MOVE_USER < cycle )
 printk("\n[DBG] %s : thread %x enter / to_buf %d / buffer %x / cycle %d\n",
 __FUNCTION__ , CURRENT_THREAD , to_buffer , buffer , cycle );
@@ -347 +347 @@
         else                       page_count = CONFIG_PPM_PAGE_SIZE;
 
-#if (CONFIG_DEBUG_MAPPER_MOVE_USER & 1)
-if( CONFIG_DEBUG_MAPPER_MOVE_USER < cycle )
+#if (DEBUG_MAPPER_MOVE_USER & 1)
+if( DEBUG_MAPPER_MOVE_USER < cycle )
 printk("\n[DBG] %s : index = %d / offset = %d / count = %d\n",
 __FUNCTION__ , index , page_offset , page_count );
@@ -379 +379 @@
     }
 
-#if CONFIG_DEBUG_MAPPER_MOVE_USER
+#if DEBUG_MAPPER_MOVE_USER
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_MAPPER_MOVE_USER < cycle )
+if( DEBUG_MAPPER_MOVE_USER < cycle )
 printk("\n[DBG] %s : thread %x exit / to_buf %d / buffer %x / cycle %d\n",
 __FUNCTION__ , CURRENT_THREAD , to_buffer , buffer , cycle );
@@ -412 +412 @@
     uint8_t * buffer_ptr = (uint8_t *)GET_PTR( buffer_xp );
 
-#if CONFIG_DEBUG_MAPPER_MOVE_KERNEL
+#if DEBUG_MAPPER_MOVE_KERNEL
 uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_MAPPER_MOVE_KERNEL < cycle )
+if( DEBUG_MAPPER_MOVE_KERNEL < cycle )
 printk("\n[DBG] %s : thread %x enter / to_buf %d / buf_cxy %x / buf_ptr %x / cycle %d\n",
 __FUNCTION__ , CURRENT_THREAD , to_buffer , buffer_cxy , buffer_ptr , cycle );
@@ -427 +427 @@
     uint32_t last  = max_byte >> CONFIG_PPM_PAGE_SHIFT;
 
-#if (CONFIG_DEBUG_MAPPER_MOVE_KERNEL & 1)
-if( CONFIG_DEBUG_MAPPER_MOVE_KERNEL < cycle )
+#if (DEBUG_MAPPER_MOVE_KERNEL & 1)
+if( DEBUG_MAPPER_MOVE_KERNEL < cycle )
 printk("\n[DBG] %s : first_page %d / last_page %d\n", __FUNCTION__, first, last );
 #endif
@@ -459 +459 @@
         else                       page_count = CONFIG_PPM_PAGE_SIZE;
 
-#if (CONFIG_DEBUG_MAPPER_MOVE_KERNEL & 1)
-if( CONFIG_DEBUG_MAPPER_MOVE_KERNEL < cycle )
+#if (DEBUG_MAPPER_MOVE_KERNEL & 1)
+if( DEBUG_MAPPER_MOVE_KERNEL < cycle )
 printk("\n[DBG] %s : page_index = %d / offset = %d / bytes = %d\n",
 __FUNCTION__ , index , page_offset , page_count );
@@ -494 +494 @@
     }
 
-#if CONFIG_DEBUG_MAPPER_MOVE_KERNEL
+#if DEBUG_MAPPER_MOVE_KERNEL
 cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_MAPPER_MOVE_KERNEL < cycle )
+if( DEBUG_MAPPER_MOVE_KERNEL < cycle )
 printk("\n[DBG] %s : thread %x exit / to_buf %d / buf_cxy %x / buf_ptr %x / cycle %d\n",
 __FUNCTION__ , CURRENT_THREAD , to_buffer , buffer_cxy , buffer_ptr , cycle );