From owner-svn-src-stable-7@FreeBSD.ORG  Sun May  6 14:11:25 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB6E510656D1;
	Sun,  6 May 2012 14:11:25 +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 C61588FC2C;
	Sun,  6 May 2012 14:11:25 +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 q46EBPDG017254;
	Sun, 6 May 2012 14:11:25 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46EBP4J017251;
	Sun, 6 May 2012 14:11:25 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201205061411.q46EBP4J017251@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 6 May 2012 14:11:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235083 - stable/7/lib/libc/gmon
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 May 2012 14:11:26 -0000

Author: eadler
Date: Sun May  6 14:11:25 2012
New Revision: 235083
URL: http://svn.freebsd.org/changeset/base/235083

Log:
  MFC r234819:
  	Allow users of gprof to get per run output files (using the pid)
  
  PR:		bin/99800
  Approved by:	cperciva (implicit)

Modified:
  stable/7/lib/libc/gmon/gmon.c
  stable/7/lib/libc/gmon/moncontrol.3
Directory Properties:
  stable/7/lib/libc/   (props changed)

Modified: stable/7/lib/libc/gmon/gmon.c
==============================================================================
--- stable/7/lib/libc/gmon/gmon.c	Sun May  6 14:10:56 2012	(r235082)
+++ stable/7/lib/libc/gmon/gmon.c	Sun May  6 14:11:25 2012	(r235083)
@@ -170,7 +170,12 @@ _mcleanup()
 	}
 
 	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: stable/7/lib/libc/gmon/moncontrol.3
==============================================================================
--- stable/7/lib/libc/gmon/moncontrol.3	Sun May  6 14:10:56 2012	(r235082)
+++ stable/7/lib/libc/gmon/moncontrol.3	Sun May  6 14:11:25 2012	(r235083)
@@ -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