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

Timestamp:

2011-06-17T20:39:16Z (14 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/proc

Files:

• scheduler.c (modified) (6 diffs)
• task.c (modified) (3 diffs)
• thread.c (modified) (2 diffs)

kernel/generic/src/proc/scheduler.c

@@ -237 +237 @@
                  * Take the first thread from the queue.
                  */
-                thread_t *thread =
-                    list_get_instance(CPU->rq[i].rq_head.next, thread_t, rq_link);
+                thread_t *thread = list_get_instance(
+                    list_first(&CPU->rq[i].rq), thread_t, rq_link);
                 list_remove(&thread->rq_link);
                 
@@ -273 +273 @@
 static void relink_rq(int start)
 {
-        link_t head;
-        
-        list_initialize(&head);
+        list_t list;
+        
+        list_initialize(&list);
         irq_spinlock_lock(&CPU->lock, false);
         
@@ -284 +284 @@
                         
                         irq_spinlock_lock(&CPU->rq[i + 1].lock, false);
-                        list_concat(&head, &CPU->rq[i + 1].rq_head);
+                        list_concat(&list, &CPU->rq[i + 1].rq);
                         size_t n = CPU->rq[i + 1].n;
                         CPU->rq[i + 1].n = 0;
@@ -292 +292 @@
                         
                         irq_spinlock_lock(&CPU->rq[i].lock, false);
-                        list_concat(&CPU->rq[i].rq_head, &head);
+                        list_concat(&CPU->rq[i].rq, &list);
                         CPU->rq[i].n += n;
                         irq_spinlock_unlock(&CPU->rq[i].lock, false);
@@ -616 +616 @@
                         
                         /* Search rq from the back */
-                        link_t *link = cpu->rq[rq].rq_head.prev;
-                        
-                        while (link != &(cpu->rq[rq].rq_head)) {
+                        link_t *link = cpu->rq[rq].rq.head.prev;
+                        
+                        while (link != &(cpu->rq[rq].rq.head)) {
                                 thread = (thread_t *) list_get_instance(link,
                                     thread_t, rq_link);
@@ -740 +740 @@
                         
                         printf("\trq[%u]: ", i);
-                        link_t *cur;
-                        for (cur = cpus[cpu].rq[i].rq_head.next;
-                            cur != &(cpus[cpu].rq[i].rq_head);
-                            cur = cur->next) {
-                                thread_t *thread = list_get_instance(cur, thread_t, rq_link);
+                        list_foreach(cpus[cpu].rq[i].rq, cur) {
+                                thread_t *thread = list_get_instance(cur,
+                                    thread_t, rq_link);
                                 printf("%" PRIu64 "(%s) ", thread->tid,
                                     thread_states[thread->state]);

kernel/generic/src/proc/task.c

@@ -155 +155 @@
         mutex_initialize(&task->futexes_lock, MUTEX_PASSIVE);
         
-        list_initialize(&task->th_head);
-        list_initialize(&task->sync_box_head);
+        list_initialize(&task->threads);
+        list_initialize(&task->sync_boxes);
         
         ipc_answerbox_init(&task->answerbox, task);
@@ -435 +435 @@
         
         /* Current values of threads */
-        link_t *cur;
-        for (cur = task->th_head.next; cur != &task->th_head; cur = cur->next) {
+        list_foreach(task->threads, cur) {
                 thread_t *thread = list_get_instance(cur, thread_t, th_link);
                 
@@ -468 +467 @@
          */
         
-        link_t *cur;
-        for (cur = task->th_head.next; cur != &task->th_head; cur = cur->next) {
+        list_foreach(task->threads, cur) {
                 thread_t *thread = list_get_instance(cur, thread_t, th_link);
                 bool sleeping = false;

kernel/generic/src/proc/thread.c

@@ -260 +260 @@
          */
         
-        list_append(&thread->rq_link, &cpu->rq[i].rq_head);
+        list_append(&thread->rq_link, &cpu->rq[i].rq);
         cpu->rq[i].n++;
         irq_spinlock_unlock(&(cpu->rq[i].lock), true);
@@ -423 +423 @@
                 atomic_inc(&task->lifecount);
         
-        list_append(&thread->th_link, &task->th_head);
+        list_append(&thread->th_link, &task->threads);
         
         irq_spinlock_pass(&task->lock, &threads_lock);