[src/trunk]: src/sys/arch/sparc/sparc in xcall(), use a (static) errbuf if we...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e6e78885bc5b
branches:  trunk
changeset: 761652:e6e78885bc5b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Feb 04 09:23:00 2011 +0000

description:
in xcall(), use a (static) errbuf if we timeout, so we can build the whole
message up for a single call to printf_nolog().  this should get rid of
these messages that report no cpus answered.  eg:

        xcall(cpu0,0xf000868c): couldn't ping cpus:
vs
        xcall(cpu0,0xf000868c): couldn't ping cpus: cpu1

diffstat:

 sys/arch/sparc/sparc/cpu.c |  24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diffs (74 lines):

diff -r 5caae447bde8 -r e6e78885bc5b sys/arch/sparc/sparc/cpu.c
--- a/sys/arch/sparc/sparc/cpu.c        Fri Feb 04 07:44:53 2011 +0000
+++ b/sys/arch/sparc/sparc/cpu.c        Fri Feb 04 09:23:00 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.227 2011/01/27 06:24:59 mrg Exp $ */
+/*     $NetBSD: cpu.c,v 1.228 2011/02/04 09:23:00 mrg Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.227 2011/01/27 06:24:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.228 2011/02/04 09:23:00 mrg Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
@@ -638,6 +638,9 @@
        u_int pil;
        int fasttrap;
        int is_noop = func == (xcall_func_t)sparc_noop;
+       static char errbuf[160];
+       char *bufp = errbuf;
+       size_t bufsz = sizeof errbuf, wrsz;
 
        mybit = (1 << cpuinfo.ci_cpuid);
        callself = func && (cpuset & mybit) != 0;
@@ -702,7 +705,6 @@
        /*
         * Second, call ourselves.
         */
-       p = &cpuinfo.msg.u.xpmsg_func;
        if (callself)
                (*func)(arg0, arg1, arg2);
 
@@ -715,8 +717,11 @@
        i = 100000;     /* time-out, not too long, but still an _AGE_ */
        while (!done) {
                if (--i < 0) {
-                       printf_nolog("xcall(cpu%d,%p): couldn't ping cpus:",
+                       wrsz = snprintf(bufp, bufsz,
+                           "xcall(cpu%d,%p): couldn't ping cpus:",
                            cpu_number(), func);
+                       bufsz -= wrsz;
+                       bufp += wrsz;
                }
 
                done = 1;
@@ -726,7 +731,13 @@
 
                        if (cpi->msg.complete == 0) {
                                if (i < 0) {
-                                       printf_nolog(" cpu%d", cpi->ci_cpuid);
+                                       wrsz = snprintf(bufp, bufsz,
+                                                       " cpu%d", cpi->ci_cpuid);
+                                       bufsz -= wrsz;
+                                       bufp += wrsz;
+                                       /* insanity */
+                                       if (bufsz < 0)
+                                               break;
                                } else {
                                        done = 0;
                                        break;
@@ -735,8 +746,7 @@
                }
        }
        if (i < 0)
-               printf_nolog("\n");
-
+               printf_nolog("%s\n", errbuf);
        mutex_spin_exit(&xpmsg_mutex);
 }