From owner-svn-src-all@FreeBSD.ORG  Sun Apr 29 22:19:59 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30DB1106564A;
	Sun, 29 Apr 2012 22:19:59 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1C3998FC1A;
	Sun, 29 Apr 2012 22:19:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3TMJwOu035081;
	Sun, 29 Apr 2012 22:19:58 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3TMJwkw035078;
	Sun, 29 Apr 2012 22:19:58 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201204292219.q3TMJwkw035078@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 29 Apr 2012 22:19:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234819 - head/lib/libc/gmon
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2012 22:19:59 -0000

Author: eadler
Date: Sun Apr 29 22:19:58 2012
New Revision: 234819
URL: http://svn.freebsd.org/changeset/base/234819

Log:
  Allow users of gprof to get per run output files (using the pid)
  
  PR:		bin/99800
  Submitted by:	Peter Jeremy <peterjeremy@optushome.com.au>
  Reviewed by:	jilles (code)
  Reviewed by:	dwhite (doc)
  Approved by:	cperciva
  MFC after:	1 week

Modified:
  head/lib/libc/gmon/gmon.c
  head/lib/libc/gmon/moncontrol.3

Modified: head/lib/libc/gmon/gmon.c
==============================================================================
--- head/lib/libc/gmon/gmon.c	Sun Apr 29 22:01:23 2012	(r234818)
+++ head/lib/libc/gmon/gmon.c	Sun Apr 29 22:19:58 2012	(r234819)
@@ -157,7 +157,12 @@ _mcleanup(void)
 	}
 
 	moncontrol(0);
-	snprintf(outname, sizeof(outname), "%s.gmon", _getprogname());
+	if (getenv("PROFIL_USE_PID"))
+		snprintf(outname, sizeof(outname), "%s.%d.gmon",
+		    _getprogname(), getpid());
+	else
+		snprintf(outname, sizeof(outname), "%s.gmon", _getprogname());
+
 	fd = _open(outname, O_CREAT|O_TRUNC|O_WRONLY, 0666);
 	if (fd < 0) {
 		_warn("_mcleanup: %s", outname);

Modified: head/lib/libc/gmon/moncontrol.3
==============================================================================
--- head/lib/libc/gmon/moncontrol.3	Sun Apr 29 22:01:23 2012	(r234818)
+++ head/lib/libc/gmon/moncontrol.3	Sun Apr 29 22:19:58 2012	(r234819)
@@ -98,6 +98,12 @@ however, all functions in that address r
 have their execution time measured.
 Profiling begins on return from
 .Fn monstartup .
+.Sh ENVIRONMENT
+The following environment variables affect the execution of
+.Nm :
+.Bl -tag -width ".Ev PROFIL_USE_PID"
+.It PROFIL_USE_PID
+If set, the pid of the process is inserted into the filename.
 .Sh FILES
 .Bl -tag -width progname.gmon -compact
 .It Pa progname.gmon