Merge branch 'Syllo:master' into master

Author: Alex313031

src/extract_gpuinfo_nvidia.c

@@ -933,6 +933,6 @@ static void gpuinfo_nvidia_get_running_processes(struct gpu_info *_gpu_info) {
   }
   // If the GPU is in MIG mode; process utilization is not supported
   if (!(IS_VALID(gpuinfo_multi_instance_mode_valid, gpu_info->base.dynamic_info.valid) &&
-        !gpu_info->base.dynamic_info.multi_instance_mode))
+        gpu_info->base.dynamic_info.multi_instance_mode))
     gpuinfo_nvidia_get_process_utilization(gpu_info, _gpu_info->processes_count, _gpu_info->processes);
 }

src/extract_gpuinfo_radeon.c

@@ -24,31 +24,22 @@
  *
  */
 
-#include "nvtop/common.h"
 #include "nvtop/device_discovery.h"
 #include "nvtop/extract_gpuinfo_common.h"
-#include "nvtop/extract_processinfo_fdinfo.h"
-#include "nvtop/time.h"
 #include <assert.h>
-
-#include <libdrm/radeon_drm.h>
-
 #include <dlfcn.h>
-
-#include <stdbool.h>
-#include <string.h>
 #include <errno.h>
-#include <limits.h>
+#include <fcntl.h>
 #include <inttypes.h>
-
+#include <libdrm/radeon_drm.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
 #include <unistd.h>
-
 #include <xf86drm.h>
 
-
-
 #ifndef RADEON_INFO_VRAM_USAGE
 #define RADEON_INFO_VRAM_USAGE          0x1e
 #endif
@@ -596,11 +587,11 @@ void gpuinfo_radeon_shutdown(void)
         _libdrm_drmFreeVersion(gpu_info->drm_device_lib_version);
 
 
-    if (gpu_info->fanSpeedFILE)
-      fclose(gpu_info->fanSpeedFILE);
+        if (gpu_info->fanSpeedFILE)
+          fclose(gpu_info->fanSpeedFILE);
 
-    nvtop_device_unref(gpu_info->amdgpuDevice);
-    nvtop_device_unref(gpu_info->hwmonDevice);
+        nvtop_device_unref(gpu_info->amdgpuDevice);
+        nvtop_device_unref(gpu_info->hwmonDevice);
 
     }
 
@@ -749,6 +740,8 @@ bool gpuinfo_radeon_get_device_handles(struct list_head *devices, unsigned *coun
             )
         {
 
+            _libdrm_drmFreeVersion(drm_device_driver_version);
+
             close(drm_device_node_fd);
 
             continue;

src/interface.c

@@ -202,6 +202,9 @@ static void free_device_windows(struct device_window *dwin) {
   delwin(dwin->temperature);
   delwin(dwin->fan_speed);
   delwin(dwin->pcie_info);
+  delwin(dwin->shader_cores);
+  delwin(dwin->l2_cache_size);
+  delwin(dwin->exec_engines);
 }
 
 static void alloc_process_with_option(struct nvtop_interface *interface, unsigned posX, unsigned posY, unsigned sizeX,
@@ -397,6 +400,7 @@ static void delete_all_windows(struct nvtop_interface *dwin) {
   delwin(dwin->process.option_window.option_win);
   for (size_t i = 0; i < dwin->num_plots; ++i) {
     delwin(dwin->plots[i].win);
+    delwin(dwin->plots[i].plot_window);
     free(dwin->plots[i].data);
   }
   free_setup_window(&dwin->setup_win);