Changeset 55b77d9 in mainline for kernel/generic/src/synch

Timestamp:

2011-06-17T20:39:16Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8f164724

Parents:

98caf49

Message:

Separate list_t typedef from link_t (kernel part).

• list_t represents lists
• Use list_first(), list_last(), list_empty() where appropriate
• Use list_foreach() where possible
• Replace improper uses of list_prepend() with list_insert_after()
• Replace improper uses of list_append() with list_insert_before()

Location:

kernel/generic/src/synch

Files:

• futex.c (modified) (1 diff)
• waitq.c (modified) (5 diffs)

kernel/generic/src/synch/futex.c

@@ -272 +272 @@
 void futex_cleanup(void)
 {
-        link_t *cur;
-        
         mutex_lock(&futex_ht_lock);
         mutex_lock(&TASK->futexes_lock);
 
-        for (cur = TASK->futexes.leaf_head.next;
-            cur != &TASK->futexes.leaf_head; cur = cur->next) {
+        list_foreach(TASK->futexes.leaf_list, cur) {
                 btree_node_t *node;
                 unsigned int i;

kernel/generic/src/synch/waitq.c

@@ -69 +69 @@
 {
         irq_spinlock_initialize(&wq->lock, "wq.lock");
-        list_initialize(&wq->head);
+        list_initialize(&wq->sleepers);
         wq->missed_wakeups = 0;
 }
@@ -196 +196 @@
         irq_spinlock_lock(&wq->lock, true);
         
-        if (!list_empty(&wq->head)) {
-                thread_t *thread = list_get_instance(wq->head.next, thread_t, wq_link);
+        if (!list_empty(&wq->sleepers)) {
+                thread_t *thread = list_get_instance(list_first(&wq->sleepers),
+                    thread_t, wq_link);
                 
                 irq_spinlock_lock(&thread->lock, false);
@@ -407 +408 @@
         }
         
-        list_append(&THREAD->wq_link, &wq->head);
+        list_append(&THREAD->wq_link, &wq->sleepers);
         
         /*
@@ -464 +465 @@
         
 loop:
-        if (list_empty(&wq->head)) {
+        if (list_empty(&wq->sleepers)) {
                 wq->missed_wakeups++;
                 if ((count) && (mode == WAKEUP_ALL))
@@ -473 +474 @@
         
         count++;
-        thread_t *thread = list_get_instance(wq->head.next, thread_t, wq_link);
+        thread_t *thread = list_get_instance(list_first(&wq->sleepers),
+            thread_t, wq_link);
         
         /*