From: John L. <mov...@us...> - 2003-03-03 21:13:36
|
Update of /cvsroot/oprofile/oprofile/utils In directory sc8-pr-cvs1:/tmp/cvs-serv29444/utils Modified Files: opcontrol Log Message: add --ctrX-event=none Index: opcontrol =================================================================== RCS file: /cvsroot/oprofile/oprofile/utils/opcontrol,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- opcontrol 3 Mar 2003 00:55:07 -0000 1.34 +++ opcontrol 3 Mar 2003 21:13:32 -0000 1.35 @@ -83,7 +83,7 @@ --setup options --buffer-size=num number of samples in kernel buffer - --ctrN-event=name symbolic event name for ctr N + --ctrN-event=[name|none] symbolic event name for ctr N, or none to disable --ctrN-count=val number of events between samples for ctr N --ctrN-unit-mask=val unit mask for ctr N (e.g. --ctr0-unit-mask=0xf) --ctrN-kernel=[0|1] whether to count kernel events for ctr N @@ -366,8 +366,7 @@ check_valid_args() { if [ "$one_enabled" = "0" ]; then - echo "Not one event enabled ? This should not happen !" >&2 - echo "Please report a bug ..." >&2 + echo "You must enable at least one event with --setup" >&2 exit 1 fi @@ -568,9 +567,19 @@ NEED_SETUP=yes ;; --ctr*-event) - CTR_EVENT[`extract_int $arg`]=$val - if (($? != 0)); then exit 1; fi - NEED_SETUP=yes + if test "$val" = "none"; then + CTR_EVENT[`extract_int $arg`]= + CTR_COUNT[`extract_int $arg`]= + CTR_USER[`extract_int $arg`]=1 + CTR_KERNEL[`extract_int $arg`]=1 + CTR_UNIT_MASK[`extract_int $arg`]=0 + CTR_EVENT_VAL[`extract_int $arg`]= + # one_enabled is fixed up below + else + CTR_EVENT[`extract_int $arg`]=$val + if (($? != 0)); then exit 1; fi + NEED_SETUP=yes + fi ;; --ctr*-count) CTR_COUNT[`extract_int $arg`]=$val |