GitHub/istatserverlinux
1
0
Fork 0
mirror of https://github.com/bjango/istatserverlinux.git synced 2025-10-25 08:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with OpenSSL 1.1+ (#4)

Browse Source 
Process monitoring changes for Open/Net/Dragonfly BSD
Version bump to 3.02 (104)
This commit is contained in:
Bjango
2017-08-04 20:41:20 +10:00
parent 148a1163f9
commit 31c77a960c
10 changed files with 109 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/stats/StatsProcesses.cpp
View File

@@ -218,7 +218,7 @@ void StatsProcesses::update(long long sampleID, double totalTicks)
#elif defined(PROCESSES_KVM_DRAGONFLY)
p = kvm_getprocs(kd, KERN_PROC_ALL, sizeof(kinfo_proc), &n_processes);
#else
p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes);
#endif
for (i = 0; i < n_processes; i++) {
@@ -227,7 +227,11 @@ void StatsProcesses::update(long long sampleID, double totalTicks)
#elif defined(PROCESSES_KVM_OPENBSD) || defined(PROCESSES_KVM_NETBSD)
if (!((p[i].p_flag & P_SYSTEM)) && p[i].p_comm != NULL) {
#else
if (!((p[i].ki_flag & P_SYSTEM)) && p[i].ki_comm != NULL) {
if (p[i].ki_stat != 0) {
#ifdef TDF_IDLETD
if(p[i].ki_tdflags & TDF_IDLETD)
continue;
#endif
#endif
#if defined(PROCESSES_KVM_DRAGONFLY)

3
src/stats/StatsSensors.cpp
View File

@@ -223,6 +223,7 @@ void StatsSensors::init_dev_cpu()
label << "CPU " << x;
(*cur).label = label.str();
(*cur).method = 2;
(*cur).kind = 0;
}
}
}
@@ -254,6 +255,7 @@ void StatsSensors::init_acpi_thermal()
label << "Thermal Zone " << x;
(*cur).label = label.str();
(*cur).method = 4;
(*cur).kind = 0;
}
}
}
@@ -314,6 +316,7 @@ void StatsSensors::init_qnap()
{
(*cur).label = "Temperature";
(*cur).method = 3;
(*cur).kind = 0;
}
}