Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	ChangeLog

4 files changed, 43 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 598884ca..8c8728b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,11 @@
 	* stap-serverd: Specify the full database directory name when calling
 	stap-add-server-cert.
 
+2009-02-03  Mark Wielaard  <mjw@redhat.com>
+
+	* elaborate.cxx (match_node::find_and_build): Disambiguate error
+	messages.
+
 2009-02-02  Stan Cox  <scox@redhat.com>
 
 	* NEWS, stapprobes.5.in: Add process.label.
diff --git a/doc/Tapset_Reference_Guide/publicanize.sh b/doc/Tapset_Reference_Guide/publicanize.sh
index b9cd7d8f..a71e60df 100644
--- a/doc/Tapset_Reference_Guide/publicanize.sh
+++ b/doc/Tapset_Reference_Guide/publicanize.sh
@@ -8,10 +8,10 @@ sed -i -e 's/^\s*//g' en-US/Tapset_Reference_Guide.xml ;
 
 #replace header
 
-cat en-US/Tapset_Reference_Guide.xml | perl -p -e 'undef $/;s|<bookinfo>\n<title>SystemTap Tapset Reference Manual</title>|<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />\n<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />|msg' | perl -p -e 'undef $/;s|<authorgroup>\n<author>\n<firstname>William</firstname>\n<surname>Cohen</surname>\n<affiliation>\n<address>\n<email>wcohen\@redhat.com</email>\n</address>\n</affiliation>\n</author>\n</authorgroup>||msg' | perl -p -e 'undef $/;s|<copyright>\n<year>2008, 2009</year>\n<holder>Red Hat, Inc.</holder>\n</copyright>||msg' | perl -p -e 'undef $/;s|<legalnotice>\n<para>\nThis documentation is free software\; you can redistribute\nit and/or modify it under the terms of the GNU General Public\nLicense version 2 as published by the Free Software Foundation.\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nThis program is distributed in the hope that it will be\nuseful, but WITHOUT ANY WARRANTY; without even the implied\nwarranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nYou should have received a copy of the GNU General Public\nLicense along with this program; if not, write to the Free\nSoftware Foundation, Inc., 59 Temple Place, Suite 330, Boston,\nMA 02111-1307 USA\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nFor more details see the file COPYING in the source\ndistribution of Linux.\n</para>\n</legalnotice>\n</bookinfo>||msg' | perl -p -e 'undef $/;s|<toc></toc>||msg' | perl -p -e 'undef $/;s|\n\n\n\n\n\n\n\n\n\n\n\n\n\n||msg' | perl -p -e 'undef $/;s|<programlisting>\n|<programlisting>\n<emphasis>(sfunction) <\/emphasis>|msg' > clean.xml
+cat en-US/Tapset_Reference_Guide.xml | perl -p -e 'undef $/;s|<bookinfo>\n<title>SystemTap Tapset Reference Manual</title>|<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />\n<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />|msg' | perl -p -e 'undef $/;s|<authorgroup>\n<author>\n<firstname>William</firstname>\n<surname>Cohen</surname>\n<affiliation>\n<address>\n<email>wcohen\@redhat.com</email>\n</address>\n</affiliation>\n</author>\n</authorgroup>||msg' | perl -p -e 'undef $/;s|<copyright>\n<year>2008, 2009</year>\n<holder>Red Hat, Inc.</holder>\n</copyright>||msg' | perl -p -e 'undef $/;s|<legalnotice>\n<para>\nThis documentation is free software\; you can redistribute\nit and/or modify it under the terms of the GNU General Public\nLicense version 2 as published by the Free Software Foundation.\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nThis program is distributed in the hope that it will be\nuseful, but WITHOUT ANY WARRANTY; without even the implied\nwarranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nYou should have received a copy of the GNU General Public\nLicense along with this program; if not, write to the Free\nSoftware Foundation, Inc., 59 Temple Place, Suite 330, Boston,\nMA 02111-1307 USA\n</para>||msg' | perl -p -e 'undef $/;s|<para>\nFor more details see the file COPYING in the source\ndistribution of Linux.\n</para>\n</legalnotice>\n</bookinfo>||msg' | perl -p -e 'undef $/;s|<toc></toc>||msg' | perl -p -e 'undef $/;s|\n\n\n\n\n\n\n\n\n\n\n\n\n\n||msg' | perl -p -e 'undef $/;s|<programlisting>\n|<programlisting>\n<emphasis>(sfunction) <\/emphasis>|msg' | perl -p -e 'undef $/;s|<para>\n</para>||msg' | perl -p -e 'undef $/;s|<para>\n\n</para>||msg' > clean.xml
 
 cp clean.xml en-US/Tapset_Reference_Guide.xml
-
+rm clean.xml
 
 # statements change synopsis tags, as they are still currently unfixed in publican-redhat 
 sed -i -e 's/refsynopsisdiv>/refsect1>/g' en-US/Tapset_Reference_Guide.xml;
@@ -23,5 +23,8 @@ sed -i -e 's/synopsis>/programlisting>\n/g' en-US/Tapset_Reference_Guide.xml;
 sed -i  -e 's/&lt;emphasis&gt;/<emphasis>/g' en-US/Tapset_Reference_Guide.xml;
 sed -i  -e 's/&lt;\/emphasis&gt;/<\/emphasis>/g' en-US/Tapset_Reference_Guide.xml;
 
+sed -i  -e 's/&lt;remark&gt;/<remark>/g' en-US/Tapset_Reference_Guide.xml;
+sed -i  -e 's/&lt;\/remark&gt;/<\/remark>/g' en-US/Tapset_Reference_Guide.xml;
+
 sed -i  -e 's/&lt;command&gt;/<command>/g' en-US/Tapset_Reference_Guide.xml;
 sed -i  -e 's/&lt;\/command&gt;/<\/command>/g' en-US/Tapset_Reference_Guide.xml;
\ No newline at end of file
diff --git a/elaborate.cxx b/elaborate.cxx
index 3b4c944c..5678e8a7 100644
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -395,7 +395,8 @@ match_node::find_and_build (systemtap_session& s,
 
 	  throw semantic_error(string("probe point mismatch at position ") +
 			       lex_cast<string> (pos) +
-			       " (alternatives:" + alternatives + ")",
+			       " (alternatives:" + alternatives + ")" +
+			       " didn't find any wildcard matches",
                                loc->tok);
 	}
     }
diff --git a/tapset/memory.stp b/tapset/memory.stp
index ea976d15..2d7f8b0c 100644
--- a/tapset/memory.stp
+++ b/tapset/memory.stp
@@ -9,11 +9,11 @@
 
 /**
  * probe vm.pagefault - Records that a page fault occurred.
- * @address: The address of the faulting memory access.
- * @write_access: Indicates whether this was a write.
+ * @address: The address of the faulting memory access; i.e. the address that caused the page fault.
+ * @write_access: Indicates whether this was a write or read access; <command>1</command> indicates a write,
+ * while <command>0</command> indicates a read.
  *
  * Context: The process which triggered the fault
- *
  */
 probe vm.pagefault = kernel.function("__handle_mm_fault@mm/memory.c") ?,
                      kernel.function("handle_mm_fault@mm/memory.c") ?
@@ -23,9 +23,12 @@ probe vm.pagefault = kernel.function("__handle_mm_fault@mm/memory.c") ?,
 }
 
 /**
- * probe vm.pagefault.return - Records type of fault that occurred.
- * @fault_type: 0 (VM_FAULT_OOM), 1 (VM_FAULT_SIGBUS),
- * 		2 (VM_FAULT_MINOR), and 3 (VM_FAULT_MAJOR)
+ * probe vm.pagefault.return - Indicates what type of fault occurred.
+ * @fault_type: Returns either 
+ * <command>0</command> (VM_FAULT_OOM) for out of memory faults, 
+ * <command>2</command> (VM_FAULT_MINOR) for minor faults, <command>3</command> (VM_FAULT_MAJOR) for 
+ * major faults, or <command>1</command> (VM_FAULT_SIGBUS) if the fault was neither OOM, minor fault, 
+ * nor major fault.
  */
 probe vm.pagefault.return = kernel.function("__handle_mm_fault@mm/memory.c").return ?,
                             kernel.function("handle_mm_fault@mm/memory.c").return ?
@@ -34,7 +37,7 @@ probe vm.pagefault.return = kernel.function("__handle_mm_fault@mm/memory.c").ret
 }
 
 /**
- * sfunction addr_to_node - Returns which NUMA node has the given address.
+ * sfunction addr_to_node - Returns which node a given address belongs to within a NUMA system.
  * @addr: The address of the faulting memory access.
  *
  */
@@ -58,7 +61,7 @@ function _IS_ZERO_PAGE:long(from:long, vaddr:long) %{ /* pure */
 
 
 /**
- * probe vm.write_shared - Write to shared page.
+ * probe vm.write_shared - Attempts at writing to a shared page.
  * @address: The address of the shared write.
  *
  * Context:
@@ -66,7 +69,7 @@ function _IS_ZERO_PAGE:long(from:long, vaddr:long) %{ /* pure */
  *
  *  Fires when a process attempts to write to a shared page.
  *  If a copy is necessary, this will be followed by a
- *  vm.write_shared_copy.
+ *  <command>vm.write_shared_copy</command>.
  */
 probe vm.write_shared = kernel.function("do_wp_page") {
     address = $address
@@ -74,15 +77,15 @@ probe vm.write_shared = kernel.function("do_wp_page") {
 
 /**
  * probe vm.write_shared_copy- Page copy for shared page write.
- * @address: the address of the shared write.
- * @zero: boolean indicating whether it is a zero page
+ * @address: The address of the shared write.
+ * @zero: Boolean indicating whether it is a zero page
  *         (can do a clear instead of a copy).
  *
  * Context:
  *  The process attempting the write.
  *
  *  Fires when a write to a shared page requires a page copy.  This is
- *  always preceded by a vm.shared_write.
+ *  always preceded by a <command>vm.shared_write</command>.
  */
 probe vm.write_shared_copy = kernel.function("copy_cow_page")? {
     address = $address
@@ -91,12 +94,12 @@ probe vm.write_shared_copy = kernel.function("copy_cow_page")? {
 
 
 /**
- * probe vm.mmap - Fires when an mmap is requested.
- * @address: the requested address
- * @length: the length of the memory segment 
+ * probe vm.mmap - Fires when an <command>mmap</command> is requested.
+ * @address: The requested address
+ * @length: The length of the memory segment 
  *
  * Context:
- *  The process calling mmap.
+ *  The process calling <command>mmap</command>.
  */
 probe vm.mmap = kernel.function("do_mmap"), kernel.function("do_mmap2")? {
     address = $addr
@@ -105,12 +108,12 @@ probe vm.mmap = kernel.function("do_mmap"), kernel.function("do_mmap2")? {
 
 
 /**
- * probe vm.munmap - Fires when an munmap is requested.
- * @address: the requested address
- * @length: the length of the memory segment 
+ * probe vm.munmap - Fires when an <command>munmap</command> is requested.
+ * @address: The requested address
+ * @length: The length of the memory segment 
  *
  * Context:
- *  The process calling munmap.
+ *  The process calling <command>munmap</command>.
  */
 probe vm.munmap = kernel.function("do_munmap") {
     address = $start
@@ -118,12 +121,12 @@ probe vm.munmap = kernel.function("do_munmap") {
 }
 
 /**
- * probe vm.brk - Fires when a brk is requested (resizing a heap).
- * @address: the requested address
- * @length: the length of the memory segment 
+ * probe vm.brk - Fires when a <command>brk</command> is requested (i.e. the heap will be resized).
+ * @address: The requested address
+ * @length: The length of the memory segment 
  *
  * Context:
- *  The process calling brk.
+ *  The process calling <command>brk</command>.
  */
 probe vm.brk = kernel.function("do_brk") {
     address = $addr
@@ -131,12 +134,12 @@ probe vm.brk = kernel.function("do_brk") {
 }
 
 /**
- * probe vm.oom_kill - Fires when a thread is targetted by the OOM killer.
- * @task: the task being killed
+ * probe vm.oom_kill - Fires when a thread is selected for termination by the OOM killer.
+ * @task: The task being killed
  *
  * Context:
- *  The process that tried to consume more memory, and thus
- *  triggered the OOM. (correct?)
+ *  The process that tried to consume excessive memory, and thus
+ *  triggered the OOM. <remark>(is this correct?)</remark>
  */
 probe vm.oom_kill = kernel.function("__oom_kill_task") {
     task = $p