Changes in kernel/generic/src/proc/thread.c [ae0300b5:ee42e43] in mainline

File:

• kernel/generic/src/proc/thread.c (modified) (17 diffs)

kernel/generic/src/proc/thread.c

@@ -239 +239 @@
  * Switch thread to the ready state.
  *
- * @param thread Thread to make ready.
+ * @param t Thread to make ready.
  *
  */
@@ -246 +246 @@
         irq_spinlock_lock(&thread->lock, true);
         
-        ASSERT(thread->state != Ready);
+        ASSERT(!(thread->state == Ready));
         
         int i = (thread->priority < RQ_COUNT - 1)
@@ -350 +350 @@
         
 #ifdef CONFIG_UDEBUG
-        /* Initialize debugging stuff */
-        thread->btrace = false;
+        /* Init debugging stuff */
         udebug_thread_initialize(&thread->udebug);
 #endif
@@ -536 +535 @@
 /** Detach thread.
  *
- * Mark the thread as detached. If the thread is already
- * in the Lingering state, deallocate its resources.
+ * Mark the thread as detached, if the thread is already in the Lingering
+ * state, deallocate its resources.
  *
  * @param thread Thread to be detached.
@@ -591 +590 @@
         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 %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
-                    thread->tid, thread->thread_code, thread->kstack,
-                    ucycles, usuffix, kcycles, ksuffix);
+                printf("%-8" PRIu64" %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
+                    thread->tid, thread->kstack, ucycles, usuffix,
+                    kcycles, ksuffix);
         else
-                printf("%-8" PRIu64 " %-14s %10p %-8s %10p %-5" PRIu32 "\n",
-                    thread->tid, name, thread, thread_states[thread->state],
-                    thread->task, thread->task->context);
+                printf("%-8" PRIu64" %-14s %10p %-8s %10p %-5" PRIu32 " %10p\n",
+                    thread->tid, thread->name, thread, thread_states[thread->state],
+                    thread->task, thread->task->context, thread->thread_code);
 #endif
         
 #ifdef __64_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %18p %18p\n"
+                printf("%-8" PRIu64" %18p %18p\n"
                     "         %9" PRIu64 "%c %9" PRIu64 "%c ",
                     thread->tid, thread->thread_code, thread->kstack,
                     ucycles, usuffix, kcycles, ksuffix);
         else
-                printf("%-8" PRIu64 " %-14s %18p %-8s %18p %-5" PRIu32 "\n",
-                    thread->tid, name, thread, thread_states[thread->state],
+                printf("%-8" PRIu64" %-14s %18p %-8s %18p %-5" PRIu32 "\n",
+                    thread->tid, thread->name, thread, thread_states[thread->state],
                     thread->task, thread->task->context);
 #endif
@@ -654 +647 @@
 #ifdef __32_BITS__
         if (additional)
-                printf("[id    ] [code    ] [stack   ] [ucycles ] [kcycles ]"
-                    " [cpu] [waitqueue]\n");
+                printf("[id    ] [stack   ] [ucycles ] [kcycles ] [cpu]"
+                    " [waitqueue]\n");
         else
                 printf("[id    ] [name        ] [address ] [state ] [task    ]"
-                    " [ctx]\n");
+                    " [ctx] [code    ]\n");
 #endif
         
@@ -747 +740 @@
         ASSERT(interrupts_disabled());
         ASSERT(irq_spinlock_locked(&threads_lock));
-        
+
         thread_iterator_t iterator;
         
@@ -758 +751 @@
 }
 
-#ifdef CONFIG_UDEBUG
-
-void thread_stack_trace(thread_id_t thread_id)
-{
-        irq_spinlock_lock(&threads_lock, true);
-        
-        thread_t *thread = thread_find_by_id(thread_id);
-        if (thread == NULL) {
-                printf("No such thread.\n");
-                irq_spinlock_unlock(&threads_lock, true);
-                return;
-        }
-        
-        irq_spinlock_lock(&thread->lock, false);
-        
-        /*
-         * Schedule a stack trace to be printed
-         * just before the thread is scheduled next.
-         *
-         * If the thread is sleeping then try to interrupt
-         * the sleep. Any request for printing an uspace stack
-         * trace from within the kernel should be always
-         * considered a last resort debugging means, therefore
-         * forcing the thread's sleep to be interrupted
-         * is probably justifiable.
-         */
-        
-        bool sleeping = false;
-        istate_t *istate = thread->udebug.uspace_state;
-        if (istate != NULL) {
-                printf("Scheduling thread stack trace.\n");
-                thread->btrace = true;
-                if (thread->state == Sleeping)
-                        sleeping = true;
-        } else
-                printf("Thread interrupt state not available.\n");
-        
-        irq_spinlock_unlock(&thread->lock, false);
-        
-        if (sleeping)
-                waitq_interrupt_sleep(thread);
-        
-        irq_spinlock_unlock(&threads_lock, true);
-}
-
-#endif /* CONFIG_UDEBUG */
 
 /** Process syscall to create new thread.
  *
  */
-sysarg_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
+unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
     size_t name_len, thread_id_t *uspace_thread_id)
 {
@@ -817 +764 @@
         int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (sysarg_t) rc;
+                return (unative_t) rc;
         
         namebuf[name_len] = 0;
@@ -832 +779 @@
         if (rc != 0) {
                 free(kernel_uarg);
-                return (sysarg_t) rc;
+                return (unative_t) rc;
         }
         
@@ -846 +793 @@
                                  * has already been created. We need to undo its
                                  * creation now.
+                                 *
                                  */
                                 
@@ -856 +804 @@
                                 free(kernel_uarg);
                                 
-                                return (sysarg_t) rc;
+                                return (unative_t) rc;
                          }
                 }
@@ -867 +815 @@
                  * THREAD_B events for threads that already existed
                  * and could be detected with THREAD_READ before.
+                 *
                  */
                 udebug_thread_b_event_attach(thread, TASK);
@@ -878 +827 @@
                 free(kernel_uarg);
         
-        return (sysarg_t) ENOMEM;
+        return (unative_t) ENOMEM;
 }
 
@@ -884 +833 @@
  *
  */
-sysarg_t sys_thread_exit(int uspace_status)
+unative_t sys_thread_exit(int uspace_status)
 {
         thread_exit();
@@ -900 +849 @@
  *
  */
-sysarg_t sys_thread_get_id(thread_id_t *uspace_thread_id)
+unative_t sys_thread_get_id(thread_id_t *uspace_thread_id)
 {
         /*
@@ -907 +856 @@
          *
          */
-        return (sysarg_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
+        return (unative_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
             sizeof(THREAD->tid));
 }
 
 /** Syscall wrapper for sleeping. */
-sysarg_t sys_thread_usleep(uint32_t usec)
+unative_t sys_thread_usleep(uint32_t usec)
 {
         thread_usleep(usec);