Changeset 47800e0 in mainline

Timestamp:

2006-05-25T09:03:40Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

baafe71

Parents:

9dfc69a

Message:

Some renaming to prevent confusion.
as_lock → inactive_as_with_asid_lock
as_t::refcount → as_t::cpu_refcount

Location:

generic

Files:

• include/mm/as.h (modified) (2 diffs)
• src/mm/as.c (modified) (8 diffs)

generic/include/mm/as.h

@@ -77 +77 @@
 
         /** Number of processors on wich is this address space active. */
-        count_t refcount;
+        count_t cpu_refcount;
 
         /** B+tree of address space areas. */
@@ -135 +135 @@
 extern as_operations_t *as_operations;
 
-extern spinlock_t as_lock;
+extern spinlock_t inactive_as_with_asid_lock;
 extern link_t inactive_as_with_asid_head;
 

generic/src/mm/as.c

@@ -84 +84 @@
 as_operations_t *as_operations = NULL;
 
-/** Address space lock. It protects inactive_as_with_asid_head. Must be acquired before as_t mutex. */
-SPINLOCK_INITIALIZE(as_lock);
+/** This lock protects inactive_as_with_asid_head list. It must be acquired before as_t mutex. */
+SPINLOCK_INITIALIZE(inactive_as_with_asid_lock);
 
 /**
@@ -129 +129 @@
                 as->asid = ASID_INVALID;
         
-        as->refcount = 0;
+        as->cpu_refcount = 0;
         as->page_table = page_table_create(flags);
 
@@ -138 +138 @@
 void as_free(as_t *as)
 {
-        ASSERT(as->refcount == 0);
+        ASSERT(as->cpu_refcount == 0);
 
         /* TODO: free as_areas and other resources held by as */
@@ -734 +734 @@
  *
  * Note that this function cannot sleep as it is essentially a part of
- * the scheduling. Sleeping here would lead to deadlock on wakeup.
+ * scheduling. Sleeping here would lead to deadlock on wakeup.
  *
  * @param old Old address space or NULL.
@@ -745 +745 @@
         
         ipl = interrupts_disable();
-        spinlock_lock(&as_lock);
+        spinlock_lock(&inactive_as_with_asid_lock);
 
         /*
@@ -752 +752 @@
         if (old) {
                 mutex_lock_active(&old->lock);
-                ASSERT(old->refcount);
-                if((--old->refcount == 0) && (old != AS_KERNEL)) {
+                ASSERT(old->cpu_refcount);
+                if((--old->cpu_refcount == 0) && (old != AS_KERNEL)) {
                         /*
                          * The old address space is no longer active on
@@ -770 +770 @@
          */
         mutex_lock_active(&new->lock);
-        if ((new->refcount++ == 0) && (new != AS_KERNEL)) {
+        if ((new->cpu_refcount++ == 0) && (new != AS_KERNEL)) {
                 if (new->asid != ASID_INVALID)
                         list_remove(&new->inactive_as_with_asid_link);
@@ -791 +791 @@
                 mutex_unlock(&new->lock);
         }
-        spinlock_unlock(&as_lock);
+        spinlock_unlock(&inactive_as_with_asid_lock);
         interrupts_restore(ipl);