Changeset c7ec94a4 in mainline for generic

Timestamp:

2006-02-06T14:18:28Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f5935ed

Parents:

214f5bb

Message:

Page hash table architectures now use generic hash table to manage
mappings.

Location:

generic

Files:

• include/adt/hash_table.h (modified) (3 diffs)
• src/adt/hash_table.c (modified) (2 diffs)
• src/mm/as.c (modified) (1 diff)

generic/include/adt/hash_table.h

@@ -30 +30 @@
 #define __HASH_TABLE_H__
 
+#include <adt/list.h>
 #include <arch/types.h>
 #include <typedefs.h>
-#include <adt/list.h>
 
 /** Hash table structure. */
@@ -54 +54 @@
         /** Hash table item comparison function.
          *
-         * @param key Array of keys that will be compared against item. It is not necessary to pass all keys.
+         * @param key Array of keys that will be compared with item. It is not necessary to pass all keys.
          *
          * @return true if the keys match, false otherwise.
@@ -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);
-extern bool hash_table_insert(hash_table_t *h, __native key[], link_t *item);
+extern void hash_table_insert(hash_table_t *h, __native key[], link_t *item);
 extern link_t *hash_table_find(hash_table_t *h, __native key[]);
 extern void hash_table_remove(hash_table_t *h, __native key[], count_t keys);

generic/src/adt/hash_table.c

@@ -68 +68 @@
  * @param hey Array of all keys necessary to compute hash index.
  * @param item Item to be inserted into the hash table.
- *
- * @return true on success, false if the keys were already present in the hash table.
  */
-bool hash_table_insert(hash_table_t *h, __native key[], link_t *item)
+void hash_table_insert(hash_table_t *h, __native key[], link_t *item)
 {
         index_t chain;
@@ -81 +79 @@
         ASSERT(chain < h->entries);
         
-        if (hash_table_find(h, key)) {
-                /*
-                 * The hash table is not redundant.
-                 * Signal failure on return.
-                 */
-                return false;
-        }
-        
         list_append(item, &h->entry[chain]);
-        return true;
 }
 

generic/src/mm/as.c

@@ -282 +282 @@
         ipl = interrupts_disable();
         spinlock_lock(&as->lock);
-        ASSERT(as->page_table);
         SET_PTL0_ADDRESS(as->page_table);
         spinlock_unlock(&as->lock);