Changeset 26946 for trunk/Ohana/src/opihi/pantasks/status_server.c

Timestamp:

Feb 14, 2010, 12:54:59 PM (16 years ago)

Author:

eugene

Message:

better UI for status

File:

• trunk/Ohana/src/opihi/pantasks/status_server.c (modified) (4 diffs)

trunk/Ohana/src/opihi/pantasks/status_server.c

@@ -4 +4 @@
 
   int N;
+  int checkController,showJobs, showDetails;
 
   if (get_argument (argc, argv, "-h")) goto help;
@@ -9 +10 @@
   if (get_argument (argc, argv, "--help")) goto help;
 
-  if ((N = get_argument (argc, argv, "-tasks"))) {
-    remove_argument (N, &argc, argv);
-    JobTaskLock();
-    ListTasks (FALSE);
-    JobTaskUnlock();
-    return (TRUE);
-  }
-
-  if ((N = get_argument (argc, argv, "-taskinfo"))) {
-    remove_argument (N, &argc, argv);
-    JobTaskLock();
-    ListTasks (TRUE);
-    JobTaskUnlock();
-    return (TRUE);
-  }
-
+  // special options for task timing stats
   if ((N = get_argument (argc, argv, "-taskstats"))) {
     remove_argument (N, &argc, argv);
+    status_scheduler();
     JobTaskLock();
     if (argc == 2) {
@@ -49 +36 @@
   }
 
+  checkController = FALSE;
+  if ((N = get_argument (argc, argv, "-c"))) {
+    remove_argument (N, &argc, argv);
+    checkController = TRUE;
+  }
+  if ((N = get_argument (argc, argv, "-control"))) {
+    remove_argument (N, &argc, argv);
+    checkController = TRUE;
+  }
+  if ((N = get_argument (argc, argv, "-controller"))) {
+    remove_argument (N, &argc, argv);
+    checkController = TRUE;
+  }
+
+  showJobs = FALSE;
+  if ((N = get_argument (argc, argv, "-jobs"))) {
+    remove_argument (N, &argc, argv);
+    showJobs = TRUE;
+  }
+
+  showDetails = FALSE;
+  if ((N = get_argument (argc, argv, "-info"))) {
+    remove_argument (N, &argc, argv);
+    showDetails = TRUE;
+  }
+  if ((N = get_argument (argc, argv, "-v"))) {
+    remove_argument (N, &argc, argv);
+    showDetails = TRUE;
+  }
+  if ((N = get_argument (argc, argv, "-details"))) {
+    remove_argument (N, &argc, argv);
+    showDetails = TRUE;
+  }
+  if ((N = get_argument (argc, argv, "-verbose"))) {
+    remove_argument (N, &argc, argv);
+    showDetails = TRUE;
+  }
+
+  status_scheduler();
+
+  JobTaskLock();
+  ListTasks (showDetails);
+  if (showJobs) {
+    ListJobs();
+  }
+  JobTaskUnlock();
+
+  if (checkController) {
+    ControlLock(__func__);
+    PrintControllerBusyJobs();
+    ControlUnlock(__func__);
+  }
+
+  gprint (GP_LOG, "\n");
+  return (TRUE);
+
+help:
+  gprint (GP_LOG, "USAGE: status [options]\n");
+  gprint (GP_LOG, "       (without options: show system status)\n");
+  gprint (GP_LOG, "       -c | -control | -controller      : add status of jobs on controller\n");
+  gprint (GP_LOG, "       -v | -verbose | -details | -info : add details for tasks\n");
+  gprint (GP_LOG, "       -taskstats                       : show timing statistics for tasks\n");
+  gprint (GP_LOG, "       -taskstatsreset                  : reset timing statistics for tasks\n");
+  return (FALSE);
+}
+
+int status_scheduler() {
+  
   gprint (GP_LOG, "\n");
   if (CheckTasksGetState()) {
@@ -64 +119 @@
     gprint (GP_LOG, " Controller is stopped\n");
   }
-
-  JobTaskLock();
-  ListTasks (FALSE);
-  ListJobs ();
-  JobTaskUnlock();
-
-  ControlLock(__func__);
-  PrintControllerBusyJobs();
-  ControlUnlock(__func__);
-
   return (TRUE);
-
-help:
-  gprint (GP_LOG, "USAGE: status [options]\n");
-  gprint (GP_LOG, "       (without options: over system status)\n");
-  gprint (GP_LOG, "       -tasks     : list defined tasks\n");
-  gprint (GP_LOG, "       -taskinfo  : details for tasks\n");
-  gprint (GP_LOG, "       -taskstats : processing statistics for tasks\n");
-  gprint (GP_LOG, "       -taskstatsreset : reset processing statistics for tasks\n");
-  return (FALSE);
 }