Changeset bd01a4e in mainline

Timestamp:

2010-04-18T17:41:48Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3bdf3d3

Parents:

9e05055

Message:

indicate inactive CPUs

Files:

• kernel/generic/include/cpu.h (modified) (1 diff)
• kernel/generic/include/sysinfo/abi.h (modified) (1 diff)
• kernel/generic/src/sysinfo/stats.c (modified) (1 diff)
• uspace/app/tasks/tasks.c (modified) (1 diff)
• uspace/app/top/screen.c (modified) (1 diff)

kernel/generic/include/cpu.h

@@ -77 +77 @@
         unsigned int id;
         
-        int active;
+        bool active;
         int tlb_active;
 

kernel/generic/include/sysinfo/abi.h

@@ -66 +66 @@
 typedef struct {
         unsigned int id;         /**< CPU ID as stored by kernel */
+        bool active;             /**< CPU is activate */
         uint16_t frequency_mhz;  /**< Frequency in MHz */
         uint64_t idle_ticks;     /**< Number of idle kernel quanta */

kernel/generic/src/sysinfo/stats.c

@@ -116 +116 @@
                 
                 stats_cpus[i].id = cpus[i].id;
+                stats_cpus[i].active = cpus[i].active;
                 stats_cpus[i].frequency_mhz = cpus[i].frequency_mhz;
                 stats_cpus[i].busy_ticks = cpus[i].busy_ticks;

uspace/app/tasks/tasks.c

@@ -164 +164 @@
         size_t i;
         for (i = 0; i < count; i++) {
-                printf("cpu%u: %" PRIu16 " MHz, busy ticks: "
-                    "%" PRIu64 ", idle ticks: %" PRIu64 "\n",
-                    cpus[i].id, cpus[i].frequency_mhz, cpus[i].busy_ticks,
-                    cpus[i].idle_ticks);
+                if (cpus[i].active) {
+                        printf("cpu%u: %" PRIu16 " MHz, busy ticks: "
+                            "%" PRIu64 ", idle ticks: %" PRIu64 "\n",
+                            cpus[i].id, cpus[i].frequency_mhz, cpus[i].busy_ticks,
+                            cpus[i].idle_ticks);
+                } else {
+                        printf("cpu%u: inactive\n", cpus[i].id);
+                }
         }
         

uspace/app/top/screen.c

@@ -173 +173 @@
         size_t i;
         for (i = 0; i < data->cpus_count; i++) {
-                printf("cpu%u (%4" PRIu16 " MHz): busy ticks: "
-                    "%" PRIu64 ", idle ticks: %" PRIu64,
-                    data->cpus[i].id, data->cpus[i].frequency_mhz,
-                    data->cpus[i].busy_ticks, data->cpus[i].idle_ticks);
-                printf(", idle: ");
-                print_float(data->cpus_perc[i].idle, 2);
-                printf("%%, busy: ");
-                print_float(data->cpus_perc[i].busy, 2);
-                
-                printf("%%\n");
+                if (data->cpus[i].active) {
+                        printf("cpu%u (%4" PRIu16 " MHz): busy ticks: "
+                            "%" PRIu64 ", idle ticks: %" PRIu64,
+                            data->cpus[i].id, data->cpus[i].frequency_mhz,
+                            data->cpus[i].busy_ticks, data->cpus[i].idle_ticks);
+                        printf(", idle: ");
+                        print_float(data->cpus_perc[i].idle, 2);
+                        printf("%%, busy: ");
+                        print_float(data->cpus_perc[i].busy, 2);
+                        printf("%%\n");
+                } else
+                        printf("cpu%u inactive\n", data->cpus[i].id);
+                
                 up_rows++;
         }