zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

htop crashes on Solaris 11.4 due to missing ZFS ARC kstats

This commit is contained in:
senjan 2020-09-18 21:13:51 +02:00 committed by cgzones
parent 5ea13e7ea9
commit 543286256e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
solaris/SolarisProcessList.c
View File

@ -202,8 +202,8 @@ static inline void SolarisProcessList_scanZfsArcstats(ProcessList* pl) {
int ksrphyserr = -1; int ksrphyserr = -1;
kstat_named_t *cur_kstat = NULL; kstat_named_t *cur_kstat = NULL;
if (spl->kd != NULL) { arcstats = kstat_lookup(spl->kd,"zfs",0,"arcstats"); } if (spl->kd != NULL) { arcstats = kstat_lookup(spl->kd, "zfs", 0, "arcstats"); }
if (arcstats != NULL) { ksrphyserr = kstat_read(spl->kd,arcstats,NULL); } if (arcstats != NULL) { ksrphyserr = kstat_read(spl->kd, arcstats, NULL); }
if (ksrphyserr != -1) { if (ksrphyserr != -1) {
cur_kstat = kstat_data_lookup( arcstats, "size" ); cur_kstat = kstat_data_lookup( arcstats, "size" );
spl->zfs.size = cur_kstat->value.ui64 / 1024; spl->zfs.size = cur_kstat->value.ui64 / 1024;
@ -213,19 +213,19 @@ static inline void SolarisProcessList_scanZfsArcstats(ProcessList* pl) {
spl->zfs.max = cur_kstat->value.ui64 / 1024; spl->zfs.max = cur_kstat->value.ui64 / 1024;
cur_kstat = kstat_data_lookup( arcstats, "mfu_size" ); cur_kstat = kstat_data_lookup( arcstats, "mfu_size" );
spl->zfs.MFU = cur_kstat->value.ui64 / 1024; spl->zfs.MFU = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
cur_kstat = kstat_data_lookup( arcstats, "mru_size" ); cur_kstat = kstat_data_lookup( arcstats, "mru_size" );
spl->zfs.MRU = cur_kstat->value.ui64 / 1024; spl->zfs.MRU = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
cur_kstat = kstat_data_lookup( arcstats, "anon_size" ); cur_kstat = kstat_data_lookup( arcstats, "anon_size" );
spl->zfs.anon = cur_kstat->value.ui64 / 1024; spl->zfs.anon = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
cur_kstat = kstat_data_lookup( arcstats, "hdr_size" ); cur_kstat = kstat_data_lookup( arcstats, "hdr_size" );
spl->zfs.header = cur_kstat->value.ui64 / 1024; spl->zfs.header = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
cur_kstat = kstat_data_lookup( arcstats, "other_size" ); cur_kstat = kstat_data_lookup( arcstats, "other_size" );
spl->zfs.other = cur_kstat->value.ui64 / 1024; spl->zfs.other = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
if ((cur_kstat = kstat_data_lookup( arcstats, "compressed_size" )) != NULL) { if ((cur_kstat = kstat_data_lookup( arcstats, "compressed_size" )) != NULL) {
spl->zfs.compressed = cur_kstat->value.ui64 / 1024; spl->zfs.compressed = cur_kstat->value.ui64 / 1024;