Changeset 7 for trunk/kernel/mm/page.c

Timestamp:

Apr 26, 2017, 2:15:50 PM (7 years ago)

Author:

alain

Message:

Various bugs.

File:

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

trunk/kernel/mm/page.c

@@ -265 +265 @@
 
         size = (1 << page->order) * CONFIG_PPM_PAGE_SIZE;
-        base = ppm_page2base(page);
+        base = ppm_page2base( page );
+
+// kmem_print_kcm_table();
+
+// printk("\n@@@ in page_zero : size = %x / base = %x / kcm_tbl = %x\n",
+//        size , (uint32_t)base , (uint32_t)(&LOCAL_CLUSTER->kcm_tbl[0] ) );
 
         memset( base , 0 , size ); 
+
+// kmem_print_kcm_table();
+
 }
 
@@ -285 +293 @@
 
 
-/*
-/////////////////////////////////////////
-static void page_to_free( page_t * page )
-{
-        assert((page->state == PGINVALID) || 
-               (page->state == PGVALID)   ||
-               (page->state == PGINIT));
-
-        if(page_refcount_get(page) != 0)
-        {
-                printk(ERROR, "ERROR: %s: cpu %d, pid %d, tid %x, page %x, state %x, count %d [%d]\n",
-                       __FUNCTION__,
-                       cpu_get_id(),
-                       current_task->pid,
-                       current_thread,
-                       page,
-                       page->state,
-                       page_refcount_get(page),
-                       cpu_time_stamp());
-        }
-        page->state = PGFREE;
-}
-
-////////////////////////////////////////////
-static void page_to_invalid( page_t * page )
-{
-        assert((page->state == PGFREE)  || 
-               (page->state == PGVALID) ||
-               (page->state == PGLOCKEDIO));
-  
-        if(page->state == PGLOCKEDIO)
-        {
-                page->state = PGINVALID; 
-                page_unlock(page);
-                return;
-        }
- 
-        page->state = PGINVALID;
-}
-
-//////////////////////////////////////////
-static void page_to_valid( page_t * page )
-{
-        assert((page->state == PGINVALID) || 
-               (page->state == PGLOCKED)  ||
-               (page->state == PGLOCKEDIO));
-  
-        if(page->state == PGINVALID)
-        {
-                page->state = PGVALID;
-                return;
-        }
-
-        page->state = PGVALID;
-        page_unlock(page);
-}
-
-//////////////////////////////////////////////
-static void page_to_locked_io( page_t * page )
-{
-        assert((page->state == PGINVALID) || 
-               (page->state == PGVALID));
-
-        page_lock(page);
-        page->state = PGLOCKEDIO;
-}
-
-///////////////////////////////////////////
-static void page_to_locked( page_t * page )
-{
-        assert(page->state == PGVALID);
-        page_lock(page);
-        page->state = PGLOCKED;
-}
-
-/////////////////////////////////////////
-void page_state_set( page_t       * page,
-                     page_state_t   state )
-{
-        switch( state )
-        {
-        case PGFREE:
-                page_to_free(page);
-                return;
-
-        case PGINVALID:
-                page_to_invalid(page);
-                return;
-
-        case PGVALID:
-                page_to_valid(page);
-                return;
-
-        case PGLOCKEDIO:
-                page_to_locked_io(page);
-                return;
-
-        case PGLOCKED:
-                page_to_locked(page);
-                return;
-
-        case PGRESERVED:
-                refcount_set(&page->count,1);
-
-        case PGINIT:
-                page->state = new_state;
-                return;
-
-        default:
-                printk(ERROR, "ERROR: %s: Unknown Asked State %d\n", new_state);
-                return;
-        }
-}
-*/
-
-
+