PR4225: post-merge changelogs

3 files changed, 32 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index d9eccaef..367d4adf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2008-09-01  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR4225 merge.
+	* tapsets.cxx: Add prototype user-space probing support.  Collateral
+	damage breaks symbol-table-only (dwarfless) probing, PR6864.
+	(setup_user, setup_kernel): Split & reorganized.
+	(class uprobe_derived_probe): Nearly all new code.
+	(base_query): Add "has_module" and "has_process" flags.
+	(dwarf_builder): Add "user_dw" map.
+	(dwarf_query::add_probe_point): Use ".dynamic" pseudo-reloc-base for
+	ET_DYN modules; ".absolute" for ET_EXEC.
+	(register_patterns): Register process(...) uprobe-based probes.
+	(task_finder_derived_probe_group::create_session_group): Let runtime
+	code assert CONFIG_UTRACE.
+	(base_query ctor, dwarf_builder::build, itrace_builder,
+	utrace_derived_probe): Use find_executable() to resolve FOO path in
+	process("FOO").
+	(utrace_derived_probe ctor): Reverse-engineer probe point.
+	* main.cxx (main): Don't override $PATH etc.
+	* util.cxx (find_executable): Reorganize, simplify, canonicalize.
+	* util.h, hash.cxx: Corresponding changes.
+
 2008-08-29  Dave Brolley  <brolley@redhat.com>
 
 	* stap-server.8.in: New man page.
@@ -85,10 +107,6 @@
 
 2008-08-24  Frank Ch. Eigler  <fche@elastic.org>
 
-	* tapsets.cxx (uprobe_derived_probe ctor): Ditto.
-
-2008-08-24  Frank Ch. Eigler  <fche@elastic.org>
-
 	* tapsets.cxx (query_statement): Leave empty string for unknown file
 	name.
 	(dwarf_derived_probe ctor): Don't synthesize "@filename:lineno"
@@ -294,19 +312,6 @@
 
 2008-08-09  Frank Ch. Eigler  <fche@elastic.org>
 
-       * main.cxx (main): Don't override $PATH etc.
-       * tapsets.cxx (base_query ctor, dwarf_builder::build,
-       itrace_builder, utrace_derived_probe): Use find_executable()
-       to resolve FOO path in process("FOO").
-       * util.cxx (find_executable): Duplicate execvp logic.
-
-2008-08-09  Frank Ch. Eigler  <fche@elastic.org>
-
-	* util.cxx (find_executable): Reorganize, simplify, canonicalize.
-	* util.h, hash.cxx: Corresponding changes.
-
-2008-08-09  Frank Ch. Eigler  <fche@elastic.org>
-
 	* Makefile.am (example index): Only warn and instruct on index
 	regeneration.  Do not actually perform it as the source tree
 	should be considered (and can really be) read-only.
diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index b7e44a0f..e02c5f0b 100644
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01  Frank Ch. Eigler  <fche@elastic.org>
+
+	* task_finder.c: Move CONFIG_UTRACE assertion here.
+	* task_finder_vma.c (__stp_tf_add_vma): Make printk conditional.
+
 2008-08-29  David Smith  <dsmith@redhat.com>
 
 	* task_finder.c (__stp_utrace_attach_match_filename): Don't call
diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index bac3bf3e..39b6b93b 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01  Frank Ch. Eigler  <fche@elastic.org>
+
+	PR4225 merge.
+	* utrace.stp: New file, for use by utrace $var expansions.
+
 2008-09-01  Zhaolei  <zhaolei@cn.fujitsu.com>
 	* nfs_proc.stp: Fix memory access error in nfs.proc.read_setup,
 	nfs.proc.write_setup and nfs.proc.commit_setup.
@@ -6,10 +11,6 @@
 	* socket.stp: Make _get_sock_addr return correct address in kernel
 	before 2.6.16.
 
-2008-08-07  Frank Ch. Eigler  <fche@elastic.org>
-
-	* utrace.stp: New file, for use by utrace $var expansions.
-
 2008-08-04  Wenji Huang <wenji.huang@oracle.com>
 
 	* syscall.stp: Change $path to $pathname for 2.6.27.