diff options
| author | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2012-12-09 20:12:10 -0500 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2012-12-10 16:32:38 -0500 |
| commit | 48ac0edb8d30534ebdebc9500c3ceb27b59257dd (patch) | |
| tree | 427dbba2527c825228043d0a869d11362b03553d | |
| parent | f5c2e7ea56aaa46a9976476fb0cb1f02b9426f07 (diff) | |
| download | illumos-joyent-48ac0edb8d30534ebdebc9500c3ceb27b59257dd.tar.gz | |
3396 new psrinfo does not print socket type
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@gmail.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/cmd/psrinfo/psrinfo.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/usr/src/cmd/psrinfo/psrinfo.c b/usr/src/cmd/psrinfo/psrinfo.c index 7488933901..6a3be82296 100644 --- a/usr/src/cmd/psrinfo/psrinfo.c +++ b/usr/src/cmd/psrinfo/psrinfo.c @@ -11,6 +11,7 @@ /* * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. */ /* @@ -97,6 +98,7 @@ struct vcpu { long v_pchip_id; /* 1 per socket */ char *v_impl; char *v_brand; + char *v_socket; long v_core_id; /* n per chip_id */ }; @@ -268,6 +270,9 @@ print_vp(int nspec) if (((len = strlen(vcpu->v_brand)) != 0) && (strncmp(vcpu->v_brand, vcpu->v_impl, len) != 0)) (void) printf("\t%s", vcpu->v_brand); + if (strcmp(vcpu->v_socket, "Unknown") != 0) + (void) printf("\t[ %s: %s ]", _("Socket"), + vcpu->v_socket); (void) putchar('\n'); } else { for (l2 = chip->p_cores; l2; l2 = l2->l_next) { @@ -507,6 +512,12 @@ main(int argc, char **argv) vc->v_brand = mystrdup(knp->value.str.addr.ptr); } + if ((knp = kstat_data_lookup(ksp, "socket_type")) == NULL) { + vc->v_socket = "Unknown"; + } else { + vc->v_socket = mystrdup(knp->value.str.addr.ptr); + } + if ((knp = kstat_data_lookup(ksp, "implementation")) == NULL) { vc->v_impl = _("(unknown)"); } else { |