Merge branch 'testing'

Author: Syllo

CMakeLists.txt

@@ -91,6 +91,10 @@ add_custom_target(uninstall
 #                             TESTING                               #
 #///////////////////////////////////////////////////////////////////#
 
+
+if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+  option(BUILD_TESTING "Build tests" OFF)
+endif()
 include(CTest)
 add_subdirectory(tests)
 

include/nvtop/interface_layout_selection.h

@@ -11,17 +11,13 @@ struct window_position {
 };
 
 // Should be fine
-#define MAX_CHARTS 30
+#define MAX_CHARTS 64
 
-void compute_sizes_from_layout(
-    unsigned devices_count, unsigned device_header_rows,
-    unsigned device_header_cols, unsigned rows, unsigned cols,
-    const plot_info_to_draw to_draw[devices_count],
-    process_field_displayed process_field_displayed,
-    struct window_position device_positions[devices_count], unsigned *num_plots,
-    struct window_position plot_positions[MAX_CHARTS],
-    unsigned map_device_to_plot[devices_count],
-    struct window_position *process_position,
-    struct window_position *setup_position);
+void compute_sizes_from_layout(unsigned devices_count, unsigned device_header_rows, unsigned device_header_cols,
+                               unsigned rows, unsigned cols, const plot_info_to_draw *to_draw,
+                               process_field_displayed process_field_displayed,
+                               struct window_position *device_positions, unsigned *num_plots,
+                               struct window_position plot_positions[MAX_CHARTS], unsigned *map_device_to_plot,
+                               struct window_position *process_position, struct window_position *setup_position);
 
 #endif // INTERFACE_LAYOUT_SELECTION_H__

src/extract_gpuinfo_amdgpu.c

@@ -326,7 +326,7 @@ static bool gpuinfo_amdgpu_get_device_handles(
 
     int fd = -1;
 
-    for (unsigned int j = DRM_NODE_MAX - 1; j >= 0; j--) {
+    for (unsigned int j = DRM_NODE_MAX - 1;; j--) {
       if (!(1 << j & devs[i]->available_nodes))
         continue;
 
@@ -641,7 +641,8 @@ static void gpuinfo_amdgpu_populate_static_info(struct gpu_info *_gpu_info) {
   float maxLinkSpeedf;
   NreadPatterns = readValueFromFileAt(gpu_info->sysfsFD, "max_link_speed", "%f GT/s PCIe", &maxLinkSpeedf);
   if (NreadPatterns == 1 && IS_VALID(gpuinfo_max_link_width_valid, static_info->valid)) {
-    unsigned maxLinkSpeed = (unsigned)(floorf(maxLinkSpeedf));
+    maxLinkSpeedf = floorf(maxLinkSpeedf);
+    unsigned maxLinkSpeed = (unsigned)maxLinkSpeedf;
     unsigned pcieGen = pcieGenFromLinkSpeedAndWidth(maxLinkSpeed);
     if (pcieGen) {
       static_info->max_pcie_gen = pcieGen;
@@ -836,7 +837,7 @@ static bool is_drm_fd(int fd_dir_fd, const char *name) {
 }
 
 static ssize_t read_whole_file(int dirfd, const char *pathname, char **data) {
-  ssize_t read_size = 0;
+  size_t read_size = 0;
   size_t buf_size = 0;
   char *buf = NULL;
   int fd;

src/interface.c

@@ -1275,6 +1275,7 @@ print_processes_on_screen(all_processes all_procs,
               &process_print_buffer[process->offset_column]);
     unsigned row, col;
     getyx(win, row, col);
+    (void)col;
     if (row == write_at)
       wclrtoeol(win);
     last_line_printed = write_at;

src/interface_layout_selection.c

@@ -47,7 +47,7 @@ static bool who_to_merge(unsigned max_merge_size, unsigned plot_count, unsigned
       merge_ids[1] = notEmptyPlotIdx;
     }
   }
-  return smallest_merge != UCHAR_MAX;
+  return smallest_merge != UINT_MAX;
 }
 
 static bool move_plot_to_stack(unsigned stack_max_cols, unsigned plot_id,
@@ -243,21 +243,16 @@ static void balance_info_on_stacks_preserving_plot_order(
   }
 }
 
-void compute_sizes_from_layout(
-    unsigned devices_count, unsigned device_header_rows,
-    unsigned device_header_cols, unsigned rows, unsigned cols,
-    const plot_info_to_draw to_draw[devices_count],
-    process_field_displayed process_displayed,
-    struct window_position device_positions[devices_count], unsigned *num_plots,
-    struct window_position plot_positions[MAX_CHARTS],
-    unsigned map_device_to_plot[devices_count],
-    struct window_position *process_position,
-    struct window_position *setup_position) {
+void compute_sizes_from_layout(unsigned devices_count, unsigned device_header_rows, unsigned device_header_cols,
+                               unsigned rows, unsigned cols, const plot_info_to_draw *to_draw,
+                               process_field_displayed process_displayed, struct window_position *device_positions,
+                               unsigned *num_plots, struct window_position plot_positions[MAX_CHARTS],
+                               unsigned *map_device_to_plot, struct window_position *process_position,
+                               struct window_position *setup_position) {
 
   unsigned min_rows_for_header = 0, header_stacks = 0, num_device_per_row = 0;
   num_device_per_row = max(1, cols / device_header_cols);
-  header_stacks = devices_count / num_device_per_row +
-                  ((devices_count % num_device_per_row) > 0);
+  header_stacks = max(1, devices_count / num_device_per_row + ((devices_count % num_device_per_row) > 0));
   if (devices_count % header_stacks == 0)
     num_device_per_row = devices_count / header_stacks;
   min_rows_for_header = header_stacks * device_header_rows;
@@ -393,7 +388,7 @@ void compute_sizes_from_layout(
       rows_left_for_process = rows_for_plots - rows_per_stack * num_plot_stacks;
   } else {
     // No plot displayed, allocate the leftover space to the processes
-    if (process_field_displayed_count(process_displayed) > 0)
+    if (process_field_displayed_count(process_displayed) > 0 && rows_for_plots > 0)
       rows_for_process += rows_for_plots - 1;
   }
 

src/interface_options.c

@@ -23,6 +23,7 @@
 #include "ini.h"
 #include "nvtop/interface_common.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <libgen.h>
 #include <limits.h>
@@ -216,7 +217,8 @@ static int nvtop_option_ini_handler(void *user, const char *section,
     }
   }
   // Per-Device Sections
-  for (unsigned i = 0; i < ini_data->num_devices; ++i) {
+  assert(ini_data->num_devices < 1000 && "Not enough room for 1000 devices");
+  for (unsigned i = 0; i < ini_data->num_devices && i < 1000; ++i) {
     char gpu_section_name[sizeof(device_section) + 4];
     snprintf(gpu_section_name, sizeof(device_section) + 3, "%s%u",
              device_section, i);

src/plot.c

@@ -32,7 +32,7 @@ static inline int data_level(double rows, double data, double increment) {
 }
 
 void nvtop_line_plot(WINDOW *win, size_t num_data, const double *data,
-                     unsigned num_plots, bool legend_left,
+                     unsigned num_lines, bool legend_left,
                      char legend[MAX_LINES_PER_PLOT][PLOT_MAX_LEGEND_SIZE]) {
   if (num_data == 0)
     return;
@@ -41,13 +41,13 @@ void nvtop_line_plot(WINDOW *win, size_t num_data, const double *data,
   rows -= 1;
   double increment = 100. / (double)(rows);
 
-  assert(num_plots <= MAX_LINES_PER_PLOT && "Cannot plot more than " EXPAND_AND_QUOTE(MAX_LINES_PER_PLOT) " lines");
+  assert(num_lines <= MAX_LINES_PER_PLOT && "Cannot plot more than " EXPAND_AND_QUOTE(MAX_LINES_PER_PLOT) " lines");
   unsigned lvl_before[MAX_LINES_PER_PLOT];
-  for (size_t k = 0; k < num_plots; ++k)
+  for (size_t k = 0; k < num_lines; ++k)
     lvl_before[k] = data_level(rows, data[k], increment);
 
-  for (size_t i = 0; i < num_data || i < (size_t)cols; i += num_plots) {
-    for (unsigned k = 0; k < num_plots; ++k) {
+  for (size_t i = 0; i < num_data || i < (size_t)cols; i += num_lines) {
+    for (unsigned k = 0; k < num_lines; ++k) {
       unsigned lvl_now_k = data_level(rows, data[i + k], increment);
       wcolor_set(win, k + 1, NULL);
       // Three cases: has increased, has decreased and remained level
@@ -69,7 +69,7 @@ void nvtop_line_plot(WINDOW *win, size_t num_data, const double *data,
         }
 
         // Draw the continuation of the other metrics
-        for (unsigned j = 0; j < num_plots; ++j) {
+        for (unsigned j = 0; j < num_lines; ++j) {
           if (j != k) {
             if (lvl_before[j] == top)
               // The continuation is at the same level as the bottom corner
@@ -92,7 +92,7 @@ void nvtop_line_plot(WINDOW *win, size_t num_data, const double *data,
       } else {
         // Case 3: stayed level
         mvwhline(win, lvl_now_k, i + k, 0, 1);
-        for (unsigned j = 0; j < num_plots; ++j) {
+        for (unsigned j = 0; j < num_lines; ++j) {
           if (j != k) {
             if (lvl_before[j] != lvl_now_k) {
               // Add the continuation of other metric lines
@@ -107,21 +107,19 @@ void nvtop_line_plot(WINDOW *win, size_t num_data, const double *data,
     }
   }
   int plot_y_position = 0;
-  for (unsigned i = 0; i < num_plots && plot_y_position < rows; ++i) {
-    if (legend[i]) {
-      wcolor_set(win, i + 1, NULL);
-      if (legend_left) {
-        mvwprintw(win, plot_y_position, 0, "%.*s", cols, legend[i]);
+  for (unsigned i = 0; i < num_lines && plot_y_position < rows; ++i) {
+    wcolor_set(win, i + 1, NULL);
+    if (legend_left) {
+      mvwprintw(win, plot_y_position, 0, "%.*s", cols, legend[i]);
+    } else {
+      size_t length = strlen(legend[i]);
+      if (length <= (size_t)cols) {
+        mvwprintw(win, plot_y_position, cols - length, "%s", legend[i]);
       } else {
-        size_t length = strlen(legend[i]);
-        if (length <= (size_t)cols) {
-          mvwprintw(win, plot_y_position, cols - length, "%s", legend[i]);
-        } else {
-          mvwprintw(win, plot_y_position, 0, "%.*s", length - cols, legend[i]);
-        }
+        mvwprintw(win, plot_y_position, 0, "%.*s", length - cols, legend[i]);
       }
-      plot_y_position++;
     }
+    plot_y_position++;
   }
 }
 

tests/CMakeLists.txt

@@ -1,5 +1,8 @@
 find_package(GTest)
 if (BUILD_TESTING AND GTest_FOUND)
+
+  option(THOROUGH_TESTING "Enable extensive testing (takes hours, e.g., use once per release)" OFF)
+
   # Create a library for testing
   add_library(testLib
     ${PROJECT_SOURCE_DIR}/src/interface_layout_selection.c
@@ -18,4 +21,9 @@ if (BUILD_TESTING AND GTest_FOUND)
   target_link_libraries(interfaceTests PRIVATE testLib GTest::gtest_main)
   gtest_discover_tests(interfaceTests)
 
+  if (THOROUGH_TESTING)
+    target_compile_definitions(interfaceTests PRIVATE THOROUGH_TESTING)
+  endif()
+
+
 endif()