Changeset f5935ed in mainline

Timestamp:

2006-02-06T15:09:58Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

021d471

Parents:

c7ec94a4

Message:

Use hash_table_get_instance instead of list_get_instance.
Rename page_operations to page_mapping_operations.
Rename page_pt_operations to pt_mapping_operations.
Rename page_ht_operations to ht_mapping_operations.

Files:

• arch/amd64/src/mm/page.c (modified) (1 diff)
• arch/ia32/src/mm/page.c (modified) (1 diff)
• arch/ia64/src/mm/page.c (modified) (1 diff)
• arch/mips32/src/mm/page.c (modified) (1 diff)
• arch/ppc32/src/mm/page.c (modified) (1 diff)
• arch/sparc64/src/mm/frame.c (modified) (1 diff)
• arch/sparc64/src/mm/page.c (modified) (1 diff)
• genarch/include/mm/page_ht.h (modified) (1 diff)
• genarch/include/mm/page_pt.h (modified) (1 diff)
• genarch/src/mm/page_ht.c (modified) (4 diffs)
• genarch/src/mm/page_pt.c (modified) (1 diff)
• generic/include/adt/hash_table.h (modified) (1 diff)
• generic/include/mm/page.h (modified) (1 diff)
• generic/src/mm/page.c (modified) (3 diffs)

arch/amd64/src/mm/page.c

@@ -44 +44 @@
 
         if (config.cpu_active == 1) {
-                page_operations = &page_pt_operations;
+                page_mapping_operations = &pt_mapping_operations;
         
                 /*

arch/ia32/src/mm/page.c

@@ -48 +48 @@
 
         if (config.cpu_active == 1) {
-                page_operations = &page_pt_operations;
+                page_mapping_operations = &pt_mapping_operations;
         
                 /*

arch/ia64/src/mm/page.c

@@ -48 +48 @@
 void page_arch_init(void)
 {
-        page_operations = &page_ht_operations;
+        page_mapping_operations = &ht_mapping_operations;
         pk_disable();
         set_environment();

arch/mips32/src/mm/page.c

@@ -33 +33 @@
 void page_arch_init(void)
 {
-        page_operations = &page_pt_operations;
+        page_mapping_operations = &pt_mapping_operations;
 }

arch/ppc32/src/mm/page.c

@@ -36 +36 @@
 void page_arch_init(void)
 {
-        page_operations = &page_pt_operations;
+        page_mapping_operations = &pt_mapping_operations;
 }

arch/sparc64/src/mm/frame.c

@@ -34 +34 @@
 {
         /*
-         * Workaround to prevent slab allocator from allocating fram 0,
-         * which is not, at that time, mapped.
+         * Workaround to prevent slab allocator from allocating frame 0,
+         * which is not mapped by OFW.
          */
         frame_region_not_free(0, FRAME_SIZE);

arch/sparc64/src/mm/page.c

@@ -32 +32 @@
 void page_arch_init(void)
 {
-        page_operations = &page_ht_operations;
+        page_mapping_operations = &ht_mapping_operations;
 }

genarch/include/mm/page_ht.h

@@ -58 +58 @@
 };
 
-extern page_operations_t page_ht_operations;
+extern page_mapping_operations_t ht_mapping_operations;
 extern spinlock_t page_ht_lock;
-
 extern hash_table_t page_ht;
 extern hash_table_operations_t ht_operations;

genarch/include/mm/page_pt.h

@@ -85 +85 @@
 #define SET_FRAME_FLAGS(ptl3, i, x)     SET_FRAME_FLAGS_ARCH(ptl3, i, x)
 
-extern page_operations_t page_pt_operations;
+extern page_mapping_operations_t pt_mapping_operations;
 
 extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags);

genarch/src/mm/page_ht.c

@@ -68 +68 @@
 };
 
-page_operations_t page_ht_operations = {
+/** Page mapping operations for page hash table architectures. */
+page_mapping_operations_t ht_mapping_operations = {
         .mapping_insert = ht_mapping_insert,
         .mapping_find = ht_mapping_find
@@ -120 +121 @@
          * Convert item to PTE.
          */
-        t = list_get_instance(item, pte_t, link);
+        t = hash_table_get_instance(item, pte_t, link);
 
         if (keys == PAGE_HT_KEYS) {
@@ -142 +143 @@
          * Convert item to PTE.
          */
-        t = list_get_instance(item, pte_t, link);
+        t = hash_table_get_instance(item, pte_t, link);
 
         free(t);
@@ -200 +201 @@
         hlp = hash_table_find(&page_ht, key);
         if (hlp)
-                t = list_get_instance(hlp, pte_t, link);
+                t = hash_table_get_instance(hlp, pte_t, link);
 
         spinlock_unlock(&page_ht_lock);

genarch/src/mm/page_pt.c

@@ -41 +41 @@
 static pte_t *pt_mapping_find(as_t *as, __address page);
 
-page_operations_t page_pt_operations = {
+page_mapping_operations_t pt_mapping_operations = {
         .mapping_insert = pt_mapping_insert,
         .mapping_find = pt_mapping_find

generic/include/adt/hash_table.h

@@ -67 +67 @@
 };
 
-#define hash_table_get_instance(item,type,member)       list_get_instance((item),(type),(member))
+#define hash_table_get_instance(item, type, member)     list_get_instance((item), type, member)
 
 extern void hash_table_create(hash_table_t *h, count_t m, count_t max_keys, hash_table_operations_t *op);

generic/include/mm/page.h

@@ -61 +61 @@
 
 /** Operations to manipulate page mappings. */
-struct page_operations {
+struct page_mapping_operations {
         void (* mapping_insert)(as_t *as, __address page, __address frame, int flags);
         pte_t *(* mapping_find)(as_t *as, __address page);
 };
-typedef struct page_operations page_operations_t;
+typedef struct page_mapping_operations page_mapping_operations_t;
 
-extern page_operations_t *page_operations;
+extern page_mapping_operations_t *page_mapping_operations;
 
 extern void page_init(void);

generic/src/mm/page.c

@@ -44 +44 @@
 
 /** Virtual operations for page subsystem. */
-page_operations_t *page_operations = NULL;
+page_mapping_operations_t *page_mapping_operations = NULL;
 
 void page_init(void)
@@ -86 +86 @@
 void page_mapping_insert(as_t *as, __address page, __address frame, int flags)
 {
-        ASSERT(page_operations);
-        ASSERT(page_operations->mapping_insert);
+        ASSERT(page_mapping_operations);
+        ASSERT(page_mapping_operations->mapping_insert);
         
-        page_operations->mapping_insert(as, page, frame, flags);
+        page_mapping_operations->mapping_insert(as, page, frame, flags);
 }
 
@@ -105 +105 @@
 pte_t *page_mapping_find(as_t *as, __address page)
 {
-        ASSERT(page_operations);
-        ASSERT(page_operations->mapping_find);
+        ASSERT(page_mapping_operations);
+        ASSERT(page_mapping_operations->mapping_find);
 
-        return page_operations->mapping_find(as, page);
+        return page_mapping_operations->mapping_find(as, page);
 }