Changeset 5e801dc in mainline for kernel/genarch/src/mm/page_ht.c

Timestamp:

2019-02-25T14:42:38Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a4e78743

Parents:

ee8d4d6

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-25 14:42:38)

git-committer:

GitHub <noreply@…> (2019-02-25 14:42:38)

Message:

Indicate and enforce constness of hash table key in certain functions (#158)

The assumption here is that modifying key in the hash/equal functions in something completely unexpected, and not something you would ever want to do intentionally, so it makes sense to disallow it entirely to get that extra level of checking.

File:

• kernel/genarch/src/mm/page_ht.c (modified) (3 diffs)

kernel/genarch/src/mm/page_ht.c

@@ -54 +54 @@
 
 static size_t ht_hash(const ht_link_t *);
-static size_t ht_key_hash(void *);
-static bool ht_key_equal(void *, const ht_link_t *);
+static size_t ht_key_hash(const void *);
+static bool ht_key_equal(const void *, const ht_link_t *);
 static void ht_remove_callback(ht_link_t *);
 
@@ -109 +109 @@
 
 /** Return the hash of the key. */
-size_t ht_key_hash(void *arg)
-{
-        uintptr_t *key = (uintptr_t *) arg;
+size_t ht_key_hash(const void *arg)
+{
+        const uintptr_t *key = arg;
         size_t hash = 0;
         hash = hash_combine(hash, key[KEY_AS]);
@@ -119 +119 @@
 
 /** Return true if the key is equal to the item's lookup key. */
-bool ht_key_equal(void *arg, const ht_link_t *item)
-{
-        uintptr_t *key = (uintptr_t *) arg;
+bool ht_key_equal(const void *arg, const ht_link_t *item)
+{
+        const uintptr_t *key = arg;
         pte_t *pte = hash_table_get_inst(item, pte_t, link);
         return (key[KEY_AS] == (uintptr_t) pte->as) &&