Changeset 577f042a in mainline

Timestamp:

2011-01-27T17:57:29Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5378f99

Parents:

875c629

Message:

• improve synchronization in sys_task_set_name()
• improve printouts of 'threads' kernel console command

Location:

kernel/generic/src/proc

Files:

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

kernel/generic/src/proc/task.c

@@ -342 +342 @@
 sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
-        int rc;
         char namebuf[TASK_NAME_BUFLEN];
         
         /* Cap length of name and copy it from userspace. */
-        
         if (name_len > TASK_NAME_BUFLEN - 1)
                 name_len = TASK_NAME_BUFLEN - 1;
         
-        rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
                 return (sysarg_t) rc;
         
         namebuf[name_len] = '\0';
+        
+        /*
+         * As the task name is referenced also from the
+         * threads, lock the threads' lock for the course
+         * of the update.
+         */
+        
+        irq_spinlock_lock(&tasks_lock, true);
+        irq_spinlock_lock(&TASK->lock, false);
+        irq_spinlock_lock(&threads_lock, false);
+        
+        /* Set task name */
         str_cpy(TASK->name, TASK_NAME_BUFLEN, namebuf);
+        
+        irq_spinlock_unlock(&threads_lock, false);
+        irq_spinlock_unlock(&TASK->lock, false);
+        irq_spinlock_unlock(&tasks_lock, true);
         
         return EOK;

kernel/generic/src/proc/thread.c

@@ -591 +591 @@
         order_suffix(thread->kcycles, &kcycles, &ksuffix);
         
+        char *name;
+        if (str_cmp(thread->name, "uinit") == 0)
+                name = thread->task->name;
+        else
+                name = thread->name;
+        
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64" %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
-                    thread->tid, thread->kstack, ucycles, usuffix,
-                    kcycles, ksuffix);
+                printf("%-8 %10p" PRIu64" %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
+                    thread->tid, thread->thread_code, thread->kstack,
+                    ucycles, usuffix, kcycles, ksuffix);
         else
-                printf("%-8" PRIu64" %-14s %10p %-8s %10p %-5" PRIu32 " %10p\n",
-                    thread->tid, thread->name, thread, thread_states[thread->state],
+                printf("%-8" PRIu64" %-14s %10p %-8s %10p %-5" PRIu32 "\n",
+                    thread->tid, name, thread, thread_states[thread->state],
                     thread->task, thread->task->context, thread->thread_code);
 #endif
@@ -610 +616 @@
         else
                 printf("%-8" PRIu64" %-14s %18p %-8s %18p %-5" PRIu32 "\n",
-                    thread->tid, thread->name, thread, thread_states[thread->state],
+                    thread->tid, name, thread, thread_states[thread->state],
                     thread->task, thread->task->context);
 #endif
@@ -648 +654 @@
 #ifdef __32_BITS__
         if (additional)
-                printf("[id    ] [stack   ] [ucycles ] [kcycles ] [cpu]"
-                    " [waitqueue]\n");
+                printf("[id    ] [code    ] [stack   ] [ucycles ] [kcycles ]"
+                    " [cpu] [waitqueue]\n");
         else
                 printf("[id    ] [name        ] [address ] [state ] [task    ]"
-                    " [ctx] [code    ]\n");
+                    " [ctx]\n");
 #endif