Changeset 82cbf8c6 in mainline for kernel/genarch/include

Timestamp:

2017-10-08T19:37:24Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2fd26bb

Parents:

81b9d3e

Message:

Replace the old hash table implementation in the kernel with the newer one

This replaces the original hash table implementation with the resizable one
already used in uspace. Along the way, the IRQ hash table code was streamlined
and cleaned up.

Location:

kernel/genarch/include/genarch/mm

Files:

• as_ht.h (modified) (2 diffs)
• page_ht.h (modified) (2 diffs)

kernel/genarch/include/genarch/mm/as_ht.h

@@ -37 +37 @@
 
 #include <mm/mm.h>
-#include <adt/list.h>
+#include <adt/hash_table.h>
 #include <typedefs.h>
 
@@ -46 +46 @@
 
 typedef struct pte {
-        link_t link;            /**< Page hash table link. */
+        ht_link_t link;         /**< Page hash table link. */
         struct as *as;          /**< Address space. */
         uintptr_t page;         /**< Virtual memory page. */

kernel/genarch/include/genarch/mm/page_ht.h

@@ -46 +46 @@
 #include <adt/hash_table.h>
 
-#define PAGE_HT_KEYS  2
 #define KEY_AS        0
 #define KEY_PAGE      1
-
-#define PAGE_HT_ENTRIES_BITS  13
-#define PAGE_HT_ENTRIES       (1 << PAGE_HT_ENTRIES_BITS)
 
 /* Macros for querying page hash table PTEs. */
@@ -66 +62 @@
 extern slab_cache_t *pte_cache;
 extern hash_table_t page_ht;
-extern hash_table_operations_t ht_operations;
+extern hash_table_ops_t ht_ops;
 
 #endif