Changes in kernel/genarch/src/mm/as_ht.c [08a19ba:ada559c] in mainline

File:

• kernel/genarch/src/mm/as_ht.c (modified) (9 diffs)

kernel/genarch/src/mm/as_ht.c

@@ -30 +30 @@
  * @{
  */
- 
+
 /**
  * @file
- * @brief       Address space functions for global page hash table.
+ * @brief Address space functions for global page hash table.
  */
 
@@ -41 +41 @@
 #include <mm/as.h>
 #include <mm/frame.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <memstr.h>
 #include <adt/hash_table.h>
 #include <synch/mutex.h>
 
-static pte_t *ht_create(int flags);
-static void ht_destroy(pte_t *page_table);
+static pte_t *ht_create(unsigned int);
+static void ht_destroy(pte_t *);
 
-static void ht_lock(as_t *as, bool lock);
-static void ht_unlock(as_t *as, bool unlock);
+static void ht_lock(as_t *, bool);
+static void ht_unlock(as_t *, bool);
+static bool ht_locked(as_t *);
 
 as_operations_t as_ht_operations = {
@@ -57 +58 @@
         .page_table_lock = ht_lock,
         .page_table_unlock = ht_unlock,
+        .page_table_locked = ht_locked,
 };
 
@@ -68 +70 @@
  *
  * @return Returns NULL.
+ *
  */
-pte_t *ht_create(int flags)
+pte_t *ht_create(unsigned int flags)
 {
         if (flags & FLAG_AS_KERNEL) {
@@ -75 +78 @@
                 mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
         }
+        
         return NULL;
 }
@@ -83 +87 @@
  *
  * @param page_table This parameter is ignored.
+ *
  */
 void ht_destroy(pte_t *page_table)
@@ -94 +99 @@
  * Interrupts must be disabled.
  *
- * @param as Address space.
+ * @param as   Address space.
  * @param lock If false, do not attempt to lock the address space.
+ *
  */
 void ht_lock(as_t *as, bool lock)
@@ -101 +107 @@
         if (lock)
                 mutex_lock(&as->lock);
+        
         mutex_lock(&page_ht_lock);
 }
@@ -109 +116 @@
  * Interrupts must be disabled.
  *
- * @param as Address space.
+ * @param as     Address space.
  * @param unlock If false, do not attempt to lock the address space.
+ *
  */
 void ht_unlock(as_t *as, bool unlock)
 {
         mutex_unlock(&page_ht_lock);
+        
         if (unlock)
                 mutex_unlock(&as->lock);
 }
 
+/** Test whether page tables are locked.
+ *
+ * @param as            Address space where the page tables belong.
+ *
+ * @return              True if the page tables belonging to the address soace
+ *                      are locked, otherwise false.
+ */
+bool ht_locked(as_t *as)
+{
+        return (mutex_locked(&page_ht_lock) && mutex_locked(&as->lock));
+}
+
 /** @}
  */