From: Suravee S. <Sur...@am...> - 2009-08-17 16:38:21
|
ChangeLog | 8 ++++++++ libop/op_xml_events.c | 2 ++ libop/op_xml_out.c | 1 + libop/op_xml_out.h | 1 + utils/ophelp.c | 12 +++++++----- 5 files changed, 19 insertions(+), 5 deletions(-) Signed-off-by: Suravee Suthikulpanit <sur...@am...> --- Index: oprofile/ChangeLog =================================================================== RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v retrieving revision 1.1897 diff -u -r1.1897 ChangeLog --- oprofile/ChangeLog 1 Aug 2009 00:16:19 -0000 1.1897 +++ oprofile/ChangeLog 17 Aug 2009 16:07:29 -0000 @@ -1,3 +1,11 @@ +2009-08-17 Suravee Suthikulpanit <sur...@am...> + + * libop/op_xml_events.c: + * libop/op_xml_out.h: + * libop/op_xml_out.c: Fix ophelp -X output for IBS events + * utils/ophelp.c: Fix ophelp output for "counter:cpuid" and + "ext:xxx" case. + 2009-07-31 Maynard Johnson <may...@us...> * configure.in: bump version in AM_INIT_AUTOMAKE to 0.9.6cvs Index: oprofile/libop/op_xml_events.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_xml_events.c,v retrieving revision 1.1 diff -u -r1.1 op_xml_events.c --- oprofile/libop/op_xml_events.c 23 Oct 2008 13:43:49 -0000 1.1 +++ oprofile/libop/op_xml_events.c 17 Aug 2009 16:07:30 -0000 @@ -70,6 +70,8 @@ nr_counters = op_get_nr_counters(cpu_type); init_xml_int_attr(HELP_COUNTER_MASK, event->counter_mask, buffer); + if (event->ext) + init_xml_str_attr(HELP_EXT, event->ext, buffer); init_xml_int_attr(HELP_MIN_COUNT, event->min_count, buffer); if (has_nested) { Index: oprofile/libop/op_xml_out.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_xml_out.c,v retrieving revision 1.1 diff -u -r1.1 op_xml_out.c --- oprofile/libop/op_xml_out.c 23 Oct 2008 13:43:49 -0000 1.1 +++ oprofile/libop/op_xml_out.c 17 Aug 2009 16:07:30 -0000 @@ -77,6 +77,7 @@ "desc", "counter_mask", "min_count", + "ext", "unit_masks", "default", "unit_mask", Index: oprofile/libop/op_xml_out.h =================================================================== RCS file: /cvsroot/oprofile/oprofile/libop/op_xml_out.h,v retrieving revision 1.1 diff -u -r1.1 op_xml_out.h --- oprofile/libop/op_xml_out.h 23 Oct 2008 13:43:49 -0000 1.1 +++ oprofile/libop/op_xml_out.h 17 Aug 2009 16:07:30 -0000 @@ -51,6 +51,7 @@ HELP_EVENT_DESC, HELP_COUNTER_MASK, HELP_MIN_COUNT, + HELP_EXT, HELP_UNIT_MASKS, HELP_DEFAULT_MASK, HELP_UNIT_MASK, Index: oprofile/utils/ophelp.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/utils/ophelp.c,v retrieving revision 1.33 diff -u -r1.33 ophelp.c --- oprofile/utils/ophelp.c 5 Jun 2009 15:26:40 -0000 1.33 +++ oprofile/utils/ophelp.c 17 Aug 2009 16:07:30 -0000 @@ -117,11 +117,13 @@ } } } - printf(")"); - } - - if(event->ext != NULL) - printf(" (ext: %s)", event->ext); + } else if (event->ext != NULL) { + /* Handling extended feature interface */ + printf(": (ext: %s", event->ext); + } else { + /* Handling arch_perfmon case */ + printf(": (counter: all"); + } printf(")\n\t"); column = 8; |
From: Maynard J. <may...@us...> - 2009-08-20 13:30:07
|
Suravee Suthikulpanit wrote: > ChangeLog | 8 ++++++++ > libop/op_xml_events.c | 2 ++ > libop/op_xml_out.c | 1 + > libop/op_xml_out.h | 1 + > utils/ophelp.c | 12 +++++++----- > 5 files changed, 19 insertions(+), 5 deletions(-) > > Signed-off-by: Suravee Suthikulpanit <sur...@am...> Committed. Background: As part of putting out the new release, I regenerated the event tables that are provided at: http://oprofile.sourceforge.net/docs/ I also made sure that all processor types supported by oprofile are represented in those tables, including the new Intel arch perfmon and AMD IBS. However, the event tables for those two new types did not generate correctly, so Suravee, Andi Kleen, and I had an off-list discussion. We agreed on some minor changes to ophelp (whose output is used to generate the event tables), which are reflected here in Suravee's patch. Coincident to that discussion, Suravee also discovered a minor nit in the XML output for AMD IBS events, which she also fixed in this patch. I've now committed this patch and updated the OProfile website page referenced above to show the newly-generated event tables. Thanks. -Maynard > > --- > > Index: oprofile/ChangeLog > =================================================================== > RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v > retrieving revision 1.1897 > diff -u -r1.1897 ChangeLog > --- oprofile/ChangeLog 1 Aug 2009 00:16:19 -0000 1.1897 > +++ oprofile/ChangeLog 17 Aug 2009 16:07:29 -0000 > @@ -1,3 +1,11 @@ > +2009-08-17 Suravee Suthikulpanit <sur...@am...> > + > + * libop/op_xml_events.c: > + * libop/op_xml_out.h: > + * libop/op_xml_out.c: Fix ophelp -X output for IBS events > + * utils/ophelp.c: Fix ophelp output for "counter:cpuid" and > + "ext:xxx" case. > + > 2009-07-31 Maynard Johnson <may...@us...> > > * configure.in: bump version in AM_INIT_AUTOMAKE to 0.9.6cvs > Index: oprofile/libop/op_xml_events.c > =================================================================== > RCS file: /cvsroot/oprofile/oprofile/libop/op_xml_events.c,v > retrieving revision 1.1 > diff -u -r1.1 op_xml_events.c > --- oprofile/libop/op_xml_events.c 23 Oct 2008 13:43:49 -0000 1.1 > +++ oprofile/libop/op_xml_events.c 17 Aug 2009 16:07:30 -0000 > @@ -70,6 +70,8 @@ > > nr_counters = op_get_nr_counters(cpu_type); > init_xml_int_attr(HELP_COUNTER_MASK, event->counter_mask, buffer); > + if (event->ext) > + init_xml_str_attr(HELP_EXT, event->ext, buffer); > init_xml_int_attr(HELP_MIN_COUNT, event->min_count, buffer); > > if (has_nested) { > Index: oprofile/libop/op_xml_out.c > =================================================================== > RCS file: /cvsroot/oprofile/oprofile/libop/op_xml_out.c,v > retrieving revision 1.1 > diff -u -r1.1 op_xml_out.c > --- oprofile/libop/op_xml_out.c 23 Oct 2008 13:43:49 -0000 1.1 > +++ oprofile/libop/op_xml_out.c 17 Aug 2009 16:07:30 -0000 > @@ -77,6 +77,7 @@ > "desc", > "counter_mask", > "min_count", > + "ext", > "unit_masks", > "default", > "unit_mask", > Index: oprofile/libop/op_xml_out.h > =================================================================== > RCS file: /cvsroot/oprofile/oprofile/libop/op_xml_out.h,v > retrieving revision 1.1 > diff -u -r1.1 op_xml_out.h > --- oprofile/libop/op_xml_out.h 23 Oct 2008 13:43:49 -0000 1.1 > +++ oprofile/libop/op_xml_out.h 17 Aug 2009 16:07:30 -0000 > @@ -51,6 +51,7 @@ > HELP_EVENT_DESC, > HELP_COUNTER_MASK, > HELP_MIN_COUNT, > + HELP_EXT, > HELP_UNIT_MASKS, > HELP_DEFAULT_MASK, > HELP_UNIT_MASK, > Index: oprofile/utils/ophelp.c > =================================================================== > RCS file: /cvsroot/oprofile/oprofile/utils/ophelp.c,v > retrieving revision 1.33 > diff -u -r1.33 ophelp.c > --- oprofile/utils/ophelp.c 5 Jun 2009 15:26:40 -0000 1.33 > +++ oprofile/utils/ophelp.c 17 Aug 2009 16:07:30 -0000 > @@ -117,11 +117,13 @@ > } > } > } > - printf(")"); > - } > - > - if(event->ext != NULL) > - printf(" (ext: %s)", event->ext); > + } else if (event->ext != NULL) { > + /* Handling extended feature interface */ > + printf(": (ext: %s", event->ext); > + } else { > + /* Handling arch_perfmon case */ > + printf(": (counter: all"); > + } > > printf(")\n\t"); > column = 8; > > > > > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > oprofile-list mailing list > opr...@li... > https://lists.sourceforge.net/lists/listinfo/oprofile-list |