diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-08-19 06:50:54 +0000 |
commit | ee7b0571c2c18bdec848ed2044223cc88db29bd8 (patch) | |
tree | b04f4bd7cd887f50e7d98af35f46b9834ff86c80 /usr.bin/vmstat | |
parent | ffda191e301f128a62c152fde92b692548367fca (diff) | |
parent | 15fc2873832ea5b9b639e701bbbf2e73af8b6a88 (diff) | |
download | src-test2-ee7b0571c2c18bdec848ed2044223cc88db29bd8.tar.gz src-test2-ee7b0571c2c18bdec848ed2044223cc88db29bd8.zip |
Notes
Diffstat (limited to 'usr.bin/vmstat')
-rw-r--r-- | usr.bin/vmstat/vmstat.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index c089dbfacbad..67f438efbc5f 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -80,7 +80,7 @@ static char da[] = "da"; static struct nlist namelist[] = { #define X_SUM 0 - { "_cnt" }, + { "_vm_cnt" }, #define X_HZ 1 { "_hz" }, #define X_STATHZ 2 @@ -259,8 +259,18 @@ main(int argc, char *argv[]) errx(1, "kvm_openfiles: %s", errbuf); } +retry_nlist: if (kd != NULL && (c = kvm_nlist(kd, namelist)) != 0) { if (c > 0) { + /* + * 'cnt' was renamed to 'vm_cnt'. If 'vm_cnt' is not + * found try looking up older 'cnt' symbol. + * */ + if (namelist[X_SUM].n_type == 0 && + strcmp(namelist[X_SUM].n_name, "_vm_cnt") == 0) { + namelist[X_SUM].n_name = "_cnt"; + goto retry_nlist; + } warnx("undefined symbols:"); for (c = 0; c < (int)(sizeof(namelist)/sizeof(namelist[0])); |