Changeset b0f00a9 in mainline for kernel/generic/src/synch/waitq.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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/waitq.c (modified) (6 diffs)

kernel/generic/src/synch/waitq.c

@@ -45 +45 @@
 
 #include <synch/waitq.h>
-#include <synch/synch.h>
 #include <synch/spinlock.h>
 #include <proc/thread.h>
@@ -69 +68 @@
 {
         irq_spinlock_initialize(&wq->lock, "wq.lock");
-        list_initialize(&wq->head);
+        list_initialize(&wq->sleepers);
         wq->missed_wakeups = 0;
 }
@@ -196 +195 @@
         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 +407 @@
         }
         
-        list_append(&THREAD->wq_link, &wq->head);
+        list_append(&THREAD->wq_link, &wq->sleepers);
         
         /*
@@ -464 +464 @@
         
 loop:
-        if (list_empty(&wq->head)) {
+        if (list_empty(&wq->sleepers)) {
                 wq->missed_wakeups++;
                 if ((count) && (mode == WAKEUP_ALL))
@@ -473 +473 @@
         
         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);
         
         /*