Date: Mon, 30 Jun 2014 08:27:54 GMT From: zkorchev@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r270205 - soc2014/zkorchev/freebsd_head/usr.sbin/iostat Message-ID: <201406300827.s5U8RsHl022631@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zkorchev Date: Mon Jun 30 08:27:53 2014 New Revision: 270205 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270205 Log: fixed iostat -c Modified: soc2014/zkorchev/freebsd_head/usr.sbin/iostat/iostat.c Modified: soc2014/zkorchev/freebsd_head/usr.sbin/iostat/iostat.c ============================================================================== --- soc2014/zkorchev/freebsd_head/usr.sbin/iostat/iostat.c Mon Jun 30 08:01:03 2014 (r270204) +++ soc2014/zkorchev/freebsd_head/usr.sbin/iostat/iostat.c Mon Jun 30 08:27:53 2014 (r270205) @@ -452,7 +452,8 @@ #if defined(SOL_ON) sol_format = sol_init(&sol_stream); - if (sol_format) sol_map_start(&sol_stream); + if (sol_format && cflag) + sol_array_start(&sol_stream); #endif for (headercount = 1;;) { @@ -460,6 +461,10 @@ long tmp; long double etime; +#if defined(SOL_ON) + if (sol_format) sol_map_start(&sol_stream); +#endif + if (Tflag > 0) { if ((readvar(kd, "kern.tty_nin", X_TTY_NIN, &cur.tk_nin, sizeof(cur.tk_nin)) != 0) @@ -621,10 +626,16 @@ if (Cflag > 0) cpustats(); - printf("\n"); +#if defined(SOL_ON) + if (!sol_format) +#endif + printf("\n"); } fflush(stdout); +#if defined(SOL_ON) + if (sol_format) sol_map_end(&sol_stream); +#endif if (count >= 0 && --count <= 0) break; @@ -634,7 +645,7 @@ #if defined(SOL_ON) if (sol_format) { - sol_map_end(&sol_stream); + if (cflag) sol_array_end(&sol_stream); sol_term(&sol_stream); } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406300827.s5U8RsHl022631>