Changeset ff14c520 in mainline for generic/src

Timestamp:

2006-03-16T22:31:39Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93165be

Parents:

37c57f2

Message:

It is now possible to associate symbolic names with both threads and tasks.
More verbose kconsole threads, tasks and scheduler commands.

Location:

generic/src

Files:

• main/kinit.c (modified) (4 diffs)
• main/main.c (modified) (2 diffs)
• proc/scheduler.c (modified) (2 diffs)
• proc/task.c (modified) (5 diffs)
• proc/thread.c (modified) (3 diffs)

generic/src/main/kinit.c

@@ -81 +81 @@
                  * Just a beautification.
                  */
-                if ((t = thread_create(kmp, NULL, TASK, 0))) {
+                if ((t = thread_create(kmp, NULL, TASK, 0, "kmp"))) {
                         spinlock_lock(&t->lock);
                         t->flags |= X_WIRED;
@@ -106 +106 @@
                 for (i = 0; i < config.cpu_count; i++) {
 
-                        if ((t = thread_create(kcpulb, NULL, TASK, 0))) {
+                        if ((t = thread_create(kcpulb, NULL, TASK, 0, "kcpulb"))) {
                                 spinlock_lock(&t->lock);                        
                                 t->flags |= X_WIRED;
@@ -127 +127 @@
          * Create kernel console.
          */
-        if ((t = thread_create(kconsole, "kconsole", TASK, 0)))
+        if ((t = thread_create(kconsole, "kconsole", TASK, 0, "kconsole")))
                 thread_ready(t);
         else
@@ -143 +143 @@
                         panic("init[%d].addr is not frame aligned", i);
 
-                utask = task_run_program((void *) init.tasks[i].addr);
+                utask = task_run_program((void *) init.tasks[i].addr, "USPACE");
                 if (utask) {
                         if (!ipc_phone_0) 

generic/src/main/main.c

@@ -197 +197 @@
          * Create kernel task.
          */
-        k = task_create(AS_KERNEL);
+        k = task_create(AS_KERNEL, "KERNEL");
         if (!k)
                 panic("can't create kernel task\n");
@@ -204 +204 @@
          * Create the first thread.
          */
-        t = thread_create(kinit, NULL, k, 0);
+        t = thread_create(kinit, NULL, k, 0, "kinit");
         if (!t)
                 panic("can't create kinit thread\n");

generic/src/proc/scheduler.c

@@ -618 +618 @@
          * let's not be interrupted */
         ipl = interrupts_disable();
-        printf("Scheduler dump:\n");
         for (cpu=0;cpu < config.cpu_count; cpu++) {
 
@@ -625 +624 @@
 
                 spinlock_lock(&cpus[cpu].lock);
-                printf("cpu%d: nrdy: %d, needs_relink: %d\n",
-                       cpus[cpu].id, atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink);
+                printf("cpu%d: address=%P, nrdy=%d, needs_relink=%d\n",
+                       cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink);
                 
                 for (i=0; i<RQ_COUNT; i++) {

generic/src/proc/task.c

@@ -63 +63 @@
  *
  * @param as Task's address space.
+ * @param name Symbolic name.
  *
  * @return New task's structure
  *
  */
-task_t *task_create(as_t *as)
+task_t *task_create(as_t *as, char *name)
 {
         ipl_t ipl;
@@ -79 +80 @@
         list_initialize(&ta->tasks_link);
         ta->as = as;
+        ta->name = name;
 
         
@@ -102 +104 @@
 /** Create new task with 1 thread and run it
  *
+ * @param programe_addr Address of program executable image.
+ * @param name Program name. 
+ *
  * @return Task of the running program or NULL on error
  */
-task_t * task_run_program(void *program_addr)
+task_t * task_run_program(void *program_addr, char *name)
 {
         as_t *as;
@@ -120 +125 @@
         } 
         
-        task = task_create(as);
+        task = task_create(as, name);
         t = thread_create(uinit, (void *)((elf_header_t *)program_addr)->e_entry, 
-                          task, THREAD_USER_STACK);
+                          task, 0, "uinit");
         
         /*
@@ -149 +154 @@
                 t = list_get_instance(cur, task_t, tasks_link);
                 spinlock_lock(&t->lock);
-                printf("Task: %Q ActiveCalls: %d", t->taskid, 
-                       atomic_get(&t->active_calls));
+                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++) {
                         if (t->phones[i].callee)

generic/src/proc/thread.c

@@ -249 +249 @@
  * @param task  Task to which the thread belongs.
  * @param flags Thread flags.
+ * @param name  Symbolic name.
  *
  * @return New thread's structure on success, NULL on failure.
  *
  */
-thread_t *thread_create(void (* func)(void *), void *arg, task_t *task, int flags)
+thread_t *thread_create(void (* func)(void *), void *arg, task_t *task, int flags, char *name)
 {
         thread_t *t;
@@ -280 +281 @@
         interrupts_restore(ipl);
         
+        t->name = name;
         t->thread_code = func;
         t->thread_arg = arg;
@@ -410 +412 @@
         for (cur=threads_head.next; cur!=&threads_head; cur=cur->next) {
                 t = list_get_instance(cur, thread_t, threads_link);
-                printf("Thr: %d(%s) ", t->tid, thread_states[t->state]);
+                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)
                         printf("cpu%d ", t->cpu->id);
+                else
+                        printf("none");
                 printf("\n");
         }