OProfile

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20351

Modified Files:
	ChangeLog 
Log Message:
minor tidy: s/template <class/template <typename/

Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1437
retrieving revision 1.1438
diff -u -p -d -r1.1437 -r1.1438
--- ChangeLog	28 Jan 2004 03:08:29 -0000	1.1437
+++ ChangeLog	28 Jan 2004 05:37:11 -0000	1.1438
@@ -1,5 +1,10 @@
 2004-01-28  Philippe Elie  <phil.el@...>
 
+	* libutil++/tests/utility_tests.cpp:
+	* libopt++/popt_options.cpp: s/template <class/template <typename/
+
+2004-01-28  Philippe Elie  <phil.el@...>
+
 	* daemon/init.c: show buffer read only when --verbose
 
 	* libpp/image_errors.cpp:

Update of /cvsroot/oprofile/oprofile/libopt++
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20351/libopt++

Modified Files:
	popt_options.cpp 
Log Message:
minor tidy: s/template <class/template <typename/

Index: popt_options.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libopt++/popt_options.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -d -r1.18 -r1.19
--- popt_options.cpp	19 Jan 2004 20:00:25 -0000	1.18
+++ popt_options.cpp	28 Jan 2004 05:37:12 -0000	1.19
@@ -112,7 +112,7 @@ void parse_options(int argc, char const 
 }
 
 
-template <class T> class option_imp;
+template <typename T> class option_imp;
 
 
 /**

Update of /cvsroot/oprofile/oprofile/pp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21313/pp

Modified Files:
	opstack.cpp 
Log Message:
opstack: handle report_image_error()

Index: opstack.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opstack.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- opstack.cpp	18 Jan 2004 02:21:15 -0000	1.2
+++ opstack.cpp	28 Jan 2004 03:08:31 -0000	1.3
@@ -15,6 +15,7 @@
 #include "opstack_options.h"
 #include "arrange_profiles.h"
 #include "callgraph_container.h"
+#include "image_errors.h"
 #include "populate.h"
 
 using namespace std;
@@ -77,6 +78,8 @@ int opstack(vector<string> const & non_o
 	list<inverted_profile> iprofiles
 		= invert_profiles(classes, options::extra_found_images);
 
+	report_image_errors(iprofiles);
+
 	cg_container.populate(iprofiles);
 
 	dump(cout, cg_container);

Update of /cvsroot/oprofile/oprofile/libpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21313/libpp

Modified Files:
	callgraph_container.cpp image_errors.cpp image_errors.h 
Log Message:
opstack: handle report_image_error()

Index: callgraph_container.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/callgraph_container.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- callgraph_container.cpp	24 Jan 2004 17:28:36 -0000	1.7
+++ callgraph_container.cpp	28 Jan 2004 03:08:31 -0000	1.8
@@ -236,12 +236,15 @@ void callgraph_container::populate(list<
 		parsed_filename caller_file = parse_filename(*cit);
 		string const app_name = caller_file.image;
 
-		// FIXME: there is some error checking needed here.
-		bool ok = true;
-		op_bfd caller_bfd(caller_file.lib_image, string_filter(), ok);
 		cverb << vdebug << "cg subset caller: "
 		      << caller_file.lib_image  << "\n";
 
+		bool ok = true;
+		op_bfd caller_bfd(caller_file.lib_image, string_filter(), ok);
+		if (!ok)
+			report_image_error(caller_file.lib_image,
+					   image_format_failure, false);
+
 		cg_fileset::const_iterator last;
 		for (last = fset.upper_bound(*cit); cit != last; ++cit) {
 			parsed_filename callee_file = parse_filename(*cit);
@@ -249,8 +252,12 @@ void callgraph_container::populate(list<
 			      << "adding: " << callee_file.cg_image << endl;
 
 			// FIXME: there is some error checking needed here.
+			ok = true;
 			op_bfd callee_bfd(callee_file.cg_image,
 			                  string_filter(), ok);
+			if (!ok)
+				report_image_error(callee_file.cg_image,
+				   image_format_failure, false);
 
 			profile_t profile;
 			// We can't use start_offset support in profile_t, give

Index: image_errors.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/image_errors.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- image_errors.cpp	18 Jan 2004 02:21:14 -0000	1.2
+++ image_errors.cpp	28 Jan 2004 03:08:31 -0000	1.3
@@ -13,42 +13,58 @@
 #include "arrange_profiles.h"
 
 #include <iostream>
+#include <set>
 
 using namespace std;
 
+namespace {
 
-void report_image_error(inverted_profile const & profile, bool fatal)
+set<string> reported_images_error;
+
+}
+
+void report_image_error(string const & image, image_error error, bool fatal)
 {
-	if (profile.error == image_ok)
+	if (error == image_ok)
 		return;
 
-	cerr << (fatal ? "error: " : "warning: ");
-	cerr << profile.image << ' ';
+	if (reported_images_error.find(image) != reported_images_error.end()) {
+		reported_images_error.insert(image);
 
-	switch (profile.error) {
-		case image_not_found:
-			cerr << "could not be found.\n";
-			break;
+		cerr << (fatal ? "error: " : "warning: ");
+		cerr << image << ' ';
 
-		case image_unreadable:
-			cerr << "could not be read.\n";
-			break;
+		switch (error) {
+			case image_not_found:
+				cerr << "could not be found.\n";
+				break;
 
-		case image_multiple_match:
-			cerr << "matches more than one file: "
-			     "detailed profile will not be provided.\n";
-			break;
+			case image_unreadable:
+				cerr << "could not be read.\n";
+				break;
 
-		case image_format_failure:
-			cerr << "is not in a usable binary format.\n";
-			break;
+			case image_multiple_match:
+				cerr << "matches more than one file: "
+				    "detailed profile will not be provided.\n";
+				break;
 
-		case image_ok:
-			break;
+			case image_format_failure:
+				cerr << "is not in a usable binary format.\n";
+				break;
+
+			case image_ok:
+				break;
+		}
 	}
 }
 
 
+void report_image_error(inverted_profile const & profile, bool fatal)
+{
+	report_image_error(profile.image, profile.error, fatal);
+}
+
+
 void report_image_errors(list<inverted_profile> const & plist)
 {
 	list<inverted_profile>::const_iterator it = plist.begin();

Index: image_errors.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/image_errors.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- image_errors.h	18 Jan 2004 02:21:14 -0000	1.2
+++ image_errors.h	28 Jan 2004 03:08:31 -0000	1.3
@@ -12,6 +12,7 @@
 #define IMAGE_ERRORS_H
 
 #include <list>
+#include <string>
 
 class inverted_profile;
 
@@ -24,6 +25,11 @@ enum image_error {
 	image_multiple_match
 };
 
+/// output why the image passed can't be read to stderr, we warranty only one
+/// error report by image name.
+void
+report_image_error(std::string const & image, image_error error, bool fatal);
+
 /// output why the image passed can't be read to stderr
 void report_image_error(inverted_profile const & profile, bool fatal);

Update of /cvsroot/oprofile/oprofile/daemon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21313/daemon

Modified Files:
	init.c 
Log Message:
opstack: handle report_image_error()

Index: init.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/init.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- init.c	19 Jan 2004 20:00:06 -0000	1.5
+++ init.c	28 Jan 2004 03:08:31 -0000	1.6
@@ -122,7 +122,7 @@ static void opd_do_samples(char const * 
  
 	opd_stats[OPD_DUMP_COUNT]++;
 
-	printf("Read buffer of %d entries.\n", (unsigned int)num);
+	verbprintf("Read buffer of %d entries.\n", (unsigned int)num);
  
 	opd_process_samples(opd_buf, num);

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21313

Modified Files:
	ChangeLog 
Log Message:
opstack: handle report_image_error()

Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1436
retrieving revision 1.1437
diff -u -p -d -r1.1436 -r1.1437
--- ChangeLog	27 Jan 2004 22:44:09 -0000	1.1436
+++ ChangeLog	28 Jan 2004 03:08:29 -0000	1.1437
@@ -1,3 +1,12 @@
+2004-01-28  Philippe Elie  <phil.el@...>
+
+	* daemon/init.c: show buffer read only when --verbose
+
+	* libpp/image_errors.cpp:
+	* libpp/image_errors.h: add needed API for callgraph image error
+	* libpp/callgraph_container.cpp: use it.
+	* pp/opstack.cpp: report_image_errors()
+
 2004-01-27  Philippe Elie  <phil.el@...>
 
 	* libutil++/op_bfd.cpp: Fix bfd_find_nearest_line() and separate

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21970

Modified Files:
	ChangeLog 
Log Message:
libutil++/op_bfd.cpp: Fix bfd_find_nearest_line() and separate debug info, please test it.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1435
retrieving revision 1.1436
diff -u -p -d -r1.1435 -r1.1436
--- ChangeLog	27 Jan 2004 22:30:07 -0000	1.1435
+++ ChangeLog	27 Jan 2004 22:44:09 -0000	1.1436
@@ -1,5 +1,10 @@
 2004-01-27  Philippe Elie  <phil.el@...>
 
+	* libutil++/op_bfd.cpp: Fix bfd_find_nearest_line() and separate
+	  debug info, please test it.
+
+2004-01-27  Philippe Elie  <phil.el@...>
+
 	* doc/opcontrol.1.in:
 	* doc/oprofile.xml:
 	* utils/opcontrol: add --cpu-buffer-size and document it.

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18189

Modified Files:
	ChangeLog 
Log Message:
opcontrol: add --cpu-buffer-size and document it.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1434
retrieving revision 1.1435
diff -u -p -d -r1.1434 -r1.1435
--- ChangeLog	27 Jan 2004 22:28:14 -0000	1.1434
+++ ChangeLog	27 Jan 2004 22:30:07 -0000	1.1435
@@ -1,3 +1,9 @@
+2004-01-27  Philippe Elie  <phil.el@...>
+
+	* doc/opcontrol.1.in:
+	* doc/oprofile.xml:
+	* utils/opcontrol: add --cpu-buffer-size and document it.
+
 2004-01-27  Will Cohen  <wcohen@...>
 
 	* events/i386/p4/unit_masks:

Update of /cvsroot/oprofile/oprofile/libutil++
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21970/libutil++

Modified Files:
	op_bfd.cpp 
Log Message:
libutil++/op_bfd.cpp: Fix bfd_find_nearest_line() and separate debug info, please test it.

Index: op_bfd.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil++/op_bfd.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- op_bfd.cpp	20 Jan 2004 13:49:32 -0000	1.46
+++ op_bfd.cpp	27 Jan 2004 22:44:10 -0000	1.47
@@ -515,16 +515,15 @@ bool op_bfd::get_linenr(symbol_index_t s
 
 	pc = sym_offset(sym_idx, offset) + sym.value();
 
-	if (pc >= bfd_section_size(ibfd, section))
-		return false;
+	// FIXME: to test, I'm unsure if from this point we must use abfd
+	// or the check if (pc >= bfd_section_size(abfd, section)) must be done
+	// with ibfd.
+	bfd * abfd = dbfd ? dbfd : ibfd;
 
-	// Try finding line information in binary first.
-	bool ret = bfd_find_nearest_line(ibfd, section, bfd_syms.get(), pc,
-					 &cfilename, &functionname, &linenr);
+	if (pc >= bfd_section_size(abfd, section))
+		return false;
 
-	// Try finding line information in debug info file second.
-	if ((!ret) && dbfd)
-		ret = bfd_find_nearest_line(dbfd, section, bfd_syms.get(), pc,
+	bool ret = bfd_find_nearest_line(abfd, section, bfd_syms.get(), pc,
 					 &cfilename, &functionname, &linenr);
 
 	if (cfilename == 0 || !ret) {
@@ -580,12 +579,12 @@ bool op_bfd::get_linenr(symbol_index_t s
 		// first restrict the search on a sensible range of vma,
 		// 16 is an intuitive value based on epilog code look
 		size_t max_search = 16;
-		size_t section_size = bfd_section_size(ibfd, section);
+		size_t section_size = bfd_section_size(abfd, section);
 		if (pc + max_search > section_size)
 			max_search = section_size - pc;
 
 		for (size_t i = 1 ; i < max_search ; ++i) {
-			bool ret = bfd_find_nearest_line(ibfd, section,
+			bool ret = bfd_find_nearest_line(abfd, section,
 							 bfd_syms.get(), pc+i,
 							 &cfilename,
 							 &functionname,
@@ -607,7 +606,7 @@ bool op_bfd::get_linenr(symbol_index_t s
 		// As mentionned above a previous work-around break static
 		// inline function. We recover here by not checking than
 		// functionname == sym.name
-		bfd_find_nearest_line(ibfd, section, bfd_syms.get(), pc,
+		bfd_find_nearest_line(abfd, section, bfd_syms.get(), pc,
 				      &cfilename, &functionname, &linenr);
 	}

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8109

Modified Files:
	ChangeLog TODO 
Log Message:
update TODO about metrics etc., no ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1432
retrieving revision 1.1433
diff -u -p -d -r1.1432 -r1.1433
--- ChangeLog	25 Jan 2004 02:59:33 -0000	1.1432
+++ ChangeLog	27 Jan 2004 21:54:06 -0000	1.1433
@@ -12,7 +12,7 @@
 
 	* libpp/parse_filename.h:
 	* libpp/parse_filename.cpp: profile_spec_equal() new predicate
-	* libpp/arrange_profiles.cpp: use it to ensure we cerate a new
+	* libpp/arrange_profiles.cpp: use it to ensure we create a new
 	  profile_samples_file when needed.
 
 2004-01-24  John Levon  <levon@...>

Index: TODO
===================================================================
RCS file: /cvsroot/oprofile/oprofile/TODO,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -p -d -r1.353 -r1.354
--- TODO	24 Jan 2004 17:23:52 -0000	1.353
+++ TODO	27 Jan 2004 21:54:06 -0000	1.354
@@ -28,7 +28,13 @@ for some pointers and/or read HACKING an
 -----------
 
  o opdiff
- o add event aliases for common things like icache misses
+ o add event aliases for common things like icache misses, we must start to 
+  think about metrics including simple like event alias mapped to two or more
+  events and intepreted specially by user space tools like using the ratio
+  of samples; more tricky will be to select an event used as call count (no
+  cg on it) and  used to emulate the call count field in gprof. I think this is
+  a after 1.0 thing but event aliases must be specified in a way allowing such
+  extension
 
 Before 1.0 little stuff
 -----------------------
@@ -37,7 +43,7 @@ Before 1.0 little stuff
  o depedencies between profile_container.h symbol_container.h and
   sample_container.h become more and more ugly, I needed to include them
   in a specific order in some source.
- o test and fix p4 support both for 2.4/2.6, merge HT support for 2.4 to 2.6
+ o test and fix p4 support both for 2.4/2.6, merge HT support from 2.6 to 2.4
   (if I can get a P4 HT box ...)
  o x86_64 and 2.4 kernel: it's apparently broken
  o Alpha ev67 events are broken
@@ -54,7 +60,6 @@ Before 1.0 little stuff
   --separate==none. Must we take care ?
  o --buffer-size is useless on 2.5 without tuning of watershed
  o pp tools must handle samples count overflow (marked as (unsigned)-1)
- o when we dump stats for oprofiled, dump kernel-side values too (for 2.5)
  o the way we show kernel modules in 2.5 is not very obvious - "/oprofile"
  o sample-file: / binary: don't work in any useful way - can we fix this
    by peeking at binary: value and faking the split_sample_file somehow ?

Update of /cvsroot/oprofile/oprofile/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8819/doc

Modified Files:
	Makefile.am buffers.png internals.xml 
Added Files:
	buffers.dia 
Log Message:
internals doc updates


--- NEW FILE: buffers.dia ---
‹
o~]Ñ
ek;q?å‘yOÇýì.žFË=6Û>fGK׫Îöõúq]OLù­ÚÍ·èbÞGéªù7›Û®µxEœÊYH.þ]f«á}ÉÂÅ4L§ÖÏ֛äûhEÈ"ž¾}r¶OO}@²1I¾Æù¹MÖ&òÇ^}¸MXìjúâ¢Þr*?{¸˜Í£²uÏÞؕÿLµoL\›ôì/šG7ç—IºhÞßu§h¾@FsH¸ðš¾ŽâÙu¶»ma“~­/¯“oç->Ýþ»[û•x´1aWþ/¢[u[ú½Òݙ²•1}›öëì2Y,ΣŴøìOQóB½¸»¹¼­wßv«
ö$ÎjÇ욓+[ÇÕN_ùÝúòŸ§Çïw¬6<’ÒەNY[Ÿù÷­«ð&žßˏ.–#k™Ýç¹'©rù«ï£ù×(‹/ꛟþ	IŽ–D‡S5CŸN¶ýÖÉs}ºÙNj>²’å8j…óx¶¸‰Úµ‹$Vç­c/­)KPF
ŒÈ¯[`H”hÈ)áy
Sn“”ø|lYǟÎ>žžü‰˜
5ͮϻì`…+îޟ?úcé}¦ðñ“4Þ&ác¬ýŒ<ò3§ßg
ï²DZ:Û¾ï}æɓ®,L³ó0M“o»‡M•Û>ŸG‹ÙcXqúÚ®ÚÉtuî#Àåe"¯äe#{ø‰u-	Ç1ddeIy#²6?–óæC4j­ê‰©r˜Vó»’ˆ™U¤È²ÊÿðAԞR¬cë×ór‘懋˜}船i?˜!'Ԕª£ØÖç‚£Ø4*&ž]dâý>
ž‘£•Œ5’‘£û2r”÷Ñ0®†l<ß?"@낋.¨7ÅFGgKø'ÿ>ùxj½9{÷Kþ *„ë¶ÃE:PP0-[^};€Þòš‡®Ê*IN¼=þôé÷'Gå¢>’d÷ë–¤p5‚k¯À¬ «•üœDiyqP¼h¸‰>JO1¸	bð
1‰Ñê>$(1|=Ä Ž>bå$^¼}I¡Ê
ÚpFrHÄhº‰>J¡iFBMÌHheFÂpF‚¸hZq>‰ÏÑ`0>«.HŒV÷!1
e'ÄËGψʴ
×RåYô-ÖÃÌ($.|G.Ê«ˆÈqá•Ù½Ù·¸ZG֏ú¬Y¼hxy>ÊK)”Ë«—GšE'4§…Çû§¤‡[Ô}‡¬
n‚|Í
¬@V4}‡¬
a‚b͊þ‰m„ÅaÁB ,ÌÁÂÕyõ EΈ"ÇÉ–>0ÅyP´¨9q>ŠO.òç`Ãã‚Úì!º`6ÃèyÑ°ò”ê•6^±Žå‡½Èð·ÉÎ^>#È	íœh³r²îÆW/ÂZ•œ03u7¬RwÃàënZ·»>‡
ºîÆçšênƒ2Ënd˜Éì Üg4€8Ó¶m¼m
†÷AK'PäÏOʋ±&Ô/6¬JJPÈ͈ʣÂýˆ:£›ÀÑdÓÞÛŸâÒ¢2leT¿÷+:Ç6mCk9ÊW;>Ï¡¸< šl˜°AP±A`ÌA'ƒ¶>Õdn¼bn̼“
ø mÀ4Ù@˜°¨Ø@³èd1h¸šlп~â)>(6û­ÃXǘ¶G·Ó
ýO³ð‚§ËĈHÕĜH7/A{Á×åjÄ´êjδ›è ¼°#!¼ÀŠ„
a€bÃ
â ,Mç!,@aAôÀB^½ð´(Qä,¸J"“E‹më!.@...	í”hñr²æ†«×_ùŠ[ŸTsê57Ì@ÍMÛèv—æ°!×Üp_SÍ
qá+nŠ¨r"¿ÊÍEC1q"\µMÕsxË
¾¢V|å¬è¥X9cÅ.^\9Ã	K‹÷݀Q~=ï£ôՋòùw–†7¯^üÄåÿ·«)>
Index: Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/doc/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- Makefile.am	18 Jan 2004 15:47:44 -0000	1.19
+++ Makefile.am	25 Jan 2004 02:59:54 -0000	1.20
@@ -39,6 +39,7 @@ doc/internals/index.html: ${top_srcdir}/
 	$(XSLTPROC) -o doc/internals/ $(XSLTPROC_FLAGS) --stringparam version @VERSION@ $(CHUNK_XHTML_STYLESHEET) $<
 
 chunk: doc/index.html doc/internals/index.html
+	cp ${top_srcdir}/doc/buffers.png doc/internals/
 
 else
 

Index: buffers.png
===================================================================
RCS file: /cvsroot/oprofile/oprofile/doc/buffers.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
Binary files /tmp/cvs1nzTLJ and /tmp/cvsGETjNz differ

Index: internals.xml
===================================================================
RCS file: /cvsroot/oprofile/oprofile/doc/internals.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- internals.xml	28 Dec 2003 14:13:33 -0000	1.8
+++ internals.xml	25 Jan 2004 02:59:54 -0000	1.9
@@ -375,7 +375,7 @@ point from which the CPU may be read, up
 iterator. This provides an entirely lock-free method for extracting data
 from the CPU buffers. This process is described in detail later in this chapter.
 </para>
-<figure title="The OProfile buffers">
+<figure><title>The OProfile buffers</title>
 <graphic fileref="buffers.png" />
 </figure>
 </sect1>
@@ -491,10 +491,11 @@ value, we look up the mapped file's dent
 gives the dcookie ID that will uniquely identify the mapped file. Then
 we alter the absolute value such that it is an offset from the start of
 the mapping (the mapping need not start at the start of the actual file,
-so we have to consider the offset value of the mapping). These two
-values are then entered into the event buffer. In this manner, we have
-converted a PC value, which has transitory meaning only, into a static
-dcookie/offset tuple for later processing by the daemon.
+so we have to consider the offset value of the mapping). We store this
+dcookie ID into the event buffer; this identifies which binary the
+samples following it are against.
+In this manner, we have converted a PC value, which has transitory meaning
+only, into a static offset value for later processing by the daemon.
 </para>
 <para>
 We also attempt to avoid the relatively expensive lookup of the dentry
@@ -511,10 +512,130 @@ find the correct mapping.
 
 <sect1 id="processing-buffer">
 <title>Processing the buffer</title>
+
+<para>
+Now we can move onto user-space in our description of how raw interrupt
+samples are processed into useful information. As we described in
+previous sections, the kernel OProfile driver creates a large buffer of
+sample data consisting of offset values, interspersed with
+notification of changes in context. These context changes indicate how
+following samples should be attributed, and include task switches, CPU
+changes, and which dcookie the sample value is against. By processing
+this buffer entry-by-entry, we can determine where the samples should
+be accredited to. This is particularly important when using the 
+<option>--separate</option>.
+</para>
+<para>
+The file <filename>daemon/opd_trans.c</filename> contains the basic routine
+for the buffer processing. The <varname>struct transient</varname>
+structure is used to hold changes in context. Its members are modified
+as we process each entry; it is passed into the routines in
+<filename>daemon/opd_sfile.c</filename> for actually logging the sample
+to a particular sample file (which will be held in
+<filename>/var/lib/oprofile/samples/current</filename>).
+</para>
+<para>
+The buffer format is designed for conciseness, as high sampling rates
+can easily generate a lot of data. Thus, context changes are prefixed
+by an escape code, identified by <function>is_escape_code()</function>.
+If an escape code is found, the next entry in the buffer identifies
+what type of context change is being read. These are handed off to
+various handlers (see the <varname>handlers</varname> array), which
+modify the transient structure as appropriate. If it's not an escape
+code, then it must be a PC offset value, and the very next entry will
+be the numeric hardware counter. These values are read and recorded
+in the transient structure; we then do a lookup to find the correct
+sample file, and log the sample, as described in the next section.
+</para>
+
+<sect2 id="handling-kernel-samples">
+<title>Handling kernel samples</title>
+
+<para>
+Samples from kernel code require a little special handling. Because
+the binary text which the sample is against does not correspond to
+any file that the kernel directly knows about, the OProfile driver
+stores the absolute PC value in the buffer, instead of the file offset.
+Of course, we need an offset against some particular binary. To handle
+this, we keep a list of loaded modules by parsing
+<filename>/proc/modules</filename> as needed. When a module is loaded,
+a notification is placed in the OProfile buffer, and this triggers a
+re-read. We store the module name, and the loading address and size.
+This is also done for the main kernel image, as specified by the user.
+The absolute PC value is matched against each address range, and
+modified into an offset hwne the matching module is found. See 
+<filename>daemon/opd_kernel.c</filename> for the details.
+</para>
+
+</sect2>
+
+
 </sect1>
 
 <sect1 id="sample-file-generation">
-<title>Locating and writing sample files</title>
+<title>Locating and creating sample files</title>
+
+<para>
+We have a sample value and its satellite data stored in a
+<varname>struct transient</varname>, and we must locate an
+actual sample file to store the sample in, using the context
+information in the transient structure as a key. The transient data to
+sample file lookup is handled in
+<filename>daemon/opd_sfile.c</filename>. A hash is taken of the
+transient values that are relevant (depending upon the setting of
+<option>--separate</option>, some values might be irrelevant), and the
+hash value is used to lookup the list of currently open sample files.
+Of course, the sample file might not be found, in which case we need
+to create and open it.
+</para>
+<para>
+OProfile uses a rather complex scheme for naming sample files, in order
+to make selecting relevant sample files easier for the post-profiling
+utilities. The exact details of the scheme are given in
+<filename>oprofile-tests/pp_interface</filename>, but for now it will
+suffice to remember that the filename will include only relevant
+information for the current settings, taken from the transient data. A
+fully-specified filename looks something like :
+</para>
+<computeroutput>
+/var/lib/oprofile/samples/current/{root}/usr/bin/xmms/{dep}/{root}/lib/tls/libc-2.3.2.so/CPU_CLK_UNHALTED.100000.0.28082.28089.0
+</computeroutput>
+<para>
+It should be clear that this identifies such information as the
+application binary, the dependent (library) binary, the hardware event,
+and the process and thread ID. Typically, not all this information is
+needed, in which cases some values may be replaced with the token
+<filename>all</filename>.
+</para>
+<para>
+The code that generates this filename and opens the file is found in
+<filename>daemon/opd_mangling.c</filename>. You may have realised that
+at this point, we do not have the binary image file names, only the
+dcookie values. In order to determine a file name, a dcookie value is
+looked up in the dcookie cache. This is to be found in
+<filename>daemon/opd_cookie.c</filename>. Since dcookies are both
+persistent and unique during a sampling session, we can cache the
+values. If the value is not found in the cache, then we ask the kernel
+to do the lookup from value to file name for us by calling
+<function>lookup_dcookie()</function>. This looks up the value in a
+kernel-side cache (see <filename>fs/dcookies.c</filename>) and returns
+the fully-qualified file name to userspace.
+</para>
+
+</sect1>
+
+<sect1 id="sample-file-writing">
+<title>Writing data to a sample file</title>
+
+<para>
+Each specific sample file is a hashed collection, where the key is
+the PC offset from the transient data, and the value is the number of
+samples recorded against that offset. The files are
+<function>mmap()</function>ed into the daemon's memory space. The code
+to actually log the write against the sample file can be found in
+<filename>libdb/</filename>.
+</para>
+
 </sect1>
 
 </chapter>

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8819

Modified Files:
	ChangeLog 
Log Message:
internals doc updates


Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1431
retrieving revision 1.1432
diff -u -p -d -r1.1431 -r1.1432
--- ChangeLog	25 Jan 2004 01:53:45 -0000	1.1431
+++ ChangeLog	25 Jan 2004 02:59:33 -0000	1.1432
@@ -1,3 +1,13 @@
+2004-01-25  John Levon  <levon@...>
+
+	* doc/Makefile.am: fix make chunk
+
+	* doc/buffers.dia: add editable source
+
+	* doc/buffers.png: fix stupid typos
+
+	* doc/internals.xml: add some more text
+
 2004-01-25  Philippe Elie  <phil.el@...>
 
 	* libpp/parse_filename.h:

Update of /cvsroot/oprofile/oprofile-www/credits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3786/credits

Modified Files:
	index.php3 
Log Message:
fix credits page


Index: index.php3
===================================================================
RCS file: /cvsroot/oprofile/oprofile-www/credits/index.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- index.php3	27 Aug 2003 23:37:15 -0000	1.3
+++ index.php3	25 Jan 2004 02:30:15 -0000	1.4
@@ -3,12 +3,12 @@
 <h2>Lead developers</h2>
 
 <dl>
-<dt><a href="mailto:levon@... Levon</a></dt>
+<dt>John Levon</dt>
 <dd>
 Project founder.
 </dd>
 
-<dt><a href="mailto:phil.el@... Elie</a></dt>
+<dt>Philippe Elie</dt>
 <dd>
 Endless features and bugfixes.
 </dd>
@@ -18,27 +18,27 @@ Endless features and bugfixes.
 <h2>Contributors</h2>
 
 <dl>
-<dt><a href="mailto:davej@... Jones</a></dt>
+<dt>Dave Jones</dt>
 <dd>
 Athlon/Duron port, Hammer (x86-64) port, various bug fixes.
 </dd>
 
-<dt><a href="mailto:bobm@... Montgomery</a></dt>
+<dt>Bob Montgomery</dt>
 <dd>
 RTC mode initial support, IA/64 initial port, various bug fixes.
 </dd>
 
-<dt><a href="mailto:wcohen@... Cohen</a></dt>
+<dt>Will Cohen</dt>
 <dd>
 Various bug fixes and clean ups, IA/64 port maintainer.
 </dd>
  
-<dt><a href="mailto:graydon@... Hoare</a></dt>
+<dt>Graydon Hoare</dt>
 <dd>
 Pentium 4 support, Hammer (x86-64), bug fixes and clean ups.
 </dd>
  
-<dt><a href="mailto:falk@... Hueffner</a></dt>
+<dt>Falk Hueffner</dt>
 <dd>
 Alpha user-space support.
 </dd>

Update of /cvsroot/oprofile/oprofile-www/download
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1087/download

Modified Files:
	index.php3 
Log Message:
small cleanup


Index: index.php3
===================================================================
RCS file: /cvsroot/oprofile/oprofile-www/download/index.php3,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- index.php3	24 Jan 2004 16:51:18 -0000	1.14
+++ index.php3	25 Jan 2004 02:16:06 -0000	1.15
@@ -25,6 +25,13 @@ dorelease("0.0.9");
 Note: Binary builds of oprofile are not yet available (unless people wish to contribute some). 
 </p>
 
+<h2>Additional patches</h2>
+
+<p>
+There are a number of <?php rlink("patches/", "additional patches"); ?> to the kernel driver you may
+need or find useful.
+</p>
+
 <h2>CVS</h2>
 
 <p>
@@ -40,13 +47,6 @@ cvs -z3 co oprofile</kbd>
 There is no password (just press enter).
 </p>
 
-<h3>Additional patches</h3>
-
-<p>
-There are a number of <?php rlink("patches/", "additional patches"); ?> to the kernel driver you may
-need or find useful.
-</p>
-
 <h3>Building CVS</h3>
 
 <p>

Update of /cvsroot/oprofile/oprofile/libpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30026/libpp

Modified Files:
	arrange_profiles.cpp 
Log Message:
fix comment, no ChangeLog

Index: arrange_profiles.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/arrange_profiles.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- arrange_profiles.cpp	25 Jan 2004 01:53:55 -0000	1.30
+++ arrange_profiles.cpp	25 Jan 2004 02:00:01 -0000	1.31
@@ -351,9 +351,8 @@ add_to_profile_sample_files(profile_samp
     parsed_filename const & parsed)
 {
 	if (parsed.cg_image.empty()) {
-		// FIXME: is it worth (for now yes I expect bugs ...)
+		// We can't allow to overwrite sample_filename.
 		if (!sample_files.sample_filename.empty()) {
-			// FIXME: humm ?
 			ostringstream out;
 			out << "add_to_profile_sample_files(): sample file "
 			    << "parsed twice ?\nsample_filename:\n"

Update of /cvsroot/oprofile/oprofile/pp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28650/pp

Modified Files:
	opgprof.cpp 
Log Message:
fix merging of different tid/tgid/cpu

Index: opgprof.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opgprof.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -d -r1.18 -r1.19
--- opgprof.cpp	20 Jan 2004 13:49:32 -0000	1.18
+++ opgprof.cpp	25 Jan 2004 01:53:56 -0000	1.19
@@ -254,6 +254,8 @@ void load_cg(profile_t & cg_db, list<pro
 		list<string>::const_iterator const cend = it->cg_files.end();
 		for (cit = it->cg_files.begin(); cit != cend; ++cit) {
 			// FIXME: do we need filtering ?
+			/* We can't handle start_offset now but after splitting
+			 * data in from/to eip. */
 			cg_db.add_sample_file(*cit, 0);
 		}
 	}

Update of /cvsroot/oprofile/oprofile/libpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28650/libpp

Modified Files:
	arrange_profiles.cpp parse_filename.cpp parse_filename.h 
Log Message:
fix merging of different tid/tgid/cpu

Index: arrange_profiles.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/arrange_profiles.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- arrange_profiles.cpp	24 Jan 2004 20:01:40 -0000	1.29
+++ arrange_profiles.cpp	25 Jan 2004 01:53:55 -0000	1.30
@@ -383,7 +383,8 @@ find_profile_sample_files(list<profile_s
 			parsed_filename psample_filename =
 				parse_filename(it->sample_filename);
 			if (psample_filename.lib_image == parsed.lib_image &&
-			    psample_filename.image == parsed.image)
+			    psample_filename.image == parsed.image &&
+			    psample_filename.profile_spec_equal(parsed))
 				return *it;
 		}
 
@@ -392,7 +393,8 @@ find_profile_sample_files(list<profile_s
 		for (cit = it->cg_files.begin(); cit != cend; ++cit) {
 			parsed_filename pcg_filename = parse_filename(*cit);
 			if (pcg_filename.lib_image == parsed.lib_image &&
-			    pcg_filename.image == parsed.image)
+			    pcg_filename.image == parsed.image &&
+			    pcg_filename.profile_spec_equal(parsed))
 				return *it;
 		}
 	}

Index: parse_filename.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/parse_filename.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- parse_filename.cpp	19 Jan 2004 20:52:28 -0000	1.6
+++ parse_filename.cpp	25 Jan 2004 01:53:55 -0000	1.7
@@ -159,6 +159,15 @@ parsed_filename parse_filename(string co
 	return result;
 }
 
+bool parsed_filename::profile_spec_equal(parsed_filename const & parsed)
+{
+	return 	event == parsed.event &&
+		count == parsed.count &&
+		unitmask == parsed.unitmask &&
+		tgid == parsed.tgid &&
+		tid == parsed.tid &&
+		cpu == parsed.tid;
+}
 
 ostream & operator<<(ostream & out, parsed_filename const & data)
 {

Index: parse_filename.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/parse_filename.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- parse_filename.h	18 Jan 2004 02:21:15 -0000	1.2
+++ parse_filename.h	25 Jan 2004 01:53:55 -0000	1.3
@@ -30,6 +30,9 @@ struct parsed_filename
 	std::string tid;
 	std::string cpu;
 
+	/// return true if the profile specification are identical.
+	bool profile_spec_equal(parsed_filename const & parsed);
+
 	/**
 	 * the original sample filename from which the
 	 * above components are built

Update of /cvsroot/oprofile/oprofile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28650

Modified Files:
	ChangeLog 
Log Message:
fix merging of different tid/tgid/cpu

Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.1430
retrieving revision 1.1431
diff -u -p -d -r1.1430 -r1.1431
--- ChangeLog	24 Jan 2004 17:23:18 -0000	1.1430
+++ ChangeLog	25 Jan 2004 01:53:45 -0000	1.1431
@@ -1,3 +1,10 @@
+2004-01-25  Philippe Elie  <phil.el@...>
+
+	* libpp/parse_filename.h:
+	* libpp/parse_filename.cpp: profile_spec_equal() new predicate
+	* libpp/arrange_profiles.cpp: use it to ensure we cerate a new
+	  profile_samples_file when needed.
+
 2004-01-24  John Levon  <levon@...>
 
 	* doc/oprofile.1.in:

Update of /cvsroot/oprofile/oprofile/module/x86
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/module/x86

Modified Files:
	op_model_p4.c op_msr.h op_nmi.c 
Log Message:
check_style fixes, no changelog


Index: op_model_p4.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/op_model_p4.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- op_model_p4.c	19 Jan 2004 20:00:28 -0000	1.12
+++ op_model_p4.c	24 Jan 2004 20:09:34 -0000	1.13
@@ -27,11 +27,11 @@ struct p4_counter_binding {
 };
 
 struct p4_event_binding {
-	int escr_select;  /* value to put in CCCR */
-	int event_select; /* value to put in ESCR */
+	int escr_select;  /**< value to put in CCCR */
+	int event_select; /**< value to put in ESCR */
 	struct {
-		int virt_counter; /* for this counter... */
-		int escr_address; /* use this ESCR       */
+		int virt_counter; /**< for this counter... */
+		int escr_address; /**< use this ESCR       */
 	} bindings[2];
 };
 
@@ -63,73 +63,73 @@ static struct p4_counter_binding p4_coun
 
 static struct p4_event_binding p4_events[NUM_EVENTS] = {
 	
-	{ /* BRANCH_RETIRED */
+	/* BRANCH_RETIRED */ {
 		0x05, 0x06, 
 		{ {CTR_IQ_4, MSR_P4_CRU_ESCR2},
 		  {CTR_IQ_5, MSR_P4_CRU_ESCR3} }
 	},
 	
-	{ /* MISPRED_BRANCH_RETIRED */
+	/* MISPRED_BRANCH_RETIRED */ {
 		0x04, 0x03, 
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR0},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR1} }
 	},
 	
-	{ /* TC_DELIVER_MODE */
+	/* TC_DELIVER_MODE */ {
 		0x01, 0x01,
 		{ { CTR_MS_0, MSR_P4_TC_ESCR0},  
 		  { CTR_MS_2, MSR_P4_TC_ESCR1} }
 	},
 	
-	{ /* BPU_FETCH_REQUEST */
+	/* BPU_FETCH_REQUEST */ {
 		0x00, 0x03, 
 		{ { CTR_BPU_0, MSR_P4_BPU_ESCR0},
 		  { CTR_BPU_2, MSR_P4_BPU_ESCR1} }
 	},
 
-	{ /* ITLB_REFERENCE */
+	/* ITLB_REFERENCE */ {
 		0x03, 0x18,
 		{ { CTR_BPU_0, MSR_P4_ITLB_ESCR0},
 		  { CTR_BPU_2, MSR_P4_ITLB_ESCR1} }
 	},
 
-	{ /* MEMORY_CANCEL */
+	/* MEMORY_CANCEL */ {
 		0x05, 0x02,
 		{ { CTR_FLAME_0, MSR_P4_DAC_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_DAC_ESCR1} }
 	},
 
-	{ /* MEMORY_COMPLETE */
+	/* MEMORY_COMPLETE */ {
 		0x02, 0x08,
 		{ { CTR_FLAME_0, MSR_P4_SAAT_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_SAAT_ESCR1} }
 	},
 
-	{ /* LOAD_PORT_REPLAY */
+	/* LOAD_PORT_REPLAY */ {
 		0x02, 0x04, 
 		{ { CTR_FLAME_0, MSR_P4_SAAT_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_SAAT_ESCR1} }
 	},
 
-	{ /* STORE_PORT_REPLAY */
+	/* STORE_PORT_REPLAY */ {
 		0x02, 0x05,
 		{ { CTR_FLAME_0, MSR_P4_SAAT_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_SAAT_ESCR1} }
 	},
 
-	{ /* MOB_LOAD_REPLAY */
+	/* MOB_LOAD_REPLAY */ {
 		0x02, 0x03,
 		{ { CTR_BPU_0, MSR_P4_MOB_ESCR0},
 		  { CTR_BPU_2, MSR_P4_MOB_ESCR1} }
 	},
 
-	{ /* PAGE_WALK_TYPE */
+	/* PAGE_WALK_TYPE */ {
 		0x04, 0x01,
 		{ { CTR_BPU_0, MSR_P4_PMH_ESCR0},
 		  { CTR_BPU_2, MSR_P4_PMH_ESCR1} }
 	},
 
-	{ /* BSQ_CACHE_REFERENCE */
+	/* BSQ_CACHE_REFERENCE */ {
 		0x07, 0x0c, 
 		{ { CTR_BPU_0, MSR_P4_BSU_ESCR0},
 		  { CTR_BPU_2, MSR_P4_BSU_ESCR1} }
@@ -137,31 +137,31 @@ static struct p4_event_binding p4_events
 
 	/* intel doc vol 3 table A-1: P4 and xeon with cpuid signature < 0xf27
 	 * doen't allow MSR_FSB_ESCR1 so only counter 0 is available */
-	{ /* IOQ_ALLOCATION */
+	/* IOQ_ALLOCATION */ {
 		0x06, 0x03, 
 		{ { CTR_BPU_0, MSR_P4_FSB_ESCR0},
 		  { 0, 0 } }
 	},
 
-	{ /* IOQ_ACTIVE_ENTRIES */
+	/* IOQ_ACTIVE_ENTRIES */ {
 		0x06, 0x1a, 
 		{ { CTR_BPU_2, MSR_P4_FSB_ESCR1},
 		  { 0, 0 } }
 	},
 
-	{ /* FSB_DATA_ACTIVITY */
+	/* FSB_DATA_ACTIVITY */ {
 		0x06, 0x17, 
 		{ { CTR_BPU_0, MSR_P4_FSB_ESCR0},
 		  { CTR_BPU_2, MSR_P4_FSB_ESCR1} }
 	},
 
-	{ /* BSQ_ALLOCATION */
+	/* BSQ_ALLOCATION */ {
 		0x07, 0x05, 
 		{ { CTR_BPU_0, MSR_P4_BSU_ESCR0},
 		  { 0, 0 } }
 	},
 
-	{ /* BSQ_ACTIVE_ENTRIES */
+	/* BSQ_ACTIVE_ENTRIES */ {
 		0x07, 0x06,
 		/* FIXME intel doc don't say which ESCR1 to use, using
 		   BSU_ESCR1 is a sensible guess but will need validation */
@@ -169,133 +169,134 @@ static struct p4_event_binding p4_events
 		  { 0, 0 } }
 	},
 
-	{ /* X87_ASSIST */
+	/* X87_ASSIST */ {
 		0x05, 0x03, 
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR2},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR3} }
 	},
 
-	{ /* SSE_INPUT_ASSIST */
+	/* SSE_INPUT_ASSIST */ {
 		0x01, 0x34,
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
   
-	{ /* PACKED_SP_UOP */
+	/* PACKED_SP_UOP */ {
 		0x01, 0x08, 
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
   
-	{ /* PACKED_DP_UOP */
+	/* PACKED_DP_UOP */ {
 		0x01, 0x0c, 
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
 
-	{ /* SCALAR_SP_UOP */
+	/* SCALAR_SP_UOP */ {
 		0x01, 0x0a, 
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
 
-	{ /* SCALAR_DP_UOP */
+	/* SCALAR_DP_UOP */ {
 		0x01, 0x0e,
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
 
-	{ /* 64BIT_MMX_UOP */
+	/* 64BIT_MMX_UOP */ {
 		0x01, 0x02, 
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
   
-	{ /* 128BIT_MMX_UOP */
+	/* 128BIT_MMX_UOP */ {
 		0x01, 0x1a, 
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
 
-	{ /* X87_FP_UOP */
+	/* X87_FP_UOP */ {
 		0x01, 0x04, 
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
   
-	{ /* X87_SIMD_MOVES_UOP */
+	/* X87_SIMD_MOVES_UOP */ {
 		0x01, 0x2e, 
 		{ { CTR_FLAME_0, MSR_P4_FIRM_ESCR0},
 		  { CTR_FLAME_2, MSR_P4_FIRM_ESCR1} }
 	},
   
-	{ /* MACHINE_CLEAR */
+	/* MACHINE_CLEAR */ {
 		0x05, 0x02, 
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR2},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR3} }
 	},
 
-	{ /* GLOBAL_POWER_EVENTS */
-		0x06, 0x13 /* older manual says 0x05, newer 0x13 */,
+	/* GLOBAL_POWER_EVENTS */ {
+		/* older manual says 0x05, newer 0x13 */
+		0x06, 0x13,
 		{ { CTR_BPU_0, MSR_P4_FSB_ESCR0},
 		  { CTR_BPU_2, MSR_P4_FSB_ESCR1} }
 	},
   
-	{ /* TC_MS_XFER */
+	/* TC_MS_XFER */ {
 		0x00, 0x05, 
 		{ { CTR_MS_0, MSR_P4_MS_ESCR0},
 		  { CTR_MS_2, MSR_P4_MS_ESCR1} }
 	},
 
-	{ /* UOP_QUEUE_WRITES */
+	/* UOP_QUEUE_WRITES */ {
 		0x00, 0x09,
 		{ { CTR_MS_0, MSR_P4_MS_ESCR0},
 		  { CTR_MS_2, MSR_P4_MS_ESCR1} }
 	},
 
-	{ /* FRONT_END_EVENT */
+	/* FRONT_END_EVENT */ {
 		0x05, 0x08,
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR2},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR3} }
 	},
 
-	{ /* EXECUTION_EVENT */
+	/* EXECUTION_EVENT */ {
 		0x05, 0x0c,
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR2},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR3} }
 	},
 
-	{ /* REPLAY_EVENT */
+	/* REPLAY_EVENT */ {
 		0x05, 0x09,
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR2},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR3} }
 	},
 
-	{ /* INSTR_RETIRED */
+	/* INSTR_RETIRED */ {
 		0x04, 0x02, 
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR0},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR1} }
 	},
 
-	{ /* UOPS_RETIRED */
+	/* UOPS_RETIRED */ {
 		0x04, 0x01,
 		{ { CTR_IQ_4, MSR_P4_CRU_ESCR0},
 		  { CTR_IQ_5, MSR_P4_CRU_ESCR1} }
 	},
 
-	{ /* UOP_TYPE */    
+	/* UOP_TYPE */     {
 		0x02, 0x02, 
 		{ { CTR_IQ_4, MSR_P4_RAT_ESCR0},
 		  { CTR_IQ_5, MSR_P4_RAT_ESCR1} }
 	},
 
-	{ /* RETIRED_MISPRED_BRANCH_TYPE */
+	/* RETIRED_MISPRED_BRANCH_TYPE */ {
 		0x02, 0x05, 
 		{ { CTR_MS_0, MSR_P4_TBPU_ESCR0},
 		  { CTR_MS_2, MSR_P4_TBPU_ESCR1} }
 	},
 
-	{ /* RETIRED_BRANCH_TYPE */
+	/* RETIRED_BRANCH_TYPE */ {
 		0x02, 0x04,
 		{ { CTR_MS_0, MSR_P4_TBPU_ESCR0},
 		  { CTR_MS_2, MSR_P4_TBPU_ESCR1} }

Index: op_msr.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/op_msr.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- op_msr.h	19 Jan 2004 20:00:28 -0000	1.7
+++ op_msr.h	24 Jan 2004 20:10:33 -0000	1.8
@@ -306,8 +306,9 @@
 #ifndef MSR_P4_SSU_ESCR0
 #define MSR_P4_SSU_ESCR0 0x3be
 #endif
+/* guess: not defined in manual */
 #ifndef MSR_P4_SSU_ESCR1
-#define MSR_P4_SSU_ESCR1 0x3bf    /* guess: not defined in manual */
+#define MSR_P4_SSU_ESCR1 0x3bf
 #endif
 #ifndef MSR_P4_TBPU_ESCR0
 #define MSR_P4_TBPU_ESCR0 0x3c2
@@ -328,8 +329,9 @@
 #define MSR_P4_U2L_ESCR1 0x3b1
 #endif
 
+/* Hyper-Threading */
 #ifndef X86_FEATURE_HT
-#define X86_FEATURE_HT		(0*32+28) /* Hyper-Threading */
+#define X86_FEATURE_HT		(0*32+28)
 #endif
 
 #endif /* OP_MSR_H */

Index: op_nmi.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/x86/op_nmi.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- op_nmi.c	19 Jan 2004 20:00:28 -0000	1.23
+++ op_nmi.c	24 Jan 2004 20:10:37 -0000	1.24
@@ -50,9 +50,9 @@ static void find_tss(int cpu)
 
 	asm volatile("str %0 ; sgdt %1" : "=r" (tr), "=m" (d));	
 	ld = (struct ldttss_desc *)(d.address + tr);
-	per_cpu_tss[cpu] = (void *)(ld->base0 | ((u64)ld->base1 << 16) |
-			   ((u64)ld->base2 << 24) | 
-			   ((u64)ld->base3 << 32));
+	per_cpu_tss[cpu] =
+		(void *)(ld->base0 | ((u64)ld->base1 << 16) |
+		((u64)ld->base2 << 24) | ((u64)ld->base3 << 32));
 } 
 
 asmlinkage void op_do_nmi(struct pt_regs * regs)

Update of /cvsroot/oprofile/oprofile/pp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/pp

Modified Files:
	opannotate.cpp opdiff_options.cpp 
Log Message:
check_style fixes, no changelog


Index: opannotate.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opannotate.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -d -r1.31 -r1.32
--- opannotate.cpp	18 Jan 2004 02:21:15 -0000	1.31
+++ opannotate.cpp	24 Jan 2004 20:12:16 -0000	1.32
@@ -333,7 +333,8 @@ void do_one_output_objdump(symbol_collec
 		return ;
 	}
 
-	reader.terminate_process();  // force error code to be acquired
+	// force error code to be acquired
+	reader.terminate_process();
 
 	// required because if objdump stop by signal all above things suceeed
 	// (signal error message are not output through stdout/stderr)

Index: opdiff_options.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/pp/opdiff_options.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- opdiff_options.cpp	29 May 2003 00:55:29 -0000	1.2
+++ opdiff_options.cpp	24 Jan 2004 20:13:17 -0000	1.3
@@ -25,7 +25,7 @@ namespace {
 }  // anonymous namespace
 
 
-void handle_options(vector<string> const & /*non_options*/)
+void handle_options(vector<string> const &)
 {
 	using namespace options;
 }

Update of /cvsroot/oprofile/oprofile/module/ia64
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/module/ia64

Modified Files:
	op_pmu.c op_syscalls.c 
Log Message:
check_style fixes, no changelog


Index: op_pmu.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/ia64/op_pmu.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- op_pmu.c	19 Jan 2004 20:00:28 -0000	1.11
+++ op_pmu.c	24 Jan 2004 20:09:05 -0000	1.12
@@ -210,7 +210,8 @@ disable_psr(void *dummy)
 	regs = (struct pt_regs *)((unsigned long) current + IA64_STK_OFFSET);
 	regs--;
 	ia64_psr(regs)->pp = 0;
-	ia64_psr(regs)->up = 0; /* shouldn't need to */
+	/* shouldn't need to */
+	ia64_psr(regs)->up = 0;
 
 	/* disable profiling for my current state */
 	__asm__ __volatile__ ("rsm psr.pp;;"::: "memory");
@@ -281,12 +282,10 @@ op_tasklist_toggle_pp(unsigned int val)
 	struct task_struct *p;
 	struct pt_regs *regs;
 
-	DBprintk(("invoked by [%d] pp=%u\n", current->pid, val));
-
 	read_lock(&tasklist_lock);
 
 	for_each_task(p) {
-       		regs = (struct pt_regs *)((unsigned long) p + IA64_STK_OFFSET);
+		regs = (struct pt_regs *)((unsigned long) p + IA64_STK_OFFSET);
 
 		/*
 		 * position on pt_regs saved on stack on 1st entry into the kernel
@@ -527,14 +526,14 @@ pmu_init(void)
 
 	/* figure out processor type configure number of bits in pmd
 	   and number of counters */
-	switch(get_cpu_type()){
+	switch (get_cpu_type()) {
 	case CPU_IA64_1:
-	  pmd_mask = IA64_1_PMD_MASK_VAL; break;
+		pmd_mask = IA64_1_PMD_MASK_VAL; break;
 	case CPU_IA64_2:
 	case CPU_IA64:
-	  pmd_mask = IA64_2_PMD_MASK_VAL; break;
+		pmd_mask = IA64_2_PMD_MASK_VAL; break;
 	default:
-	  err = -EIO; break;
+		err = -EIO; break;
 	}
 
 	op_nr_counters = 4;

Index: op_syscalls.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/module/ia64/op_syscalls.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- op_syscalls.c	19 Jan 2004 20:00:28 -0000	1.6
+++ op_syscalls.c	24 Jan 2004 20:09:21 -0000	1.7
@@ -164,7 +164,7 @@ my_sys_execve (char *filename, char **ar
 	filename = getname(filename);
 	error = PTR_ERR(filename);
 	if (IS_ERR(filename))
-	        goto out;
+		goto out;
 	error = do_execve(filename, argv, envp, regs);
 
 	if (!error) {

Update of /cvsroot/oprofile/oprofile/libpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/libpp

Modified Files:
	arrange_profiles.cpp op_header.cpp 
Log Message:
check_style fixes, no changelog


Index: arrange_profiles.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/arrange_profiles.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- arrange_profiles.cpp	18 Jan 2004 02:21:14 -0000	1.28
+++ arrange_profiles.cpp	24 Jan 2004 20:01:40 -0000	1.29
@@ -136,7 +136,7 @@ opd_header const get_first_header(profil
 			file = *sample_files.cg_files.begin();
 	} else {
 		profile_sample_files const & sample_files 
-		  = *(profile.files.begin());
+			= *(profile.files.begin());
 		if (!sample_files.sample_filename.empty())
 			file = sample_files.sample_filename;
 		else

Index: op_header.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libpp/op_header.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- op_header.cpp	3 Nov 2003 23:48:49 -0000	1.16
+++ op_header.cpp	24 Jan 2004 20:02:57 -0000	1.17
@@ -60,7 +60,7 @@ void check_mtime(string const & file, op
 	time_t const newmtime = op_get_mtime(file.c_str());
 
 	if (newmtime == header.mtime)
-	       return;
+		return;
 
 	if (warned_files.find(file) != warned_files.end())
 		return;

Update of /cvsroot/oprofile/oprofile/libutil++/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/libutil++/tests

Modified Files:
	file_manip_tests.cpp string_manip_tests.cpp 
Log Message:
check_style fixes, no changelog


Index: file_manip_tests.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil++/tests/file_manip_tests.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- file_manip_tests.cpp	28 Dec 2003 16:20:59 -0000	1.7
+++ file_manip_tests.cpp	24 Jan 2004 20:05:47 -0000	1.8
@@ -21,7 +21,7 @@ using namespace std;
 
 template <typename Input, typename Output>
 struct input_output {
-	Input  input;
+	Input input;
 	Output output;
 };
 

Index: string_manip_tests.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil++/tests/string_manip_tests.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- string_manip_tests.cpp	19 Jan 2004 20:00:27 -0000	1.10
+++ string_manip_tests.cpp	24 Jan 2004 20:06:21 -0000	1.11
@@ -21,7 +21,7 @@ using namespace std;
 
 template <typename Input, typename Output>
 struct input_output {
-	Input  input;
+	Input input;
 	Output output;
 };

Update of /cvsroot/oprofile/oprofile/libutil++
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/libutil++

Modified Files:
	cverb.cpp file_manip.cpp 
Log Message:
check_style fixes, no changelog


Index: cverb.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil++/cverb.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- cverb.cpp	20 Jan 2004 15:43:45 -0000	1.9
+++ cverb.cpp	24 Jan 2004 20:03:54 -0000	1.10
@@ -122,7 +122,7 @@ bool verbose::setup(vector<string> const
  * ofstream fout("logfile");
  * fout << debug << "foo";
  */
-ostream& operator<<(cverb_object & /*out*/, verbose const & v)
+ostream& operator<<(cverb_object &, verbose const & v)
 {
 	return v.set ? cout : null_stream;
 }

Index: file_manip.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil++/file_manip.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- file_manip.cpp	13 Nov 2003 15:22:58 -0000	1.24
+++ file_manip.cpp	24 Jan 2004 20:05:15 -0000	1.25
@@ -146,7 +146,7 @@ string op_dirname(string const & file_na
 
 	result.erase(pos, result.length() - pos); 	 
 
-	// "////usr" must return "/" 	 
+	// "////usr" must return "/"
 	return erase_trailing_path_separator(result);
 }

Update of /cvsroot/oprofile/oprofile/libop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242/libop

Modified Files:
	op_mangle.c 
Log Message:
check_style fixes, no changelog


Index: op_mangle.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libop/op_mangle.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- op_mangle.c	18 Jan 2004 02:21:14 -0000	1.9
+++ op_mangle.c	24 Jan 2004 19:59:46 -0000	1.10
@@ -40,15 +40,16 @@ char * op_mangle_filename(struct mangle_
 	char const * dep_name = values->image_name;
 
 	len = strlen(OP_SAMPLES_CURRENT_DIR) + strlen(values->image_name)
-	      + 1 + strlen(values->event_name) 
-	      + 1 + strlen(values->dep_name) + 1;
+		+ 1 + strlen(values->event_name) 
+		+ 1 + strlen(values->dep_name) + 1;
 
 	if (values->flags & MANGLE_CALLGRAPH)
 		len += strlen(values->cg_image_name) + 1;
 
 	/* provision for tgid, tid, unit_mask, cpu and some {root}, {dep},
 	 * {kern} and {cg} marker */
-	len += 256;	/* FIXME: too ugly */
+	/* FIXME: too ugly */
+	len += 256;
 
 	mangled = xmalloc(len);