Ticket #3552: cpuusagetop.patch

rtems/cpukit/libmisc/cpuuse/cpuusagetop.c

@@ -41 +41 @@
 #include <rtems/score/watchdogimpl.h>
 #include <rtems/score/wkspace.h>
 
+#include <rtems/rtems/tasksimpl.h>
+#include <rtems/scheduler.h>
+
 #include "cpuuseimpl.h"
 
 /*
@@ -199 +202 @@
     data->idle = usage;
     data->current_idle = current;
   }
+  if (thread->Object.id == 0x09010002)
+  {
+    data->idle += usage;
+    data->current_idle += current;
+  }
 
   /*
    * Create the tasks to display soring as we create.
@@ -424 +432 @@
       Thread_Control*   thread = data->tasks[i];
       Timestamp_Control usage;
       Timestamp_Control current_usage;
+      const Scheduler_Control *scheduler;
 
       if (thread == NULL)
         break;
@@ -444 +453 @@
       if (name[0] == '\0')
         snprintf(name, sizeof(name) - 1, "(%p)", thread->Start.Entry.Kinds.Numeric.entry);
 
+      scheduler = _Thread_Scheduler_get_home( thread );
+
       rtems_printf(data->printer,
-                   " 0x%08" PRIx32 " | %-19s |  %3" PRId64 " |  %3" PRId64 "   | ",
+                   " 0x%08" PRIx32 " | %-19s |  %3" PRId32 " |  %3" PRId32 "   | ",
                    thread->Object.id,
-                   name,
-                   thread->Real_priority.priority,
-                   _Thread_Get_priority(thread));
+                   name, 
+                   _RTEMS_Priority_From_core(scheduler, thread->Real_priority.priority), 
+                   _RTEMS_Priority_From_core(scheduler, _Thread_Get_priority(thread)));
 
       usage = data->usage[i];
       current_usage = data->current_usage[i];