From: Philippe E. <ph...@us...> - 2003-10-30 05:14:01
|
Update of /cvsroot/oprofile/oprofile/libpp In directory sc8-pr-cvs1:/tmp/cvs-serv10760/libpp Modified Files: profile_spec.cpp Log Message: fix matching logic for cpu/tid/tgid Index: profile_spec.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libpp/profile_spec.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- profile_spec.cpp 30 Oct 2003 03:41:05 -0000 1.15 +++ profile_spec.cpp 30 Oct 2003 05:13:38 -0000 1.16 @@ -313,15 +313,18 @@ bool profile_spec::match(string const & // Logic for these next three: tgid:454 in profile spec // should not match sample file with tgid:all - if (spec.cpu.is_set() && !cpu.match(spec.cpu.value())) { + if ((spec.cpu.is_set() && !cpu.match(spec.cpu.value())) || + (!spec.cpu.is_set() && cpu.is_set())) { return false; } - if (spec.tid.is_set() && !tid.match(spec.tid.value())) { + if ((spec.tid.is_set() && !tid.match(spec.tid.value())) || + (!spec.tid.is_set() && tid.is_set())) { return false; } - if (spec.tgid.is_set() && !tgid.match(spec.tgid.value())) { + if ((spec.tgid.is_set() && !tgid.match(spec.tgid.value())) || + (!spec.tgid.is_set() && tgid.is_set())) { return false; } |