From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 20 Jul 2015 19:22:10 +0000 (+0000)
Subject: affinity.c: use printaddr and umove_or_printaddr
X-Git-Tag: v4.11~350
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a52375f7480cb2b285dd3f60134badb7e6b1e352;p=strace

affinity.c: use printaddr and umove_or_printaddr

* affinity.c (print_affinitylist): Use printaddr and umove_or_printaddr.
(sys_sched_getaffinity): Remove redundant u_rval check.
---

diff --git a/affinity.c b/affinity.c
index 286e15c7..1fcfa8f4 100644
--- a/affinity.c
+++ b/affinity.c
@@ -1,35 +1,40 @@
 #include "defs.h"
 
 static void
-print_affinitylist(struct tcb *tcp, long list, unsigned int len)
+print_affinitylist(struct tcb *tcp, const unsigned long addr, const unsigned int len)
 {
-	int first = 1;
-	unsigned long w, min_len;
+	unsigned long w;
+	const unsigned int size = len * sizeof(w);
+	const unsigned long end = addr + size;
+	unsigned long cur, abbrev_end;
 
-	if (abbrev(tcp) && len / sizeof(w) > max_strlen)
-		min_len = len - max_strlen * sizeof(w);
-	else
-		min_len = 0;
-	for (; len >= sizeof(w) && len > min_len;
-	     len -= sizeof(w), list += sizeof(w)) {
-		if (umove(tcp, list, &w) < 0)
-			break;
-		if (first)
-			tprints("{");
-		else
-			tprints(", ");
-		first = 0;
-		tprintf("%lx", w);
+	if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
+	    !addr || !len || size / sizeof(w) != len || end < addr) {
+		printaddr(addr);
+		return;
 	}
-	if (len) {
-		if (first)
-			tprintf("%#lx", list);
-		else
-			tprintf(", %s}", (len >= sizeof(w) && len > min_len ?
-				"???" : "..."));
+
+	if (abbrev(tcp)) {
+		abbrev_end = addr + max_strlen *  sizeof(w);
+		if (abbrev_end < addr)
+			abbrev_end = end;
 	} else {
-		tprints(first ? "{}" : "}");
+		abbrev_end = end;
+	}
+
+	tprints("[");
+	for (cur = addr; cur < end; cur += sizeof(w)) {
+		if (cur > addr)
+			tprints(", ");
+		if (cur >= abbrev_end) {
+			tprints("...");
+			break;
+		}
+		if (umove_or_printaddr(tcp, cur, &w))
+			break;
+		tprintf("%lx", w);
 	}
+	tprints("]");
 }
 
 SYS_FUNC(sched_setaffinity)
@@ -46,10 +51,7 @@ SYS_FUNC(sched_getaffinity)
 	if (entering(tcp)) {
 		tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]);
 	} else {
-		if (tcp->u_rval == -1)
-			tprintf("%#lx", tcp->u_arg[2]);
-		else
-			print_affinitylist(tcp, tcp->u_arg[2], tcp->u_rval);
+		print_affinitylist(tcp, tcp->u_arg[2], tcp->u_rval);
 	}
 	return 0;
 }