[SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk

[pmuldoon@sourceware.org]

The branch, master has been updated
       via  1f00d0320e752d60da44436f1a0612a64123702a (commit)
       via  829dda048d5c206a84e4ce1e73de1efb14f2ea67 (commit)
      from  7174ba407d72d790645f20a5db9682dd142bd772 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 1f00d0320e752d60da44436f1a0612a64123702a
Merge: 829dda048d5c206a84e4ce1e73de1efb14f2ea67 7174ba407d72d790645f20a5db9682dd142bd772
Author: Phil Muldoon <pmuldoon@ups.hsv.redhat.com>
Date:   Tue Feb 26 09:32:17 2008 -0600

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

commit 829dda048d5c206a84e4ce1e73de1efb14f2ea67
Author: Phil Muldoon <pmuldoon@ups.hsv.redhat.com>
Date:   Tue Feb 26 09:31:37 2008 -0600

    2008-02-26  Phil Muldoon  <pmuldoon@redhat.com>
    
            * CorefileBytebuffer.java (peek): Account for segments
            that are neither in the corefile, or backing solib/exe.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/proc/dead/ChangeLog               |    5 ++++
 frysk-core/frysk/proc/dead/CorefileByteBuffer.java |   21 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index f09f868..ac109e9 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-26  Phil Muldoon  <pmuldoon@redhat.com>
+
+	* CorefileBytebuffer.java (peek): Account for segments
+	that are neither in the corefile, or backing solib/exe.
+
 2008-02-25  Andrew Cagney  <cagney@redhat.com>
 
 	* LinuxExeFactory.java: New.  Merge in LinuxExeHost, LinuxExeProc,
diff --git a/frysk-core/frysk/proc/dead/CorefileByteBuffer.java b/frysk-core/frysk/proc/dead/CorefileByteBuffer.java
index f4cb123..63dd0c2 100644
--- a/frysk-core/frysk/proc/dead/CorefileByteBuffer.java
+++ b/frysk-core/frysk/proc/dead/CorefileByteBuffer.java
@@ -100,22 +100,29 @@ public class CorefileByteBuffer extends ByteBuffer {
   {
 
 
+    finest.log(this,"peek() at 0x",address);
     byte[] buffer = new byte[1];
     MapAddressHeader metaLine = findMetaData(address);
 
     if (metaLine != null)
-      if (checkCorefileAddress(metaLine))
-	{
+      if (checkCorefileAddress(metaLine)) {
 	  long offset = convertAddressToOffset(address);
 	  this.coreFileRaw.pread(offset, buffer,0,1);
 	}
       else
 	{
-	  if (!metaLine.name.equals(""))
-	    {
-	      StatelessFile temp = new StatelessFile(new File(metaLine.name));
-	      long offset = metaLine.solibOffset  + (address - metaLine.vaddr);
-	      temp.pread(offset, buffer,0,1);
+	  if (!metaLine.name.equals("")) {
+	        finest.log(this,"Attempting to read from non-corefile: ", metaLine.name);
+		File fileCheck = new File(metaLine.name);
+		if (((fileCheck.exists()) && fileCheck.canRead())) {
+		    StatelessFile temp = new StatelessFile(new File(metaLine.name));	      
+		    long offset = metaLine.solibOffset  + (address - metaLine.vaddr);
+		    temp.pread(offset, buffer,0,1);
+		} else {
+		    throw new RuntimeException("CorefileByteBuffer: Cannot peek() at address 0x"+
+					       Long.toHexString(address)+". Offset exists in file: " +
+					       metaLine.name+" but that file cannot be accessed.");
+		}
 	    }
 	}
 	


hooks/post-receive
--
frysk system monitor/debugger