Index: trunk/Ohana/src/opihi/pcontrol/status.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/status.c	(revision 12471)
+++ trunk/Ohana/src/opihi/pcontrol/status.c	(revision 18098)
@@ -6,18 +6,7 @@
 int status (int argc, char **argv) {
 
-  SetCheckPoint ();
-  PrintJobStack (PCONTROL_JOB_PENDING);
-  PrintJobStack (PCONTROL_JOB_BUSY);
-  PrintJobStack (PCONTROL_JOB_DONE);
-  PrintJobStack (PCONTROL_JOB_KILL);
-  PrintJobStack (PCONTROL_JOB_EXIT);
-  PrintJobStack (PCONTROL_JOB_CRASH);
+  PrintJobStack (PCONTROL_JOB_ALLJOBS);
+  PrintHostStack (PCONTROL_HOST_ALLHOSTS);
 
-  PrintHostStack (PCONTROL_HOST_OFF);
-  PrintHostStack (PCONTROL_HOST_DOWN);
-  PrintHostStack (PCONTROL_HOST_IDLE);
-  PrintHostStack (PCONTROL_HOST_BUSY);
-  PrintHostStack (PCONTROL_HOST_DONE);
-  ClearCheckPoint ();
   return (TRUE);
 }
@@ -39,5 +28,10 @@
     job = stack[0].object[i];
     ASSERT (job != NULL, "programming error");
-    gprint (GP_LOG, "%d  %s  %d  ", i, job[0].hostname, job[0].argc);
+    if (job[0].realhost == NULL) {
+	gprint (GP_LOG, "%3d %9s ", i, job[0].hostname);
+    } else {
+	gprint (GP_LOG, "%3d %9s ", i, job[0].realhost);
+    }
+    gprint (GP_LOG, "%7s  ", GetJobStackName (job[0].state));
     for (j = 0; j < job[0].argc; j++) {
       gprint (GP_LOG, "%s ", job[0].argv[j]);
@@ -66,4 +60,5 @@
     host = stack[0].object[i];
     gprint (GP_LOG, "%d  %s  ", i, host[0].hostname);
+    gprint (GP_LOG, "%5s  ", GetHostStackName (host[0].stack));
     PrintID (GP_LOG, host[0].HostID);
     gprint (GP_LOG, "\n");