From: Roland G. <rol...@gm...> - 2010-10-15 23:46:56
|
I've tried out the patch and it looks good (schema version seems to be in the right place now). I've also proposed a patch at : http://sourceforge.net/tracker/index.php?func=detail&aid=3053794&group_id=16191&atid=116191 that depends on this one. I've worked on tools to display the output from oprofile in the past and thought it would be useful. Thanks again, -- Roland Grunberg |
From: Maynard J. <may...@us...> - 2010-10-16 00:20:10
|
Roland Grunberg wrote: > I've tried out the patch and it looks good (schema version seems to be > in the right place now). Thanks for testing/reviewing my patch, Roland. It's committed to oprofile cvs now. > I've also proposed a patch at : > > http://sourceforge.net/tracker/index.php?func=detail&aid=3053794&group_id=16191&atid=116191 > > that depends on this one. I've worked on tools to display the output > from oprofile in the past and thought it would be useful. > > Thanks again, I've committed your patch, too. For others to reference, I've pasted it below. ATTENTION: This patch changes the ophelp schema version from 1.0 to 1.1. -Maynard ---------------------------------------------------------- diff -prauN oprofile.old/ChangeLog oprofile/ChangeLog --- oprofile.old/ChangeLog 2010-09-30 22:50:51.125596285 -0400 +++ oprofile/ChangeLog 2010-09-30 22:51:08.918366497 -0400 @@ -1,3 +1,10 @@ +2010-09-10 Roland Grunberg <rol...@gm...> + + * libop/op_xml_events.c: Provide unit mask type for an event in the xml. + * libop/op_xml_out.c: + * libop/op_xml_out.h: + * doc/ophelp.xsd: + 2010-09-08 Maynard Johnson <may...@us...> * doc/ophelp.xsd: diff -prauN oprofile.old/doc/ophelp.xsd oprofile/doc/ophelp.xsd --- oprofile.old/doc/ophelp.xsd 2010-09-30 22:50:51.157601812 -0400 +++ oprofile/doc/ophelp.xsd 2010-09-30 23:07:16.965355745 -0400 @@ -43,6 +43,7 @@ <xs:element minOccurs="1" maxOccurs="unbounded" ref="unit_mask"/> </xs:sequence> <xs:attribute name="default" type="xs:nonNegativeInteger" use="required"/> + <xs:attribute name="category" type="xs:string" use="required"/> </xs:complexType> </xs:element> diff -prauN oprofile.old/libop/op_xml_events.c oprofile/libop/op_xml_events.c --- oprofile.old/libop/op_xml_events.c 2010-09-30 22:50:51.230606225 -0400 +++ oprofile/libop/op_xml_events.c 2010-09-30 23:08:34.312346394 -0400 @@ -21,7 +21,7 @@ static char buffer[MAX_BUFFER]; void open_xml_events(char const * title, char const * doc, op_cpu the_cpu_type) { - char const * schema_version = "1.0"; + char const * schema_version = "1.1"; buffer[0] = '\0'; cpu_type = the_cpu_type; @@ -77,10 +77,23 @@ void xml_help_for_event(struct op_event buffer, MAX_BUFFER); if (has_nested) { + char um_type[10]; close_xml_element(NONE, 1, buffer, MAX_BUFFER); open_xml_element(HELP_UNIT_MASKS, 1, buffer, MAX_BUFFER); init_xml_int_attr(HELP_DEFAULT_MASK, event->unit->default_mask, buffer, MAX_BUFFER); + switch (event->unit->unit_type_mask){ + case utm_bitmask: + strncpy(um_type, "bitmask", sizeof(um_type)); + break; + case utm_exclusive: + strncpy(um_type, "exclusive", sizeof(um_type)); + break; + case utm_mandatory: + strncpy(um_type, "mandatory", sizeof(um_type)); + break; + } + init_xml_str_attr(HELP_UNIT_MASKS_CATEGORY, um_type, buffer, MAX_BUFFER); close_xml_element(NONE, 1, buffer, MAX_BUFFER); for (i = 0; i < event->unit->num; i++) { open_xml_element(HELP_UNIT_MASK, 1, buffer, MAX_BUFFER); diff -prauN oprofile.old/libop/op_xml_out.c oprofile/libop/op_xml_out.c --- oprofile.old/libop/op_xml_out.c 2010-09-30 22:50:51.228605543 -0400 +++ oprofile/libop/op_xml_out.c 2010-09-30 22:51:08.976359235 -0400 @@ -80,6 +80,7 @@ char const * xml_tag_map[] = { "ext", "unit_masks", "default", + "category", "unit_mask", "mask", "desc" diff -prauN oprofile.old/libop/op_xml_out.h oprofile/libop/op_xml_out.h --- oprofile.old/libop/op_xml_out.h 2010-09-30 22:50:51.226597948 -0400 +++ oprofile/libop/op_xml_out.h 2010-09-30 22:51:08.996597365 -0400 @@ -54,6 +54,7 @@ typedef enum { HELP_EXT, HELP_UNIT_MASKS, HELP_DEFAULT_MASK, + HELP_UNIT_MASKS_CATEGORY, HELP_UNIT_MASK, HELP_UNIT_MASK_VALUE, HELP_UNIT_MASK_DESC |