public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Mark TestSysRoot.java as unresolved, bug 5619.
@ 2008-01-15 19:34 cagney
0 siblings, 0 replies; only message in thread
From: cagney @ 2008-01-15 19:34 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via f7cc97ed59d2eaf2a188eb800b496a1b39c96c34 (commit)
via 7c397bf933775ad26747c49bdce9c9ea86731713 (commit)
via 829f37f0eb8b8690697ef3c4b8be8a6f1e7acaf2 (commit)
from ae621098acf4c97642f8c404eff373a862e3272b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit f7cc97ed59d2eaf2a188eb800b496a1b39c96c34
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date: Tue Jan 15 14:34:26 2008 -0500
Mark TestSysRoot.java as unresolved, bug 5619.
frysk-core/frysk/hpd/ChangeLog
2008-01-15 Andrew Cagney <cagney@redhat.com>
* TestSysRoot.java: Mark as unresolved, bug 5619.
commit 7c397bf933775ad26747c49bdce9c9ea86731713
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date: Tue Jan 15 14:14:38 2008 -0500
Push Task.getMemory into sub-classes.
frysk-core/frysk/proc/ChangeLog
2008-01-15 Andrew Cagney <cagney@redhat.com>
* Task.java (sendrecMemory()): Delete.
(getMemory()): Make abstract.
frysk-core/frysk/proc/dead/ChangeLog
2008-01-15 Andrew Cagney <cagney@redhat.com>
* LinuxCoreTask.java (getMemory()): Replace sendrecMemory().
* LinuxExeTask.java: Ditto.
* LinuxExeProc.java: Ditto.
frysk-core/frysk/proc/dummy/ChangeLog
2008-01-15 Andrew Cagney <cagney@redhat.com>
* DummyTask.java (getMemory()): Replace sendrecMemory().
frysk-core/frysk/proc/live/ChangeLog
2008-01-15 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceTask.java (getMemory()): Replace sendrecMemory().
commit 829f37f0eb8b8690697ef3c4b8be8a6f1e7acaf2
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date: Tue Jan 15 13:26:40 2008 -0500
Make member Task.id private.
frysk-core/frysk/proc/ChangeLog
2008-01-15 Andrew Cagney <cagney@redhat.com>
* Task.java (id): Make private.
* Host.java: Update.
* Proc.java: Update.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/hpd/ChangeLog | 4 +++
frysk-core/frysk/hpd/TestSysRoot.java | 2 +
frysk-core/frysk/proc/ChangeLog | 9 ++++++++
frysk-core/frysk/proc/Host.java | 4 +-
frysk-core/frysk/proc/Proc.java | 4 +-
frysk-core/frysk/proc/Task.java | 14 +-----------
frysk-core/frysk/proc/dead/ChangeLog | 6 +++++
frysk-core/frysk/proc/dead/LinuxCoreTask.java | 12 +++++-----
frysk-core/frysk/proc/dead/LinuxExeProc.java | 6 +++-
frysk-core/frysk/proc/dead/LinuxExeTask.java | 8 +++---
frysk-core/frysk/proc/dummy/ChangeLog | 4 +++
frysk-core/frysk/proc/dummy/DummyTask.java | 2 +-
frysk-core/frysk/proc/live/ChangeLog | 4 +++
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 25 ++++++++++++++--------
14 files changed, 66 insertions(+), 38 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 016a9f3..2943153 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-15 Andrew Cagney <cagney@redhat.com>
+
+ * TestSysRoot.java: Mark as unresolved, bug 5619.
+
2008-01-15 Rick Moseley <rmoseley@redhat.com>
* StartRun.java: New, consolidation of Start/RunCommand.
diff --git a/frysk-core/frysk/hpd/TestSysRoot.java b/frysk-core/frysk/hpd/TestSysRoot.java
index af584f0..950357e 100644
--- a/frysk-core/frysk/hpd/TestSysRoot.java
+++ b/frysk-core/frysk/hpd/TestSysRoot.java
@@ -55,6 +55,8 @@ public class TestSysRoot extends TestLib {
}
public void testHaveSysRoot() {
+ if (unresolved(5619))
+ return;
File testPath = Config.getPkgLibFile("funit-addresses");
System.out.println(Config.getBinFile("fhpd").getAbsolutePath() +
" -sysroot " + testPath.getParent() + "/test-sysroot/ " +
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 425bd8b..e7d07e1 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-15 Andrew Cagney <cagney@redhat.com>
+
+ * Task.java (sendrecMemory()): Delete.
+ (getMemory()): Make abstract.
+
+ * Task.java (id): Make private.
+ * Host.java: Update.
+ * Proc.java: Update.
+
2008-01-14 Rick Moseley <rmoseley@redhat.com>
* Proc.java: Remove requestAbandon() from requestKill().
diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java
index 132f507..7658843 100644
--- a/frysk-core/frysk/proc/Host.java
+++ b/frysk-core/frysk/proc/Host.java
@@ -74,11 +74,11 @@ public abstract class Host {
Map taskPool = new HashMap();
void add(Task task) {
logger.log(Level.FINEST, "{0} add Task\n", this);
- taskPool.put(task.id, task);
+ taskPool.put(task.getTaskId(), task);
}
void remove(Task task) {
logger.log(Level.FINEST, "{0} remove Task\n", this);
- taskPool.remove(task.id);
+ taskPool.remove(task.getTaskId());
}
void removeTasks(Collection c) {
logger.log(Level.FINE, "{0} removeTasks Collection\n", this);
diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java
index d2ac547..aaf0b48 100644
--- a/frysk-core/frysk/proc/Proc.java
+++ b/frysk-core/frysk/proc/Proc.java
@@ -331,7 +331,7 @@ public abstract class Proc {
* Add the Task to this Proc.
*/
void add(Task task) {
- taskPool.put(task.id, task);
+ taskPool.put(task.getTaskId(), task);
host.observableTaskAddedXXX.notify(task);
}
@@ -343,7 +343,7 @@ public abstract class Proc {
public void remove(Task task) {
logger.log(Level.FINEST, "{0} remove(Task) -- within this Proc\n", this);
host.observableTaskRemovedXXX.notify(task);
- taskPool.remove(task.id);
+ taskPool.remove(task.getTaskId());
host.remove(task);
}
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index d4ae45b..f615992 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -72,8 +72,7 @@ public abstract class Task {
public final TaskId getTaskId() {
return id;
}
-
- final TaskId id;
+ private final TaskId id;
/**
* Return the task's process id.
@@ -275,18 +274,10 @@ public abstract class Task {
*/
public abstract void requestDeleteSignaledObserver(TaskObserver.Signaled o);
- private ByteBuffer memory;
- protected abstract ByteBuffer sendrecMemory();
/**
* Return the Task's memory.
*/
- public ByteBuffer getMemory() {
- logger.log(Level.FINE, "{0} entering get memory {1}\n",new Object[] {this, memory});
- if (memory == null )
- memory = sendrecMemory();
- logger.log(Level.FINE, "{0} exiting get memory {1}\n", new Object[] {this, memory});
- return this.memory;
- }
+ public abstract ByteBuffer getMemory();
/**
* Add TaskObserver.Code to the TaskObserver pool.
@@ -397,7 +388,6 @@ public abstract class Task {
public abstract int getMod();
public void clearIsa() {
- memory = null;
registerBanks = null;
syscallTable = null;
currentISA = null;
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 23869f9..a2b9f66 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-15 Andrew Cagney <cagney@redhat.com>
+
+ * LinuxCoreTask.java (getMemory()): Replace sendrecMemory().
+ * LinuxExeTask.java: Ditto.
+ * LinuxExeProc.java: Ditto.
+
2008-01-11 Andrew Cagney <cagney@redhat.com>
* DeadTask.java (handleAddObservation(TaskObservation))
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreTask.java b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
index 3eb1bb7..7f7b85f 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
@@ -55,15 +55,15 @@ public class LinuxCoreTask extends DeadTask {
ElfPrstatus elfTask = null;
ElfPrFPRegSet elfFPRegs = null;
ElfPrXFPRegSet elfXFPRegs = null;
- LinuxCoreProc parent = null;
+ private final LinuxCoreProc parent;
- protected ByteBuffer sendrecMemory () {
+ public ByteBuffer getMemory() {
// XXX: Get the Proc's memory (memory maps). Task and register
// information is handled differently (through notes) in core
- // files. There's a potential here for task to have its own memory
- // maps in some architectures, but not in the current ISAs. In an
- // attempt to save system resources, get a reference to the proc's
- // maps for now.
+ // files. There's a potential here for task to have its own
+ // memory maps in some architectures, but not in the current
+ // ISAs. In an attempt to save system resources, get a
+ // reference to the proc's maps for now.
return parent.getMemory();
}
diff --git a/frysk-core/frysk/proc/dead/LinuxExeProc.java b/frysk-core/frysk/proc/dead/LinuxExeProc.java
index 185c140..68acc55 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeProc.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeProc.java
@@ -105,10 +105,12 @@ public class LinuxExeProc extends DeadProc {
return (MemoryMap[]) metaData.toArray(new MemoryMap[metaData.size()]);
}
- public ByteBuffer sendrecMemory() {
- ByteBuffer memory = new ExeByteBuffer(metaData);
+ ByteBuffer getMemory() {
+ if (memory == null)
+ memory = new ExeByteBuffer(metaData);
return memory;
}
+ private ByteBuffer memory;
private void buildMetaData()
{
diff --git a/frysk-core/frysk/proc/dead/LinuxExeTask.java b/frysk-core/frysk/proc/dead/LinuxExeTask.java
index 7354842..ca6fee1 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeTask.java
@@ -49,7 +49,7 @@ import lib.dwfl.*;
public class LinuxExeTask extends DeadTask {
private final long pc;
- LinuxExeProc proc = null;
+ private final LinuxExeProc proc;
TaskId id = null;
protected LinuxExeTask(LinuxExeProc proc, TaskId id) {
@@ -82,9 +82,9 @@ public class LinuxExeTask extends DeadTask {
return ((LinuxExeProc)getProc()).sendrecISA();
}
- protected ByteBuffer sendrecMemory () {
- return this.proc.sendrecMemory();
- }
+ public ByteBuffer getMemory() {
+ return proc.getMemory();
+ }
protected RegisterBanks sendrecRegisterBanks() {
ByteBuffer[] bankBuffers = new ByteBuffer[4];
diff --git a/frysk-core/frysk/proc/dummy/ChangeLog b/frysk-core/frysk/proc/dummy/ChangeLog
index cec9331..f43b7b5 100644
--- a/frysk-core/frysk/proc/dummy/ChangeLog
+++ b/frysk-core/frysk/proc/dummy/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-15 Andrew Cagney <cagney@redhat.com>
+
+ * DummyTask.java (getMemory()): Replace sendrecMemory().
+
2008-01-11 Andrew Cagney <cagney@redhat.com>
* DummyTask.java (handleAddObservation(TaskObservation))
diff --git a/frysk-core/frysk/proc/dummy/DummyTask.java b/frysk-core/frysk/proc/dummy/DummyTask.java
index 744a8a3..b8ba936 100644
--- a/frysk-core/frysk/proc/dummy/DummyTask.java
+++ b/frysk-core/frysk/proc/dummy/DummyTask.java
@@ -57,7 +57,7 @@ public class DummyTask extends Task {
protected ISA sendrecISA() {
return null;
}
- protected ByteBuffer sendrecMemory () {
+ public ByteBuffer getMemory() {
return null;
}
protected RegisterBanks sendrecRegisterBanks() {
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 36ec797..3bdb23c 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-15 Andrew Cagney <cagney@redhat.com>
+
+ * LinuxPtraceTask.java (getMemory()): Replace sendrecMemory().
+
2008-01-14 Rick Moseley <rmoseley@redhat.com>
* LinuxPtraceTask.java: Catch errors from Ptrace.detach().
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index 2afb38d..7e535b9 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -116,16 +116,22 @@ public class LinuxPtraceTask extends LiveTask {
return memory;
}
- protected ByteBuffer sendrecMemory ()
- {
- int tid = getTid();
- ByteOrder byteOrder = getISA().order();
- BreakpointAddresses breakpoints = ((LinuxPtraceProc)getProc()).breakpoints;
- ByteBuffer memory = new LogicalMemoryBuffer(tid, AddressSpace.DATA,
- breakpoints);
- memory.order(byteOrder);
- return memory;
+ /**
+ * Return the Task's memory.
+ */
+ public ByteBuffer getMemory() {
+ if (memory == null) {
+ logger.log(Level.FINE, "{0} exiting get memory\n", this);
+ int tid = getTid();
+ ByteOrder byteOrder = getISA().order();
+ BreakpointAddresses breakpoints = ((LinuxPtraceProc)getProc()).breakpoints;
+ memory = new LogicalMemoryBuffer(tid, AddressSpace.DATA,
+ breakpoints);
+ memory.order(byteOrder);
+ }
+ return memory;
}
+ private ByteBuffer memory;
protected RegisterBanks sendrecRegisterBanks() {
return PtraceRegisterBanksFactory.create(getISA(), getTid());
@@ -971,6 +977,7 @@ public class LinuxPtraceTask extends LiveTask {
public void clearIsa() {
super.clearIsa();
pcRegister = null;
+ memory = null;
}
/**
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-15 19:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-15 19:34 [SCM] master: Mark TestSysRoot.java as unresolved, bug 5619 cagney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).