Changeset 42900

Timestamp:

Jun 18, 2025, 9:16:15 AM (13 months ago)

Author:

eugene

Message:

add output option to hoststats

Location:

tags/ipp-unions-20250528/Ohana/src/opihi

Files:

• pantasks/controller_hoststats.c (modified) (3 diffs)
• pantasks/test/hoststats.sh (added)
• pcontrol/hoststats.c (modified) (3 diffs)

tags/ipp-unions-20250528/Ohana/src/opihi/pantasks/controller_hoststats.c

@@ -4 +4 @@
 
   int N, status;
-  char command[1024];
   IOBuffer buffer;
 
@@ -13 +12 @@
   }
 
+  char *filename = NULL;
+  if ((N = get_argument (argc, argv, "-file"))) {
+    remove_argument (N, &argc, argv);
+    filename = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
   if (argc != 2) {
-    gprint (GP_ERR, "USAGE: controller hoststats (stack)\n");
+    gprint (GP_ERR, "USAGE: controller hoststats (stack) [-reset] [-file output]\n");
     gprint (GP_ERR, "       (stack) : all, idle, busy, done, down, off, resp\n");
+    FREE (filename);
     return (FALSE);
   }
@@ -23 +29 @@
   if (!status) {
     gprint (GP_LOG, "controller is not active\n");
+    FREE (filename);
     return (TRUE);
   }
 
   // XXX this has an error?  test this out...
-  if (Reset) {
-    sprintf (command, "hoststats %s -reset", argv[1]);
-  } else {
-    sprintf (command, "hoststats %s", argv[1]);
-  }
+  char *command = NULL;
+  strextend (&command, "hoststats %s", argv[1]);
+  if (Reset) { strextend (&command, " -reset"); }
+  if (filename) { strextend (&command, " -file %s", filename); }
+
   InitIOBuffer (&buffer, 0x100);
 
   status = ControllerCommand (command, CONTROLLER_PROMPT, &buffer);
+  free (command);
 
   if (status) {

tags/ipp-unions-20250528/Ohana/src/opihi/pcontrol/hoststats.c

@@ -13 +13 @@
   }
 
+  char *filename = NULL;
+  if ((N = get_argument (argc, argv, "-file"))) {
+    remove_argument (N, &argc, argv);
+    filename = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   if (argc != 2) {
-    gprint (GP_ERR, "USAGE: hoststats (stack) [-reset]\n");
+    gprint (GP_ERR, "USAGE: hoststats (stack) [-reset] [-file output]\n");
     gprint (GP_ERR, "       (stack) : all, idle, busy, done, down, off, resp\n");
+    FREE (filename);
     return (FALSE);
   }
@@ -22 +30 @@
   stack = GetHostStackByName (argv[1]);
   if (stack == NULL) {
-    gprint (GP_ERR, "hoststack not found\n");
+    gprint (GP_LOG, "hoststack not found\n");
+    FREE (filename);
     return (FALSE);
+  }
+
+  FILE *fout = NULL;
+  if (filename) {
+    fout = fopen (filename, "a");
+    if (!fout) {
+      gprint (GP_LOG, "error opening %s for output\n", filename);
+      FREE (filename);
+      return (FALSE);
+    }
   }
 
   /* print list */
   LockStack (stack);
-  gprint (GP_LOG, "Nhosts: %d\n", stack[0].Nobject);
+  if (filename) {
+    fprintf (fout, "Nhosts: %d\n", stack[0].Nobject);
+  } else {
+    gprint (GP_LOG, "Nhosts: %d\n", stack[0].Nobject);
+  }
   for (i = 0; i < stack[0].Nobject; i++) {
     host = stack[0].object[i];
-    gprint (GP_LOG, "%lld %s %d : %f %d %d %d\n", host[0].HostID, host[0].hostname, host[0].pid, host[0].read_time, host[0].read_N_Pclient, host[0].read_N_GetJobOutput, host[0].N_jobs_total);
+    if (filename) {
+      fprintf (fout, "%lld %s %d : %f %d %d %d\n", host[0].HostID, host[0].hostname, host[0].pid, host[0].read_time, host[0].read_N_Pclient, host[0].read_N_GetJobOutput, host[0].N_jobs_total);
+    } else {
+      gprint (GP_LOG, "%lld %s %d : %f %d %d %d\n", host[0].HostID, host[0].hostname, host[0].pid, host[0].read_time, host[0].read_N_Pclient, host[0].read_N_GetJobOutput, host[0].N_jobs_total);
+    }
     if (Reset) {
       host[0].read_time = 0.0;
@@ -41 +68 @@
   UnlockStack (stack);
 
+  if (filename) {
+    free (filename);
+    fclose (fout);
+  }
   return (TRUE);
 }