Changeset 34bba0e in mainline

Timestamp:

2010-03-25T15:15:09Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

a2a00e8

Parents:

f773206d

Message:

Tweaking ps
ps -t echoes also current CPU

Files:

• kernel/generic/include/ps/taskinfo.h (modified) (1 diff)
• kernel/generic/src/ps/ps.c (modified) (2 diffs)
• uspace/app/ps/ps.c (modified) (4 diffs)

kernel/generic/include/ps/taskinfo.h

@@ -75 +75 @@
         int priority;
         uint64_t cycles;
+        unsigned int cpu;
 } thread_info_t;
 

kernel/generic/src/ps/ps.c

@@ -170 +170 @@
         result.cycles = t->cycles;
 
+        if (t->cpu)
+                result.cpu = t->cpu->id;
+        else
+                result.cpu = -1;
+
         WRITE_THREAD_INFO(infos, count - 1, &result);
 
@@ -187 +192 @@
         spinlock_unlock(&tasks_lock);
 
+        if (!selected_task) {
+                return 0;
+        }
+
         spinlock_lock(&threads_lock);
 

uspace/app/ps/ps.c

@@ -47 +47 @@
 #define THREAD_COUNT 50
 
+/** Thread states */
+static const char *thread_states[] = {
+        "Invalid",
+        "Running",
+        "Sleeping",
+        "Ready",
+        "Entering",
+        "Exiting",
+        "Lingering"
+}; 
+
 static void list_tasks(void)
 {
@@ -82 +93 @@
         }
 
+        if (result == 0) {
+                printf("No task with given pid!\n");
+                exit(1);
+        }
+
         int i;
-        printf("    ID    State   Prio    [k]Cycles\n");
+        printf("    ID    State  CPU   Prio    [k]Cycles\n");
         for (i = 0; i < result; ++i) {
-                printf("%6llu %8d %6d %12llu\n", threads[i].tid, threads[i].state,
-                                threads[i].priority, threads[i].cycles / 1000);
+                printf("%6llu %-8s %4u %6d %12llu\n", threads[i].tid, thread_states[threads[i].state],
+                                threads[i].cpu, threads[i].priority, threads[i].cycles / 1000);
         }
+}
+
+static void usage()
+{
+        printf("Usage: ps [-t pid]\n");
 }
 
@@ -100 +121 @@
                         if (argc != 1) {
                                 printf("Bad argument count!\n");
+                                usage();
                                 exit(1);
                         }
@@ -106 +128 @@
                 } else {
                         printf("Unknown argument %s!\n", *argv);
+                        usage();
                         exit(1);
                 }