From 48ac0edb8d30534ebdebc9500c3ceb27b59257dd Mon Sep 17 00:00:00 2001 From: Hans Rosenfeld Date: Sun, 9 Dec 2012 20:12:10 -0500 Subject: [PATCH] 3396 new psrinfo does not print socket type Reviewed by: Alek Pinchuk Reviewed by: Yuri Pankov Reviewed by: Albert Lee Reviewed by: Garrett D'Amore Approved by: Richard Lowe --- usr/src/cmd/psrinfo/psrinfo.c | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 { -- 2.11.4.GIT