From: Philippe E. <ph...@us...> - 2005-08-24 18:14:35
|
Update of /cvsroot/oprofile/oprofile-www In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3306 Modified Files: ChangeLog events.pl start_page.php3 Added Files: all-events-doc.sh Log Message: Update all ppc64 events. Better parsing of ophelp output, regenerate docs/* --- NEW FILE: all-events-doc.sh --- #!/bin/sh # a script to help updating docs/* do_events() { ophelp --cpu-type $1 | events.pl > $2_docs.temp diff -u docs/$3-events.php3 $2_docs.temp } do_events 1 PII intel-pii do_events 2 PIII intel-piii do_events 3 ATHLON amd-athlon # 4 is timer intr # 5 is RTC interrupt do_events 6 P4 intel-P4 do_events 7 IA64 intel-ia64 do_events 8 IA64 intel-ia64-itanium do_events 9 IA64 intel-ia64-itanium2 do_events 10 AMD64 amd-hammer do_events 11 P4-HT2 intel-P4-ht2 do_events 12 ALPHA-EV4 alpha-ev4 do_events 13 ALPHA-EV5 alpha-ev5 # PCA56 port does not work #do_events 14 do_events 15 ALPHA-EV6 alpha-ev6 do_events 16 ALPHA-EV67 alpha-ev67 do_events 17 P6M intel-p6-mobile do_events 18 ARM-PMU1 arm-xscale-pmu1 do_events 19 ARM-PMU2 arm-xscale-pmu2 do_events 20 PPC64-POWER4 ppc64-power4 do_events 21 PPC64-POWER5 ppc64-power5 do_events 22 PPC64-970 ppc64-970 # missing kernel support for most mips #do_events 23 #do_events 24 #do_events 25 #do_events 26 do_events 27 MIPS-RM9000 mips-rm9000 # missing kernel support for most mips #do_events 28 #do_events 29 #do_events 30 do_events 31 PPC-E500 ppc-e500 Index: ChangeLog =================================================================== RCS file: /cvsroot/oprofile/oprofile-www/ChangeLog,v retrieving revision 1.63 retrieving revision 1.64 diff -u -p -d -r1.63 -r1.64 --- ChangeLog 2 Aug 2005 17:50:57 -0000 1.63 +++ ChangeLog 24 Aug 2005 18:14:26 -0000 1.64 @@ -1,3 +1,13 @@ +2005-08-24 Philippe Elie <ph...@wa...> + + * all-events-doc.sh: new, a script to help diffing the diffs between + doc/* and generated docs by events.pl + * events.pl: handle ppc64 group, better handling of some corner case. + * start_page.php3: add start_event_table_ppc64() to handle Group + + * docs/*: update ppc64*, some minor update reflecting the better ophelp + parsing by events.pl + 2005-08-02 Richard Purdie <rp...@op...> * about/index.php3: Index: events.pl =================================================================== RCS file: /cvsroot/oprofile/oprofile-www/events.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- events.pl 5 Oct 2003 22:09:20 -0000 1.5 +++ events.pl 24 Aug 2005 18:14:26 -0000 1.6 @@ -15,11 +15,15 @@ sub print_event() { print("<td>$name</td>"); print("<td>$desc</td>"); print("<td>$counters</td>"); - print("<td>\n"); - for ($i=0; $i < $umcount; $i++) { - print ("$unitmasks[$i] <br />\n"); + if ($group) { + print("<td>$group</td>\n\n"); + } else { + print("<td>\n"); + for ($i=0; $i < $umcount; $i++) { + print ("$unitmasks[$i] <br />\n"); + } + print("</td>\n\n"); } - print("</td>\n\n"); print("</tr>\n\n"); } @@ -38,9 +42,9 @@ if (/counter/) { $umcount = 0; } elsif (/min count/) { chomp; - ($desc, $mincount) = split('\('); - $mincount =~ s/min count: //; - $mincount =~ s/\)//; + ($group, $desc, $mincount) = /(.*\(Group.*?\))?(.*)(\(min count: .*\))/; + $group =~ s/\(//; + $group =~ s/\)//; } elsif (/^ [0-9]/) { $unitmasks[$umcount] = $_; $umcount++; Index: start_page.php3 =================================================================== RCS file: /cvsroot/oprofile/oprofile-www/start_page.php3,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -d -r1.29 -r1.30 --- start_page.php3 18 Oct 2003 19:34:33 -0000 1.29 +++ start_page.php3 24 Aug 2005 18:14:26 -0000 1.30 @@ -182,6 +182,11 @@ function start_event_table() { print("<tr class=\"tablehead\"><td>Name</td><td>Description</td><td>Counters usable</td><td>Unit mask options</td></tr>\n"); } +function start_event_table_ppc64() { + print("<table class=\"eventtable\">\n"); + print("<tr class=\"tablehead\"><td>Name</td><td>Description</td><td>Counters usable</td><td>Group</td></tr>\n"); +} + function end_table() { print("</table>"); } |