Changeset f1fae414 in mainline for kernel/generic/src/time/timeout.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/time/timeout.c (modified) (5 diffs)

kernel/generic/src/time/timeout.c

@@ -54 +54 @@
 {
         irq_spinlock_initialize(&CPU->timeoutlock, "cpu.timeoutlock");
-        list_initialize(&CPU->timeout_active_head);
+        list_initialize(&CPU->timeout_active_list);
 }
 
@@ -119 +119 @@
         timeout_t *target = NULL;
         link_t *cur;
-        for (cur = CPU->timeout_active_head.next;
-            cur != &CPU->timeout_active_head; cur = cur->next) {
+        for (cur = CPU->timeout_active_list.head.next;
+            cur != &CPU->timeout_active_list.head; cur = cur->next) {
                 target = list_get_instance(cur, timeout_t, link);
                 irq_spinlock_lock(&target->lock, false);
@@ -135 +135 @@
         /* Avoid using cur->prev directly */
         link_t *prev = cur->prev;
-        list_prepend(&timeout->link, prev);
+        list_insert_after(&timeout->link, prev);
         
         /*
@@ -146 +146 @@
          * Decrease ticks of timeout's immediate succesor by timeout->ticks.
          */
-        if (cur != &CPU->timeout_active_head) {
+        if (cur != &CPU->timeout_active_list.head) {
                 irq_spinlock_lock(&target->lock, false);
                 target->ticks -= timeout->ticks;
@@ -184 +184 @@
         /*
          * Now we know for sure that timeout hasn't been activated yet
-         * and is lurking in timeout->cpu->timeout_active_head queue.
+         * and is lurking in timeout->cpu->timeout_active_list.
          */
         
         link_t *cur = timeout->link.next;
-        if (cur != &timeout->cpu->timeout_active_head) {
+        if (cur != &timeout->cpu->timeout_active_list.head) {
                 timeout_t *tmp = list_get_instance(cur, timeout_t, link);
                 irq_spinlock_lock(&tmp->lock, false);