Sat Oct 15 12:14:00 2016 UTC ()

reduce the affinity column to just 5 chars for compact list


(jdolecek)

diff -r1.4 -r1.5 src/usr.sbin/intrctl/intrctl.c

--- src/usr.sbin/intrctl/intrctl.c 2016/10/15 12:06:27	1.4
+++ src/usr.sbin/intrctl/intrctl.c 2016/10/15 12:14:00	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intrctl.c,v 1.4 2016/10/15 12:06:27 jdolecek Exp $	*/
+/*	$NetBSD: intrctl.c,v 1.5 2016/10/15 12:14:00 jdolecek Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: intrctl.c,v 1.4 2016/10/15 12:06:27 jdolecek Exp $");
+__RCSID("$NetBSD: intrctl.c,v 1.5 2016/10/15 12:14:00 jdolecek Exp $");
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/intrio.h>
 #include <sys/types.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <paths.h>
 #include <sched.h>
 #include <stdint.h>
 @@ -157,27 +157,27 @@ intrctl_list(int argc, char **argv)
 			int len;
 			snprintf(buf, sizeof(buf), "%" PRIu64,
 			    illine->ill_cpu[i].illc_count);
 			len = (int)strlen(buf);
 			if (cpucol[i] < len)
 				cpucol[i] = len;
+		}
+	}
 	/* header */
 	printf("%-*s", (int)intridlen, "interrupt id");
 	if (compact) {
 		printf(" %20s ", "total");
-		printf(" %20s ", "affinity");
+		printf(" %5s ", "aff");
 	} else {
 		for (i = 0; i < ncpus; i++) {
 			snprintf(buf, sizeof(buf), "CPU%u", i);
 			printf("%*s  ", cpucol[i], buf);
+		}
+	}
 	printf("device name(s)\n");
 	/* body */
 	for (illine = intrctl_io_firstline(handle); illine != NULL;
 	    illine = intrctl_io_nextline(handle, illine)) {
 		struct intrio_list_line_cpu *illc;
 @@ -189,27 +189,27 @@ intrctl_list(int argc, char **argv)
 				illc = &illine->ill_cpu[i];
 				total += illc->illc_count;
 				if (illc->illc_assigned) {
 					asprintf(&affinity, "%s%s%d",
 					    oaffinity ? oaffinity : "",
 					    oaffinity ? ", " : "",
 					    i);
 					if (oaffinity)
 						free(oaffinity);
 					oaffinity = affinity;
+				}
+			}
 			printf("%20" PRIu64 " ", total);
-			printf("%20s ", affinity ? affinity : "none");
+			printf("%5s ", affinity ? affinity : "none");
 			free(affinity);
 		} else {
 			for (i = 0; i < ncpus; i++) {
 				illc = &illine->ill_cpu[i];
 				printf("%*" PRIu64 "%c ", cpucol[i], illc->illc_count,
 				    illc->illc_assigned ? '*' : ' ');
+			}
+		}
 		printf("%s\n", illine->ill_xname);
+	}
 	free(cpucol);
 	intrctl_io_free(handle);