Changeset a0bb10ef in mainline

Timestamp:

2006-03-23T11:49:11Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

303c94c

Parents:

281b607

Message:

Fix kcpulb() to change state of the migrated thread to Entering so that thread_ready() won't panic() on violated assertion.
Make print out of threads and tasks more dense again.

Location:

generic/src/proc

Files:

• scheduler.c (modified) (1 diff)
• task.c (modified) (3 diffs)
• thread.c (modified) (1 diff)

generic/src/proc/scheduler.c

@@ -563 +563 @@
 #endif
                                 t->flags |= X_STOLEN;
+                                t->state = Entering;
                                 spinlock_unlock(&t->lock);
         

generic/src/proc/task.c

@@ -118 +118 @@
 
         as = as_create(0);
+        ASSERT(as);
 
         rc = elf_load((elf_header_t *) program_addr, as);
@@ -133 +134 @@
         
         task = task_create(as, name);
-        t = thread_create(uinit, kernel_uarg, task, 0, "uinit");
-        
+        ASSERT(task);
+
         /*
          * Create the data as_area.
          */
         a = as_area_create(as, AS_AREA_READ | AS_AREA_WRITE, PAGE_SIZE, USTACK_ADDRESS);
+
+        t = thread_create(uinit, kernel_uarg, task, 0, "uinit");
+        ASSERT(t);
+        thread_ready(t);
         
-        thread_ready(t);
-
         return task;
 }
@@ -160 +163 @@
                 t = list_get_instance(cur, task_t, tasks_link);
                 spinlock_lock(&t->lock);
-                printf("%s: address=%P, taskid=%Q\n\tas=%P, ActiveCalls: %d",
+                printf("%s: address=%P, taskid=%Q, as=%P, ActiveCalls: %d",
                         t->name, t, t->taskid, t->as, atomic_get(&t->active_calls));
                 for (i=0; i < IPC_MAX_PHONES; i++) {

generic/src/proc/thread.c

@@ -416 +416 @@
         for (cur=threads_head.next; cur!=&threads_head; cur=cur->next) {
                 t = list_get_instance(cur, thread_t, threads_link);
-                printf("%s: address=%P, tid=%d, state=%s\n\ttask=%P, code=%P, stack=%P, cpu=",
+                printf("%s: address=%P, tid=%d, state=%s, task=%P, code=%P, stack=%P, cpu=",
                         t->name, t, t->tid, thread_states[t->state], t->task, t->thread_code, t->kstack);
                 if (t->cpu)