mirror of
https://github.com/Syllo/nvtop.git
synced 2026-06-11 23:44:24 -04:00
Fix typos across documentation and source
- Correct dependency spelling in README for multiple distro instructions @README.markdown#193-276 - Clean up misspellings in CMake helpers and GPU info sources (temperature, PCIe, queries, etc.) @cmake/modules/FindCurses.cmake#50-58 @cmake/modules/sanitize-helpers.cmake#103-118 @src/extract_gpuinfo_amdgpu.c#444-637 @src/extract_gpuinfo_intel.c#225-234 @src/extract_gpuinfo_metax.c#100-512 @src/nvtop.c#70-77 - Fix header comments and struct field names for allocations, callbacks, and utilize fields @src/extract_processinfo_fdinfo.c#97-104 @include/nvtop/common.h#44-52 @include/nvtop/extract_processinfo_fdinfo.h#59-63 @include/ascend/dcmi_interface_api.h#75-455 @include/nvtop/interface_options.h#43-54 @src/interface.c#792-800 Author: rezky_nightky <with.rezky@gmail.com> Timestamp: 2025-12-01T18:21:25Z Repository: nvtop Branch: master Signing: GPG (989AF9F0) Performance: 13 files, +31/-31 lines
This commit is contained in:
committed by
Maxime Schmitt
parent
c48d0586bc
commit
cb7babefb3
@@ -196,11 +196,11 @@ sudo apt install nvtop
|
||||
sudo apt install libudev-dev
|
||||
```
|
||||
|
||||
- NVIDIA Depenency
|
||||
- NVIDIA Dependency
|
||||
- NVIDIA drivers (see [Ubuntu Wiki](https://help.ubuntu.com/community/BinaryDriverHowto/Nvidia) or [Ubuntu PPA](https://launchpad.net/~graphics-drivers/+archive/ubuntu/ppa) or [Debian Wiki](https://wiki.debian.org/NvidiaGraphicsDrivers#NVIDIA_Proprietary_Driver))
|
||||
|
||||
- NVTOP Dependencies
|
||||
- CMake, ncurses and Git
|
||||
- CMake, ncurses and Git
|
||||
```bash
|
||||
sudo apt install cmake libncurses5-dev libncursesw5-dev git
|
||||
```
|
||||
@@ -240,11 +240,11 @@ A standalone application is available as [AppImage](#appimage).
|
||||
sudo dnf install libdrm-devel systemd-devel
|
||||
```
|
||||
|
||||
- NVIDIA Depenency
|
||||
- NVIDIA Dependency
|
||||
- NVIDIA drivers, **CUDA required for nvml libraries** (see [RPM Fusion](https://rpmfusion.org/Howto/NVIDIA))
|
||||
|
||||
- NVTOP Dependencies
|
||||
- CMake, ncurses, C++ and Git
|
||||
- CMake, ncurses, C++ and Git
|
||||
```bash
|
||||
sudo dnf install cmake ncurses-devel git gcc-c++
|
||||
```
|
||||
@@ -258,12 +258,12 @@ A standalone application is available as an [AppImage](#appimage).
|
||||
|
||||
Build process for OpenSUSE:
|
||||
|
||||
- AMD Dependecy
|
||||
- AMD Dependency
|
||||
```bash
|
||||
sudo zypper install libdrm-devel
|
||||
```
|
||||
|
||||
- NVIDIA Depenency
|
||||
- NVIDIA Dependency
|
||||
- NVIDIA drivers (see [SUSE Support Database](https://en.opensuse.org/SDB:NVIDIA_drivers))
|
||||
|
||||
- NVTOP Dependencies
|
||||
|
||||
@@ -53,7 +53,7 @@ if(NOT CURSES_NEED_WIDE)
|
||||
set(NCURSES_LIBRARY_NAME "ncurses")
|
||||
else()
|
||||
set(NCURSES_LIBRARY_NAME "ncursesw")
|
||||
# Also, if we are searchig fo wide curses - we are actually searching
|
||||
# Also, if we are searching for wide curses - we are actually searching
|
||||
# for ncurses, we don't know about any other unicode version.
|
||||
set(CURSES_NEED_NCURSES TRUE)
|
||||
endif()
|
||||
|
||||
@@ -106,7 +106,7 @@ function (sanitizer_check_compiler_flags FLAG_CANDIDATES NAME PREFIX)
|
||||
|
||||
get_property(ENABLED_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
|
||||
foreach (LANG ${ENABLED_LANGUAGES})
|
||||
# Sanitizer flags are not dependend on language, but the used compiler.
|
||||
# Sanitizer flags are not dependent on language, but the used compiler.
|
||||
# So instead of searching flags foreach language, search flags foreach
|
||||
# compiler used.
|
||||
set(COMPILER ${CMAKE_${LANG}_COMPILER_ID})
|
||||
|
||||
@@ -82,7 +82,7 @@ extern "C" {
|
||||
unsigned long hugepagesize; /* unit:KB */
|
||||
unsigned long hugepages_total;
|
||||
unsigned long hugepages_free;
|
||||
unsigned int utiliza; /* ddr memory info usages */
|
||||
unsigned int utilize; /* ddr memory info usages */
|
||||
unsigned char reserve[60]; /* the size of dcmi_memory_info is 96 */
|
||||
};
|
||||
|
||||
@@ -447,7 +447,7 @@ extern "C" {
|
||||
struct dcmi_memory_info_stru {
|
||||
unsigned long long memory_size;
|
||||
unsigned int freq;
|
||||
unsigned int utiliza;
|
||||
unsigned int utilize;
|
||||
};
|
||||
|
||||
DCMIDLLEXPORT int dcmi_get_memory_info(int card_id, int device_id, struct dcmi_memory_info_stru *device_memory_info);
|
||||
@@ -464,4 +464,4 @@ extern "C" {
|
||||
#endif
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __DCMI_INTERFACE_API_H__ */
|
||||
#endif /* __DCMI_INTERFACE_API_H__ */
|
||||
|
||||
@@ -42,7 +42,7 @@ static void *nvtop_reallocarray__(void *ptr, size_t nmemb, size_t size) {
|
||||
#endif // !defined(HAS_REALLOCARRAY)
|
||||
|
||||
// Increment for the number of tracked processes
|
||||
// 16 has been experimentally selected for being small while avoiding multipe allocations in most common cases
|
||||
// 16 has been experimentally selected for being small while avoiding multiple allocations in most common cases
|
||||
#define COMMON_PROCESS_LINEAR_REALLOC_INC 16
|
||||
|
||||
#define MAX_LINES_PER_PLOT 4
|
||||
|
||||
@@ -57,8 +57,8 @@ void processinfo_drop_callback(const struct gpu_info *info);
|
||||
void processinfo_enable_disable_callback_for(const struct gpu_info *info, bool enable);
|
||||
|
||||
/**
|
||||
* @brief Scann all the processes in /proc. Call the registered callbacks on
|
||||
* each file descriptor to the DRM driver that can successfully be oppened. If a
|
||||
* @brief Scan all the processes in /proc. Call the registered callbacks on
|
||||
* each file descriptor to the DRM driver that can successfully be opened. If a
|
||||
* callback succeeds, the gpu_info structure processes array will be updated
|
||||
* with the retrieved data.
|
||||
*/
|
||||
|
||||
@@ -50,7 +50,7 @@ typedef struct nvtop_interface_option_struct {
|
||||
bool show_startup_messages; // True to show the startup messages
|
||||
bool filter_nvtop_pid; // Do not show nvtop pid in the processes list
|
||||
bool has_monitored_set_changed; // True if the set of monitored gpu was modified through the interface
|
||||
bool has_gpu_info_bar; // Show info bar with additional GPU parametres
|
||||
bool has_gpu_info_bar; // Show info bar with additional GPU parameters
|
||||
bool hide_processes_list; // Hide processes list
|
||||
} nvtop_interface_option;
|
||||
|
||||
|
||||
@@ -451,7 +451,7 @@ static bool gpuinfo_amdgpu_get_device_handles(struct list_head *devices, unsigne
|
||||
last_libdrm_return_status =
|
||||
_amdgpu_device_initialize(fd, &drm_major, &drm_minor, &gpu_infos[amdgpu_count].amdgpu_device);
|
||||
} else {
|
||||
// TODO: radeon suppport here
|
||||
// TODO: radeon support here
|
||||
assert(false);
|
||||
}
|
||||
|
||||
@@ -612,20 +612,20 @@ static void gpuinfo_amdgpu_populate_static_info(struct gpu_info *_gpu_info) {
|
||||
// If multiple fans are present, use the first one. Some hardware do not wire
|
||||
// the sensor for the second fan, or use the same value as the first fan.
|
||||
|
||||
// Critical temparature
|
||||
// Critical temperature
|
||||
// temp1_* files should always be the GPU die in millidegrees Celsius
|
||||
if (gpu_info->hwmonDevice) {
|
||||
unsigned criticalTemp;
|
||||
int NreadPatterns = readAttributeFromDevice(gpu_info->hwmonDevice, "temp1_crit", "%u", &criticalTemp);
|
||||
if (NreadPatterns == 1) {
|
||||
int nReadPatterns = readAttributeFromDevice(gpu_info->hwmonDevice, "temp1_crit", "%u", &criticalTemp);
|
||||
if (nReadPatterns == 1) {
|
||||
SET_GPUINFO_STATIC(static_info, temperature_slowdown_threshold, criticalTemp);
|
||||
}
|
||||
|
||||
// Emergency/shutdown temparature
|
||||
unsigned emergemcyTemp;
|
||||
NreadPatterns = readAttributeFromDevice(gpu_info->hwmonDevice, "temp1_emergency", "%u", &emergemcyTemp);
|
||||
if (NreadPatterns == 1) {
|
||||
SET_GPUINFO_STATIC(static_info, temperature_shutdown_threshold, emergemcyTemp);
|
||||
// Emergency/shutdown temperature
|
||||
unsigned emergencyTemp;
|
||||
nReadPatterns = readAttributeFromDevice(gpu_info->hwmonDevice, "temp1_emergency", "%u", &emergencyTemp);
|
||||
if (nReadPatterns == 1) {
|
||||
SET_GPUINFO_STATIC(static_info, temperature_shutdown_threshold, emergencyTemp);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -224,7 +224,7 @@ void gpuinfo_intel_refresh_dynamic_info(struct gpu_info *_gpu_info) {
|
||||
|
||||
RESET_ALL(dynamic_info->valid);
|
||||
|
||||
// We are creating new devices because the device_get_sysattr_value caches its querries
|
||||
// We are creating new devices because the device_get_sysattr_value caches its queries
|
||||
const char *syspath;
|
||||
nvtop_device *card_dev_noncached = NULL;
|
||||
if (nvtop_device_get_syspath(gpu_info->card_device, &syspath) >= 0)
|
||||
|
||||
@@ -97,7 +97,7 @@ typedef enum {
|
||||
static mxSmlReturn_t (*mxSmlGetTemperatureInfo)(unsigned int deviceId, mxSmlTemperatureSensors_t sensorType,
|
||||
int *temp);
|
||||
|
||||
// Dynamic infomation extraction
|
||||
// Dynamic information extraction
|
||||
typedef enum {
|
||||
MXSML_Clock_Dla = 1, //!< Valid for N-class device
|
||||
MXSML_Clock_Mc = 2, //!< Valid for N-class device
|
||||
@@ -493,7 +493,7 @@ static void gpuinfo_metax_refresh_dynamic_info(struct gpu_info *_gpu_info) {
|
||||
SET_GPUINFO_DYNAMIC(dynamic_info, mem_util_rate, memory_info.visVramUse * 100 / memory_info.visVramTotal);
|
||||
}
|
||||
|
||||
// Pcie generation and width used by the device
|
||||
// PCIe generation and width used by the device
|
||||
mxSmlPcieInfo_t pcieInfo;
|
||||
last_mxsml_return_status = mxSmlGetPcieInfo(deviceId, &pcieInfo);
|
||||
if (last_mxsml_return_status == MXSML_SUCCESS) {
|
||||
@@ -509,7 +509,7 @@ static void gpuinfo_metax_refresh_dynamic_info(struct gpu_info *_gpu_info) {
|
||||
}
|
||||
}
|
||||
|
||||
// Pcie eception and transmission throughput
|
||||
// PCIe reception and transmission throughput
|
||||
mxSmlPcieThroughput_t pcieThroughput;
|
||||
last_mxsml_return_status = mxSmlGetPcieThroughput(deviceId, &pcieThroughput);
|
||||
if (last_mxsml_return_status == MXSML_SUCCESS) {
|
||||
|
||||
@@ -95,7 +95,7 @@ static bool is_drm_fd(int fd_dir_fd, const char *name) {
|
||||
}
|
||||
|
||||
// Increment for the number DRM FD tracked per process
|
||||
// 8 has been experimentally selected for being small while avoiding multipe allocations in most common cases
|
||||
// 8 has been experimentally selected for being small while avoiding multiple allocations in most common cases
|
||||
#define DRM_FD_LINEAR_REALLOC_INC 8
|
||||
|
||||
void processinfo_sweep_fdinfos(void) {
|
||||
|
||||
@@ -789,7 +789,7 @@ static void draw_devices(struct list_head *devices, struct nvtop_interface *inte
|
||||
mvwchgat(dev->power_info, 0, 0, 3, 0, cyan_color, NULL);
|
||||
wnoutrefresh(dev->power_info);
|
||||
|
||||
// PICe throughput
|
||||
// PCIe throughput
|
||||
werase(dev->pcie_info);
|
||||
if (device->static_info.integrated_graphics) {
|
||||
wcolor_set(dev->pcie_info, cyan_color, NULL);
|
||||
|
||||
@@ -69,7 +69,7 @@ static const char helpstring[] = "Available options:\n"
|
||||
" -C --no-color : No colors\n"
|
||||
"line information\n"
|
||||
" -f --freedom-unit : Use fahrenheit\n"
|
||||
" -i --gpu-info : Show bar with additional GPU parametres\n"
|
||||
" -i --gpu-info : Show bar with additional GPU parameters\n"
|
||||
" -E --encode-hide : Set encode/decode auto hide time in seconds "
|
||||
"(default 30s, negative = always on screen)\n"
|
||||
" -h --help : Print help and exit\n"
|
||||
|
||||
Reference in New Issue
Block a user