Changeset faf38b2 in mainline for uspace

Timestamp:

2010-04-09T09:41:39Z (15 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

638927a

Parents:

a325832

Message:

Removed thread selection from kernel.
Now all threads are copied to uspace and then selected.

Location:

uspace

Files:

• app/ps/ps.c (modified) (2 diffs)
• app/top/ps.c (modified) (1 diff)
• lib/c/generic/ps.c (modified) (1 diff)
• lib/c/include/ps.h (modified) (1 diff)

uspace/app/ps/ps.c

@@ -99 +99 @@
         int thread_count = THREAD_COUNT;
         thread_info_t *threads = malloc(thread_count * sizeof(thread_info_t));
-        int result = get_task_threads(taskid, threads, sizeof(thread_info_t) * thread_count);
+        int result = get_task_threads(threads, sizeof(thread_info_t) * thread_count);
 
         while (result > thread_count) {
                 thread_count *= 2;
                 threads = realloc(threads, thread_count * sizeof(thread_info_t));
-                result = get_task_threads(taskid, threads, sizeof(thread_info_t) * thread_count);
+                result = get_task_threads(threads, sizeof(thread_info_t) * thread_count);
         }
 
@@ -115 +115 @@
         printf("    ID    State  CPU   Prio    [k]uCycles    [k]kcycles   Cycle fault\n");
         for (i = 0; i < result; ++i) {
+                if (threads[i].taskid != taskid) {
+                        continue;
+                }
                 uint64_t ucycles, kcycles;
                 char usuffix, ksuffix;

uspace/app/top/ps.c

@@ -86 +86 @@
         int thread_count = THREAD_COUNT;
         thread_info_t *threads = malloc(thread_count * sizeof(thread_info_t));
-        int result = get_task_threads(taskid, threads, sizeof(thread_info_t) * thread_count);
+        int result = get_task_threads(threads, sizeof(thread_info_t) * thread_count);
 
         while (result > thread_count) {
                 thread_count *= 2;
                 threads = realloc(threads, thread_count * sizeof(thread_info_t));
-                result = get_task_threads(taskid, threads, sizeof(thread_info_t) * thread_count);
+                result = get_task_threads(threads, sizeof(thread_info_t) * thread_count);
         }
         

uspace/lib/c/generic/ps.c

@@ -74 +74 @@
  *
  */
-int get_task_threads(task_id_t taskid, thread_info_t *infos, size_t size)
+int get_task_threads(thread_info_t *infos, size_t size)
 {
-        return __SYSCALL3(SYS_PS_GET_THREADS, (sysarg_t) &taskid, (sysarg_t) infos,
-                        (sysarg_t) size);
+        return __SYSCALL2(SYS_PS_GET_THREADS, (sysarg_t) infos, (sysarg_t) size);
 }
 

uspace/lib/c/include/ps.h

@@ -45 +45 @@
 extern size_t get_task_ids(task_id_t *ids, size_t size);
 extern int get_task_info(task_id_t id, task_info_t *info);
-extern int get_task_threads(task_id_t taskid, thread_info_t *infos, size_t size);
+extern int get_task_threads(thread_info_t *infos, size_t size);
 
 #endif