New interface placement algorithm.

1 files changed, 6 insertions, 19 deletions

diff --git a/src/nvtop.c b/src/nvtop.c
index 8f352fe..3f78be8 100644
--- a/src/nvtop.c
+++ b/src/nvtop.c
@@ -52,8 +52,7 @@ static const char helpstring[] =
 "  -v --version      : Print the version and exit\n"
 "  -s --gpu-select   : Column separated list of GPU IDs to monitor\n"
 "  -i --gpu-ignore   : Column separated list of GPU IDs to ignore\n"
-"  -p --max-gpu-plot : Show only one bar plot corespondong to the maximum of all GPUs\n"
-"  -P --no-plot      : Disable bar plot"
+"  -p --no-plot      : Disable bar plot\n"
 "  -C --no-color     : No colors\n"
 "  -N --no-cache     : Always query the system for user names and command line information\n"
 "  -f --freedom-unit : Use fahrenheit\n"
@@ -125,21 +124,15 @@ static const struct option long_opts[] = {
     .val = 'E'
   },
   {
-    .name = "max-gpu-plot",
-    .has_arg = no_argument,
-    .flag = NULL,
-    .val = 'p'
-  },
-  {
     .name = "no-plot",
     .has_arg = no_argument,
     .flag = NULL,
-    .val = 'P'
+    .val = 'p'
   },
   {0,0,0,0},
 };
 
-static const char opts[] = "hvd:s:i:CNfE:pP";
+static const char opts[] = "hvd:s:i:CNfE:p";
 
 static size_t update_mask_value(const char *str, size_t entry_mask, bool addTo) {
   char *saveptr;
@@ -179,9 +172,8 @@ int main (int argc, char **argv) {
   bool use_color_if_available = true;
   bool cache_pid_infos = true;
   bool use_fahrenheit = false;
-  bool show_per_gpu_plot = true;
+  bool show_plot = true;
   double encode_decode_hide_time = 30.;
-  char *interface_layout = "CNPN";
   while (true) {
     int optchar = getopt_long(argc, argv, opts, long_opts, NULL);
     if (optchar == -1)
@@ -231,12 +223,8 @@ int main (int argc, char **argv) {
           }
         }
         break;
-      case 'P':
-        interface_layout = "PN";
-        show_per_gpu_plot = false;
-        break;
       case 'p':
-        show_per_gpu_plot = false;
+        show_plot = false;
         break;
       case ':':
       case '?':
@@ -304,8 +292,7 @@ int main (int argc, char **argv) {
   }
   struct nvtop_interface *interface = initialize_curses(
       num_devices, biggest_name, use_color_if_available, use_fahrenheit,
-      show_per_gpu_plot, encode_decode_hide_time, refresh_interval,
-      interface_layout);
+      show_plot, encode_decode_hide_time, refresh_interval);
   timeout(refresh_interval);
 
   double time_slept = refresh_interval;