PERFORCE change 123170 for review

Garrett Cooper gcooper at FreeBSD.org
Mon Jul 9 02:56:43 UTC 2007


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

Change 123170 by gcooper at 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);


More information about the p4-projects mailing list