[prev in list] [next in list] [prev in thread] [next in thread] 

List:       oprofile-commits
Subject:    [oprof-cvs] CVS: oprofile/utils opcontrol,1.164,1.165
From:       "Maynard Johnson" <maynardj () users ! sourceforge ! net>
Date:       2009-09-14 20:18:42
Message-ID: E1MnI0Y-0003gF-8V () 23jxhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/oprofile/oprofile/utils
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14062/utils

Modified Files:
	opcontrol 
Log Message:
Fix timer mode regression

Index: opcontrol
===================================================================
RCS file: /cvsroot/oprofile/oprofile/utils/opcontrol,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -d -r1.164 -r1.165
--- opcontrol	8 Sep 2009 15:16:28 -0000	1.164
+++ opcontrol	14 Sep 2009 20:18:40 -0000	1.165
@@ -587,7 +587,7 @@ verify_counters()
 # setup any needed default value in chosen events
 normalise_events()
 {
-	if test "$NR_CHOSEN" -le 0; then
+	if test "$NR_CHOSEN" -le 0 || test "$IS_TIMER" = 1; then
 		return
 	fi
 
@@ -1453,8 +1453,12 @@ do_start_daemon()
 		--separate-thread=$SEPARATE_THREAD \
 		--separate-cpu=$SEPARATE_CPU"
 
-	if ! test -z "$OPROFILED_EVENTS"; then
-		OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+	if test "$IS_TIMER" = 1; then
+		OPD_ARGS="$OPD_ARGS --events="
+	else
+		if ! test -z "$OPROFILED_EVENTS"; then
+			OPD_ARGS="$OPD_ARGS --events=$OPROFILED_EVENTS"
+		fi
 	fi
 
 	if test "$VMLINUX" = "none"; then


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Oprofile-commits mailing list
Oprofile-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oprofile-commits
[prev in list] [next in list] [prev in thread] [next in thread]