From owner-p4-projects@FreeBSD.ORG  Mon Jul  9 02:56:43 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 36C4416A46B; Mon,  9 Jul 2007 02:56:43 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C110016A468
	for <perforce@FreeBSD.org>; Mon,  9 Jul 2007 02:56:42 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B183D13C489
	for <perforce@FreeBSD.org>; Mon,  9 Jul 2007 02:56:42 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l692ugen015371
	for <perforce@FreeBSD.org>; Mon, 9 Jul 2007 02:56:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l692ugQW015368
	for perforce@freebsd.org; Mon, 9 Jul 2007 02:56:42 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Mon, 9 Jul 2007 02:56:42 GMT
Message-Id: <200707090256.l692ugQW015368@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123170 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jul 2007 02:56:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=123170

Change 123170 by gcooper@optimus-revised_pkgtools on 2007/07/09 02:56:39

	Forgot to #if .. #endif protect a few extra "simple profile" lines in add/perform.c

Affected files ...

.. //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#4 edit

Differences ...

==== //depot/projects/soc2007/revised_fbsd_pkgtools/usr/src/usr.sbin/pkg_install/add/perform.c#4 (text+ko) ====

@@ -137,24 +137,30 @@
 	    }
 	    Home = make_playpen(playpen, sb.st_size * 4);
 
+#if SIMPLE_PROF_TRY
 	    static struct timespec before, after, time_diff;
+#endif
 
 	    if (!Home)
 		errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4);
 	    where_to = Home;
 
+#if SIMPLE_PROF_TRY
     	    clock_gettime(CLOCK_REALTIME, &before);
+#endif
 
 	    /* Since we can call ourselves recursively, keep notes on where we came from */
 	    if (!getenv("_TOP"))
 		setenv("_TOP", Home, 1);
 
+#if SIMPLE_PROF_TRY
 	    clock_gettime(CLOCK_REALTIME, &after);
 
 	    time_diff.tv_nsec = after.tv_nsec - before.tv_nsec;
 	    time_diff.tv_sec = after.tv_sec - before.tv_sec;
 
     	    printf(  "(%s) Difference: %3.20lf secs\n", "_TOP setenv", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 )  );
+#endif
 
 	    if (unpack(pkg_fullname, extract)) {
 		warnx(
@@ -163,7 +169,9 @@
 		goto bomb;
 	    }
 
+#if SIMPLE_PROF_TRY
     	    clock_gettime(CLOCK_REALTIME, &before);
+#endif
 
 	    cfile = fopen(CONTENTS_FNAME, "r");
 	    if (!cfile) {
@@ -173,12 +181,14 @@
 		goto bomb;
 	    }
 
+#if SIMPLE_PROF_TRY
 	    clock_gettime(CLOCK_REALTIME, &after);
 
 	    time_diff.tv_nsec = after.tv_nsec - before.tv_nsec;
 	    time_diff.tv_sec = after.tv_sec - before.tv_sec;
 
     	    printf(  "(%s) Difference: %3.20lf secs\n", "+CONTENTS fopen", (double) ( time_diff.tv_sec + time_diff.tv_nsec/1e9 )  );
+#endif
 
 	    read_plist(&Plist, cfile);
 	    fclose(cfile);