This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Push get*() methods into Proc's sub-classes.
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 7 Jan 2008 17:10:22 -0000
- Subject: [SCM] master: Push get*() methods into Proc's sub-classes.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 4e13556066eb198f4939fc4c3387bd8b3a5a74a6 (commit)
via 696f0d0fc46160bdc776d287dfe8f57d7f1344ab (commit)
via 03f7a65808d3f4edbf3aebac69afcdb73af9101f (commit)
from a0079985d4dda172b0a672fd1c73b647ac5bee35 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 4e13556066eb198f4939fc4c3387bd8b3a5a74a6
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Jan 7 12:06:51 2008 -0500
Push get*() methods into Proc's sub-classes.
frysk-core/frysk/proc/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* Proc.java (sendrecAuxv()): Delete.
(getAuxv()): Make abstract.
(sendrecCommand()): Delete.
(getCommand()): Make abstract.
(sendrecExe()): Delete.
(getExe()): Make abstract.
(sendrecCmdLine()): Delete.
(getCmdLine()): Make abstract.
(sendrecMaps()): Delete.
(getMaps()): Make abstract.
(sendrecIsa()): Delete.
(getIsa()): Make abstract.
(sendrecUID(), sendrecGID()): Delete.
(getUID(), getGID()): Make abstract.
frysk-core/frysk/proc/dead/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* LinuxCoreProc.java (getCommand()): Replace sendrecCommand().
(getExe()): Replace sendrecExe().
(getUID()): Replace sendrecUID().
(getGID()): Replace sendrecGID().
(getCmdLine()): Replace sendrecCmdLine().
(getMaps()): Replace sendrecMaps().
(getAuxv()): Replace sendrecAuxv().
(getIsa()): Replace sendrecIsa().
* LinuxExeProc.java: Ditto.
frysk-core/frysk/proc/dummy/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* DummyProc.java (getCommand()): Replace sendrecCommand().
(getExe()): Replace sendrecExe().
(getUID()): Replace sendrecUID().
(getGID()): Replace sendrecGID().
(getCmdLine()): Replace sendrecCmdLine().
(getMaps()): Replace sendrecMaps().
(getAuxv()): Replace sendrecAuxv().
(getIsa()): Replace sendrecIsa().
frysk-core/frysk/proc/live/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceProc.java (getCommand()): Replace sendrecCommand().
(getExe()): Replace sendrecExe().
(getUID()): Replace sendrecUID().
(getGID()): Replace sendrecGID().
(getCmdLine()): Replace sendrecCmdLine().
(getMaps()): Replace sendrecMaps().
(getAuxv()): Replace sendrecAuxv().
(getIsa()): Replace sendrecIsa().
commit 696f0d0fc46160bdc776d287dfe8f57d7f1344ab
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Jan 7 11:32:51 2008 -0500
Make live Proc specific request methods private to frysk.proc.live.
frysk-core/frysk/proc/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* Proc.java (requestAddObserver): Delete.
(requestAddSyscallObserver): Delete.
(requestDeleteObserver): Delete.
(requestDeleteSyscallObserver): Delete.
(requestAddCodeObserver): Delete.
(requestDeleteCodeObserver): Delete.
(requestAddInstructionObserver): Delete.
(requestDeleteInstructionObserver): Delete.
frysk-core/frysk/proc/dead/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* DeadProc.java (requestAddObserver): Delete.
(requestAddSyscallObserver): Delete.
(requestDeleteObserver): Delete.
(requestDeleteSyscallObserver): Delete.
(requestAddCodeObserver): Delete.
(requestDeleteCodeObserver): Delete.
(requestAddInstructionObserver): Delete.
(requestDeleteInstructionObserver): Delete.
frysk-core/frysk/proc/dummy/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* DummyProc.java (requestAddObserver): Delete.
(requestAddSyscallObserver): Delete.
(requestDeleteObserver): Delete.
(requestDeleteSyscallObserver): Delete.
(requestAddCodeObserver): Delete.
(requestDeleteCodeObserver): Delete.
(requestAddInstructionObserver): Delete.
(requestDeleteInstructionObserver): Delete.
frysk-core/frysk/proc/live/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceProc.java (requestAddObserver): Make package-private.
(requestAddSyscallObserver): Ditto.
(requestDeleteObserver): Ditto.
(requestDeleteSyscallObserver): Ditto.
(requestAddCodeObserver): Ditto.
(requestDeleteCodeObserver): Ditto.
(requestAddInstructionObserver): Ditto.
(requestDeleteInstructionObserver): Ditto.
* LinuxPtraceTask.java: Update.
commit 03f7a65808d3f4edbf3aebac69afcdb73af9101f
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Jan 7 10:27:24 2008 -0500
Make some globals slightly less public :-/
frysk-core/frysk/proc/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* Task.java (just_started): Move to
LinuxPtraceTask.justStartedXXX.
(sig_send): Move to LinuxPtraceTask.sigSendXXX.
(syscall_sigret): Move to LinuxPtraceTask.syscallSigretXXX.
frysk-core/frysk/proc/live/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceTask.java (justStartedXXX): Move to here from
Task.just_started.
(sigSendXXX): Move to here from Task.sig_send.
(syscallSigretXXX): Move to here from Task.syscall_sigret.
* LinuxPtraceTaskState.java: Update.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/ChangeLog | 31 ++
frysk-core/frysk/proc/Proc.java | 163 +----------
frysk-core/frysk/proc/Task.java | 26 --
frysk-core/frysk/proc/dead/ChangeLog | 21 ++
frysk-core/frysk/proc/dead/DeadProc.java | 126 --------
frysk-core/frysk/proc/dead/LinuxCoreProc.java | 98 +++----
frysk-core/frysk/proc/dead/LinuxExeProc.java | 21 +-
frysk-core/frysk/proc/dummy/ChangeLog | 20 ++
frysk-core/frysk/proc/dummy/DummyProc.java | 57 +----
frysk-core/frysk/proc/live/ChangeLog | 27 ++
frysk-core/frysk/proc/live/LinuxPtraceProc.java | 309 +++++++++-----------
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 78 ++++--
.../frysk/proc/live/LinuxPtraceTaskState.java | 16 +-
13 files changed, 366 insertions(+), 627 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 45d48bb..c0f2f28 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,34 @@
+2008-01-07 Andrew Cagney <cagney@redhat.com>
+
+ * Proc.java (sendrecAuxv()): Delete.
+ (getAuxv()): Make abstract.
+ (sendrecCommand()): Delete.
+ (getCommand()): Make abstract.
+ (sendrecExe()): Delete.
+ (getExe()): Make abstract.
+ (sendrecCmdLine()): Delete.
+ (getCmdLine()): Make abstract.
+ (sendrecMaps()): Delete.
+ (getMaps()): Make abstract.
+ (sendrecIsa()): Delete.
+ (getIsa()): Make abstract.
+ (sendrecUID(), sendrecGID()): Delete.
+ (getUID(), getGID()): Make abstract.
+
+ * Proc.java (requestAddObserver): Delete.
+ (requestAddSyscallObserver): Delete.
+ (requestDeleteObserver): Delete.
+ (requestDeleteSyscallObserver): Delete.
+ (requestAddCodeObserver): Delete.
+ (requestDeleteCodeObserver): Delete.
+ (requestAddInstructionObserver): Delete.
+ (requestDeleteInstructionObserver): Delete.
+
+ * Task.java (just_started): Move to
+ LinuxPtraceTask.justStartedXXX.
+ (sig_send): Move to LinuxPtraceTask.sigSendXXX.
+ (syscall_sigret): Move to LinuxPtraceTask.syscallSigretXXX.
+
2008-01-04 Andrew Cagney <cagney@redhat.com>
* TaskObservable.java: Make public.
diff --git a/frysk-core/frysk/proc/Proc.java b/frysk-core/frysk/proc/Proc.java
index 7428700..f0ffe0a 100644
--- a/frysk-core/frysk/proc/Proc.java
+++ b/frysk-core/frysk/proc/Proc.java
@@ -103,51 +103,23 @@ public abstract class Proc {
* Return the basename of the program that this process is
* running.
*/
- public String getCommand() {
- command = sendrecCommand();
- return command;
- }
-
- private String command;
-
- protected abstract String sendrecCommand();
+ public abstract String getCommand();
/**
* Return the full path of the program that this process is
* running.
*/
- public String getExe() {
- exe = sendrecExe();
- return exe;
- }
-
- private String exe;
-
- protected abstract String sendrecExe();
+ public abstract String getExe();
/**
* Return the UID of the Proc.
*/
- public int getUID() {
- uid = sendrecUID();
- return uid;
- }
-
- protected abstract int sendrecUID();
-
- private int uid;
+ public abstract int getUID();
/**
* Return the GID of the Proc.
*/
- public int getGID() {
- gid = sendrecGID();
- return gid;
- }
-
- protected abstract int sendrecGID();
-
- private int gid;
+ public abstract int getGID();
/**
* @return The main task for this process
@@ -159,19 +131,9 @@ public abstract class Proc {
/**
* Return the Proc's command line argument list
*/
- public String[] getCmdLine() {
- argv = sendrecCmdLine();
- return argv;
- }
+ public abstract String[] getCmdLine();
- protected abstract String[] sendrecCmdLine();
-
- private String[] argv;
-
- public MemoryMap[] getMaps() {
- MemoryMap maps[] = sendrecMaps();
- return maps;
- }
+ public abstract MemoryMap[] getMaps();
public MemoryMap getMap(long address) {
MemoryMap maps[] = getMaps();
@@ -181,8 +143,6 @@ public abstract class Proc {
return null;
}
-
- protected abstract MemoryMap[] sendrecMaps();
/**
* XXX: Should not be public.
@@ -371,97 +331,6 @@ public abstract class Proc {
}
/**
- * (Internal) Tell the process to add the specified Observation,
- * attaching to the process if necessary.
- *
- * XXX: Should not be public.
- */
- public abstract void requestAddObserver(Task task,
- TaskObservable observable,
- TaskObserver observer);
-
- /**
- * (Internal) Tell the process to add the specified Observation,
- * attaching to the process if necessary. Adds a syscallObserver
- * which changes the task to syscall tracing mode of necessary.
- *
- * XXX: Should not be public.
- */
- public abstract void requestAddSyscallObserver(final Task task,
- TaskObservable observable,
- TaskObserver observer);
-
- /**
- * (Internal) Tell the process to delete the specified
- * Observation, detaching from the process if necessary. Removes a
- * syscallObserver exiting the task from syscall tracing mode of
- * necessary.
- *
- * XXX: Should not be public.
- */
- public abstract void requestDeleteObserver(Task task,
- TaskObservable observable,
- TaskObserver observer);
-
- /**
- * (Internal) Tell the process to delete the specified
- * Observation, detaching from the process if necessary.
- *
- * XXX: Should not be public.
- */
- public abstract void requestDeleteSyscallObserver(Task task,
- TaskObservable observable,
- TaskObserver observer);
-
- /**
- * (Internal) Tell the process to add the specified Code
- * Observation, attaching to the process if necessary. Adds a
- * TaskCodeObservation to the eventloop which instructs the task
- * to install the breakpoint if necessary.
- *
- * XXX: Should not be public.
- */
- public abstract void requestAddCodeObserver(Task task,
- TaskObservable observable,
- TaskObserver.Code observer,
- long address);
-
- /**
- * (Internal) Tell the process to delete the specified Code
- * Observation, detaching from the process if necessary.
- *
- * XXX: Should not be public.
- */
- public abstract void requestDeleteCodeObserver(Task task,
- TaskObservable observable,
- TaskObserver.Code observer,
- long address);
-
- /**
- * (Internal) Tell the process to add the specified Instruction
- * Observation, attaching and/or suspending the process if
- * necessary. As soon as the observation is added and the task
- * isn't blocked it will inform the Instruction observer of every
- * step of the task.
- *
- * XXX: Should not be public.
- */
- public abstract void requestAddInstructionObserver(Task task,
- TaskObservable observable,
- TaskObserver.Instruction observer);
-
- /**
- * (Internal) Tell the process to delete the specified Instruction
- * Observation, detaching and/or suspending from the process if
- * necessary.
- *
- * XXX: Should not be public.
- */
- public abstract void requestDeleteInstructionObserver(Task task,
- TaskObservable observable,
- TaskObserver.Instruction observer);
-
- /**
* Table of this processes child processes.
*/
private Set childPool = new HashSet();
@@ -557,29 +426,13 @@ public abstract class Proc {
/**
* The Process Auxiliary Vector.
*/
- public Auxv[] getAuxv() {
- if (auxv == null) {
- auxv = sendrecAuxv();
- }
- return auxv;
- }
-
- private Auxv[] auxv;
-
- /**
- * Extract the auxv from the inferior.
- */
- protected abstract Auxv[] sendrecAuxv();
+ public abstract Auxv[] getAuxv();
/**
* Get the Isa object associated with the process. Only use this
* when you don't have a Task object to interrogate.
*/
- public Isa getIsa() {
- return sendrecIsa();
- }
-
- protected abstract Isa sendrecIsa();
+ public abstract Isa getIsa();
/**
* The process has transitioned to the attached state. XXX: Should
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index 359f248..c8245c8 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -360,32 +360,6 @@ public abstract class Task {
public Breakpoint steppingBreakpoint;
/**
- * Whether we have just started the Task. Set in
- * wantToAttachContinue.blockOrAttachContinue() and immediately
- * reset in sendContinue() unless we request a step or
- * Running.handleTrappedEvent() when the first step is
- * received. This is a temporary hack to work around bug
- * #4663. Needs to be merged with SteppingState (see step_send).
- */
- public boolean just_started;
-
- /**
- * The signal, or zero, send last to the task.
- *
- * XXX: This should be a state in Linux/PTRACE state machine.
- */
- public int sig_send;
-
- /**
- * When the last request to the process was a step request,
- * whether it was a request to step a sigreturn syscall. Set by
- * sendStepInstruction().
- *
- * XXX: This should be a state in Linux/PTRACE state machine.
- */
- public boolean syscall_sigret;
-
- /**
* Request the addition of a Instruction observer that will be
* notified as soon as the task executes an instruction.
* <code>o.updateExecuted</code> is called as soon as the Task
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index db1da99..c7b42ee 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,24 @@
+2008-01-07 Andrew Cagney <cagney@redhat.com>
+
+ * LinuxCoreProc.java (getCommand()): Replace sendrecCommand().
+ (getExe()): Replace sendrecExe().
+ (getUID()): Replace sendrecUID().
+ (getGID()): Replace sendrecGID().
+ (getCmdLine()): Replace sendrecCmdLine().
+ (getMaps()): Replace sendrecMaps().
+ (getAuxv()): Replace sendrecAuxv().
+ (getIsa()): Replace sendrecIsa().
+ * LinuxExeProc.java: Ditto.
+
+ * DeadProc.java (requestAddObserver): Delete.
+ (requestAddSyscallObserver): Delete.
+ (requestDeleteObserver): Delete.
+ (requestDeleteSyscallObserver): Delete.
+ (requestAddCodeObserver): Delete.
+ (requestDeleteCodeObserver): Delete.
+ (requestAddInstructionObserver): Delete.
+ (requestDeleteInstructionObserver): Delete.
+
2008-01-04 Andrew Cagney <cagney@redhat.com>
* DeadProc.java (performRemoval()): Delete.
diff --git a/frysk-core/frysk/proc/dead/DeadProc.java b/frysk-core/frysk/proc/dead/DeadProc.java
index 2144871..cf0b24b 100644
--- a/frysk-core/frysk/proc/dead/DeadProc.java
+++ b/frysk-core/frysk/proc/dead/DeadProc.java
@@ -43,11 +43,7 @@ import java.util.logging.Level;
import frysk.proc.Proc;
import frysk.proc.ProcId;
import frysk.proc.Host;
-import frysk.proc.Task;
-import frysk.proc.TaskObserver;
-import frysk.proc.TaskObservable;
import frysk.proc.Manager;
-import frysk.proc.TaskObservation;
import frysk.proc.ProcEvent;
/**
@@ -87,126 +83,4 @@ abstract class DeadProc extends Proc {
// on a core file? Might need a brain dead attached state in
// this scenario for compataibility.
}
-
- /**
- * (Internal) Tell the process to add the specified Observation,
- * attaching to the process if necessary.
- *
- * XXX: Should not be public.
- */
- public void requestAddObserver(Task task, TaskObservable observable,
- TaskObserver observer) {
- logger.log(Level.FINE, "{0} requestAddObserver\n", this);
- // XXX: Fake out for now. What kind of observers would you put
- // on a core file? Might need a brain dead attached state in
- // this scenario for compataibility.
- }
-
- /**
- * (Internal) Tell the process to add the specified Observation,
- * attaching to the process if necessary. Adds a syscallObserver
- * which changes the task to syscall tracing mode of necessary.
- *
- * XXX: Should not be public.
- */
- public void requestAddSyscallObserver(Task task,
- TaskObservable observable,
- TaskObserver observer) {
- logger.log(Level.FINE, "{0} requestAddSyscallObserver\n", this);
- // XXX: Fake out for now. What kind of observers would you put
- // on a core file? Might need a brain dead attached state in
- // this scenario for compataibility.
- }
-
- /**
- * (Internal) Tell the process to delete the specified
- * Observation, detaching from the process if necessary. Removes a
- * syscallObserver exiting the task from syscall tracing mode of
- * necessary.
- *
- * XXX: Should not be public.
- */
- public void requestDeleteObserver(Task task, TaskObservable observable,
- TaskObserver observer) {
- Manager.eventLoop.add(new TaskObservation(task, observable,
- observer, false) {
- public void execute() {
- // Must be bogus; if there were observations then
- // the Proc wouldn't be in this state.
- fail(new RuntimeException ("not attached"));
- }
- });
- }
-
- /**
- * (Internal) Tell the process to delete the specified
- * Observation, detaching from the process if necessary.
- *
- * XXX: Should not be public.
- */
- public void requestDeleteSyscallObserver(Task task,
- TaskObservable observable,
- TaskObserver observer) {
- throw new RuntimeException("the process is already dead");
- }
-
- /**
- * (Internal) Tell the process to add the specified Code
- * Observation, attaching to the process if necessary. Adds a
- * TaskCodeObservation to the eventloop which instructs the task
- * to install the breakpoint if necessary.
- *
- * XXX: Should not be public.
- */
- public void requestAddCodeObserver(Task task, TaskObservable observable,
- TaskObserver.Code observer,
- long address) {
- logger.log(Level.FINE, "{0} requestAddCodeObserver\n", this);
- // XXX: Fake out for now. What kind of observers would you put
- // on a core file? Might need a brain dead attached state in
- // this scenario for compataibility.
- }
-
- /**
- * (Internal) Tell the process to delete the specified Code
- * Observation, detaching from the process if necessary.
- *
- * XXX: Should not be public.
- */
- public void requestDeleteCodeObserver(Task task, TaskObservable observable,
- TaskObserver.Code observer,
- long address) {
- throw new RuntimeException("the process is already dead");
- }
-
- /**
- * (Internal) Tell the process to add the specified Instruction
- * Observation, attaching and/or suspending the process if
- * necessary. As soon as the observation is added and the task
- * isn't blocked it will inform the Instruction observer of every
- * step of the task.
- *
- * XXX: Should not be public.
- */
- public void requestAddInstructionObserver(Task task,
- TaskObservable observable,
- TaskObserver.Instruction observer) {
- logger.log(Level.FINE, "{0} requestAddInstructionObserver\n", this);
- // XXX: Fake out for now. What kind of observers would you put
- // on a core file? Might need a brain dead attached state in
- // this scenario for compataibility.
- }
-
- /**
- * (Internal) Tell the process to delete the specified Instruction
- * Observation, detaching and/or suspending from the process if
- * necessary.
- *
- * XXX: Should not be public.
- */
- public void requestDeleteInstructionObserver(Task task,
- TaskObservable observable,
- TaskObserver.Instruction observer) {
- throw new RuntimeException("the process is already dead");
- }
}
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreProc.java b/frysk-core/frysk/proc/dead/LinuxCoreProc.java
index ed8a492..2104dcc 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreProc.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreProc.java
@@ -87,7 +87,7 @@ public class LinuxCoreProc extends DeadProc {
// Executable is null (non-specified), find the executable
// as it is written in the corefile.
if ((host.exeFile == null) && (host.exeSetToNull == false)) {
- File exeFileName = new File(sendrecExe());
+ File exeFileName = new File(getExe());
if ((exeFileName.exists()) && (exeFileName.canRead()))
host.exeFile = exeFileName;
@@ -95,17 +95,16 @@ public class LinuxCoreProc extends DeadProc {
this.exefileBackEnd = host.exeFile;
}
- protected String sendrecCommand() {
+ public String getCommand() {
return elfProc.getPrFname();
}
- protected String sendrecExe() {
-
+ public String getExe() {
if (this.exefileBackEnd != null)
return this.exefileBackEnd.getPath();
// Only place to find full path + exe is
// in the args list. Remove ./ if present.
- String[] args = sendrecCmdLine();
+ String[] args = getCmdLine();
hooks/post-receive
--
frysk system monitor/debugger