Changeset df7cbc6 in mainline

Timestamp:

2012-12-04T16:54:39Z (11 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

87179ca

Parents:

b188002

Message:

Turned fibril futex semaphore into a futex lock/mutex.

File:

• uspace/lib/c/generic/fibril.c (modified) (11 diffs)

uspace/lib/c/generic/fibril.c

@@ -51 +51 @@
 #include <futex.h>
 
-#ifdef FUTEX_UPGRADABLE
+#ifdef futex_unlockGRADABLE
 #include <rcu.h>
 #endif
@@ -88 +88 @@
         fibril_t *fibril = __tcb_get()->fibril_data;
 
-#ifdef FUTEX_UPGRADABLE
+#ifdef futex_unlockGRADABLE
         rcu_register_fibril();
 #endif
@@ -152 +152 @@
         int retval = 0;
         
-        futex_down(&fibril_futex);
+        futex_lock(&fibril_futex);
         
         if (stype == FIBRIL_PREEMPT && list_empty(&ready_list))
@@ -174 +174 @@
         if ((stype == FIBRIL_TO_MANAGER) || (stype == FIBRIL_FROM_DEAD)) {
                 while (list_empty(&manager_list)) {
-                        futex_up(&fibril_futex);
+                        futex_unlock(&fibril_futex);
                         async_create_manager();
-                        futex_down(&fibril_futex);
+                        futex_lock(&fibril_futex);
                 }
         }
@@ -209 +209 @@
                         }
                         
-                        return 1;       /* futex_up already done here */
+                        return 1;       /* futex_unlock already done here */
                 }
                 
@@ -252 +252 @@
         list_remove(&dstf->link);
         
-        futex_up(&fibril_futex);
-        
-#ifdef FUTEX_UPGRADABLE
+        futex_unlock(&fibril_futex);
+        
+#ifdef futex_unlockGRADABLE
         if (stype == FIBRIL_FROM_DEAD) {
                 rcu_deregister_fibril();
@@ -264 +264 @@
         
 ret_0:
-        futex_up(&fibril_futex);
+        futex_unlock(&fibril_futex);
         return retval;
 }
@@ -329 +329 @@
         fibril_t *fibril = (fibril_t *) fid;
         
-        futex_down(&fibril_futex);
+        futex_lock(&fibril_futex);
         
         if ((fibril->flags & FIBRIL_SERIALIZED))
@@ -336 +336 @@
                 list_append(&fibril->link, &ready_list);
         
-        futex_up(&fibril_futex);
+        futex_unlock(&fibril_futex);
 }
 
@@ -349 +349 @@
         fibril_t *fibril = (fibril_t *) fid;
         
-        futex_down(&fibril_futex);
+        futex_lock(&fibril_futex);
         list_append(&fibril->link, &manager_list);
-        futex_up(&fibril_futex);
+        futex_unlock(&fibril_futex);
 }
 
@@ -357 +357 @@
 void fibril_remove_manager(void)
 {
-        futex_down(&fibril_futex);
+        futex_lock(&fibril_futex);
         
         if (!list_empty(&manager_list))
                 list_remove(list_first(&manager_list));
         
-        futex_up(&fibril_futex);
+        futex_unlock(&fibril_futex);
 }