From owner-svn-src-all@freebsd.org Wed Jan 17 16:55:37 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50D12E7AE78; Wed, 17 Jan 2018 16:55:37 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2BF2277A33; Wed, 17 Jan 2018 16:55:37 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 612D112224; Wed, 17 Jan 2018 16:55:36 +0000 (UTC) (envelope-from fabient@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0HGtaAv075278; Wed, 17 Jan 2018 16:55:36 GMT (envelope-from fabient@FreeBSD.org) Received: (from fabient@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0HGtaeN075277; Wed, 17 Jan 2018 16:55:36 GMT (envelope-from fabient@FreeBSD.org) Message-Id: <201801171655.w0HGtaeN075277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fabient set sender to fabient@FreeBSD.org using -f From: Fabien Thomas Date: Wed, 17 Jan 2018 16:55:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328088 - head/usr.sbin/pmcstat X-SVN-Group: head X-SVN-Commit-Author: fabient X-SVN-Commit-Paths: head/usr.sbin/pmcstat X-SVN-Commit-Revision: 328088 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jan 2018 16:55:37 -0000 Author: fabient Date: Wed Jan 17 16:55:35 2018 New Revision: 328088 URL: https://svnweb.freebsd.org/changeset/base/328088 Log: Only call flush in pipe mode. It fixes a crash with a socket in top mode. Ex: # pmcstat -R 127.0.0.1:8080 -T -w1 then # pmcstat -n1 -Sclock.prof -Slock.failed -O 127.0.0.1:8080 MFC after: 1 week Sponsored by: Stormshield Modified: head/usr.sbin/pmcstat/pmcstat.c Modified: head/usr.sbin/pmcstat/pmcstat.c ============================================================================== --- head/usr.sbin/pmcstat/pmcstat.c Wed Jan 17 16:41:22 2018 (r328087) +++ head/usr.sbin/pmcstat/pmcstat.c Wed Jan 17 16:55:35 2018 (r328088) @@ -1350,6 +1350,7 @@ main(int argc, char **argv) } /* print out counting PMCs */ if ((args.pa_flags & FLAG_DO_TOP) && + (args.pa_flags & FLAG_HAS_PIPE) && pmc_flush_logfile() == 0) do_read = 1; do_print = 1;