Changeset cefb126 in mainline for kernel/generic/src/synch/futex.c

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/synch/futex.c (modified) (13 diffs)

kernel/generic/src/synch/futex.c

@@ -37 +37 @@
 
 #include <synch/futex.h>
-#include <synch/rwlock.h>
+#include <synch/mutex.h>
 #include <synch/spinlock.h>
 #include <synch/synch.h>
@@ -65 +65 @@
 
 /**
- * Read-write lock protecting global futex hash table.
+ * Mutex protecting global futex hash table.
  * It is also used to serialize access to all futex_t structures.
  * Must be acquired before the task futex B+tree lock.
  */
-static rwlock_t futex_ht_lock;
+static mutex_t futex_ht_lock;
 
 /** Futex hash table. */
@@ -84 +84 @@
 void futex_init(void)
 {
-        rwlock_initialize(&futex_ht_lock);
+        mutex_initialize(&futex_ht_lock, MUTEX_PASSIVE);
         hash_table_create(&futex_ht, FUTEX_HT_SIZE, 1, &futex_ht_ops);
 }
@@ -113 +113 @@
         uintptr_t paddr;
         pte_t *t;
-        ipl_t ipl;
         int rc;
         
-        ipl = interrupts_disable();
-
         /*
          * Find physical address of futex counter.
@@ -125 +122 @@
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
-                interrupts_restore(ipl);
                 return (unative_t) ENOENT;
         }
@@ -131 +127 @@
         page_table_unlock(AS, true);
         
-        interrupts_restore(ipl);        
-
         futex = futex_find(paddr);
 
@@ -156 +150 @@
         uintptr_t paddr;
         pte_t *t;
-        ipl_t ipl;
-        
-        ipl = interrupts_disable();
         
         /*
@@ -167 +158 @@
         if (!t || !PTE_VALID(t) || !PTE_PRESENT(t)) {
                 page_table_unlock(AS, true);
-                interrupts_restore(ipl);
                 return (unative_t) ENOENT;
         }
@@ -173 +163 @@
         page_table_unlock(AS, true);
         
-        interrupts_restore(ipl);
-
         futex = futex_find(paddr);
                 
@@ -200 +188 @@
          * or allocate new one if it does not exist already.
          */
-        rwlock_read_lock(&futex_ht_lock);
+        mutex_lock(&futex_ht_lock);
         item = hash_table_find(&futex_ht, &paddr);
         if (item) {
@@ -212 +200 @@
                         /*
                          * The futex is new to the current task.
-                         * However, we only have read access.
-                         * Gain write access and try again.
+                         * Upgrade its reference count and put it to the
+                         * current task's B+tree of known futexes.
                          */
-                        mutex_unlock(&TASK->futexes_lock);
-                        goto gain_write_access;
+                        futex->refcount++;
+                        btree_insert(&TASK->futexes, paddr, futex, leaf);
                 }
                 mutex_unlock(&TASK->futexes_lock);
-
-                rwlock_read_unlock(&futex_ht_lock);
         } else {
-gain_write_access:
+                futex = (futex_t *) malloc(sizeof(futex_t), 0);
+                futex_initialize(futex);
+                futex->paddr = paddr;
+                hash_table_insert(&futex_ht, &paddr, &futex->ht_link);
+                        
                 /*
-                 * Upgrade to writer is not currently supported,
-                 * therefore, it is necessary to release the read lock
-                 * and reacquire it as a writer.
+                 * This is the first task referencing the futex.
+                 * It can be directly inserted into its
+                 * B+tree of known futexes.
                  */
-                rwlock_read_unlock(&futex_ht_lock);
-
-                rwlock_write_lock(&futex_ht_lock);
-                /*
-                 * Avoid possible race condition by searching
-                 * the hash table once again with write access.
-                 */
-                item = hash_table_find(&futex_ht, &paddr);
-                if (item) {
-                        futex = hash_table_get_instance(item, futex_t, ht_link);
-                        
-                        /*
-                         * See if this futex is known to the current task.
-                         */
-                        mutex_lock(&TASK->futexes_lock);
-                        if (!btree_search(&TASK->futexes, paddr, &leaf)) {
-                                /*
-                                 * The futex is new to the current task.
-                                 * Upgrade its reference count and put it to the
-                                 * current task's B+tree of known futexes.
-                                 */
-                                futex->refcount++;
-                                btree_insert(&TASK->futexes, paddr, futex,
-                                    leaf);
-                        }
-                        mutex_unlock(&TASK->futexes_lock);
-        
-                        rwlock_write_unlock(&futex_ht_lock);
-                } else {
-                        futex = (futex_t *) malloc(sizeof(futex_t), 0);
-                        futex_initialize(futex);
-                        futex->paddr = paddr;
-                        hash_table_insert(&futex_ht, &paddr, &futex->ht_link);
-                        
-                        /*
-                         * This is the first task referencing the futex.
-                         * It can be directly inserted into its
-                         * B+tree of known futexes.
-                         */
-                        mutex_lock(&TASK->futexes_lock);
-                        btree_insert(&TASK->futexes, paddr, futex, NULL);
-                        mutex_unlock(&TASK->futexes_lock);
-                        
-                        rwlock_write_unlock(&futex_ht_lock);
-                }
+                mutex_lock(&TASK->futexes_lock);
+                btree_insert(&TASK->futexes, paddr, futex, NULL);
+                mutex_unlock(&TASK->futexes_lock);
+                
         }
+        mutex_unlock(&futex_ht_lock);
         
         return futex;
@@ -324 +274 @@
         link_t *cur;
         
-        rwlock_write_lock(&futex_ht_lock);
+        mutex_lock(&futex_ht_lock);
         mutex_lock(&TASK->futexes_lock);
 
@@ -344 +294 @@
         
         mutex_unlock(&TASK->futexes_lock);
-        rwlock_write_unlock(&futex_ht_lock);
+        mutex_unlock(&futex_ht_lock);
 }