This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Move frysk.proc.State to frysk.proc.live.State.
- From: cagney at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 7 Jan 2008 18:39:46 -0000
- Subject: [SCM] master: Move frysk.proc.State to frysk.proc.live.State.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via ac4b57f756a833b51959b089b0c3cb685fe68fcd (commit)
via a97a8cdd4d964bd1de30782a1a1b85bafd9e57c5 (commit)
from 4e13556066eb198f4939fc4c3387bd8b3a5a74a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit ac4b57f756a833b51959b089b0c3cb685fe68fcd
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Jan 7 12:26:26 2008 -0500
Move frysk.proc.State to frysk.proc.live.State.
frysk-core/frysk/proc/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* State.java: Move to frysk.proc.live.State.
frysk-core/frysk/proc/live/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* State.java: Moved from frysk.proc.State.
* LinuxPtraceProcState.java: Update.
* LinuxPtraceTaskState.java: Update.
commit a97a8cdd4d964bd1de30782a1a1b85bafd9e57c5
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Jan 7 12:18:18 2008 -0500
Push Task.getMod into sub-classes.
frysk-core/frysk/proc/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* Task.java (getMod()): Make abstract.
(incrementMod()): Delete.
(modCount()): Delete.
frysk-core/frysk/proc/dead/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* DeadTask.java (getMod()): New.
frysk-core/frysk/proc/dummy/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* DummyTask.java (getMod()): New.
frysk-core/frysk/proc/live/ChangeLog
2008-01-07 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceTask.java (modCount, incrementMod(), getMod()): New.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/ChangeLog | 6 ++++++
frysk-core/frysk/proc/Task.java | 10 +---------
frysk-core/frysk/proc/dead/ChangeLog | 2 ++
frysk-core/frysk/proc/dead/DeadTask.java | 4 ++++
frysk-core/frysk/proc/dummy/ChangeLog | 2 ++
frysk-core/frysk/proc/dummy/DummyTask.java | 4 ++++
frysk-core/frysk/proc/live/ChangeLog | 6 ++++++
.../frysk/proc/live/LinuxPtraceProcState.java | 1 -
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 9 +++++++++
.../frysk/proc/live/LinuxPtraceTaskState.java | 1 -
frysk-core/frysk/proc/{ => live}/State.java | 6 +++---
11 files changed, 37 insertions(+), 14 deletions(-)
rename frysk-core/frysk/proc/{ => live}/State.java (95%)
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index c0f2f28..ead93dd 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,11 @@
2008-01-07 Andrew Cagney <cagney@redhat.com>
+ * State.java: Move to frysk.proc.live.State.
+
+ * Task.java (getMod()): Make abstract.
+ (incrementMod()): Delete.
+ (modCount()): Delete.
+
* Proc.java (sendrecAuxv()): Delete.
(getAuxv()): Make abstract.
(sendrecCommand()): Delete.
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index c8245c8..16b4e57 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -445,15 +445,7 @@ public abstract class Task {
* Use a counter rather than a boolean because multiple caches may
* depend on this count and no cache should be able to clear it.
*/
- private int modCount = 0;
-
- public void incrementMod() {
- modCount++;
- }
-
- public int getMod() {
- return modCount;
- }
+ public abstract int getMod();
public void clearIsa() {
isa = null;
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index c7b42ee..7c31647 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,5 +1,7 @@
2008-01-07 Andrew Cagney <cagney@redhat.com>
+ * DeadTask.java (getMod()): New.
+
* LinuxCoreProc.java (getCommand()): Replace sendrecCommand().
(getExe()): Replace sendrecExe().
(getUID()): Replace sendrecUID().
diff --git a/frysk-core/frysk/proc/dead/DeadTask.java b/frysk-core/frysk/proc/dead/DeadTask.java
index 60cf1b7..0728adf 100644
--- a/frysk-core/frysk/proc/dead/DeadTask.java
+++ b/frysk-core/frysk/proc/dead/DeadTask.java
@@ -240,4 +240,8 @@ abstract class DeadTask extends Task {
public void requestDeleteInstructionObserver(TaskObserver.Instruction o) {
throw new RuntimeException("requestDeleteInstructionObserver");
}
+
+ public int getMod() {
+ return 1; // never changes.
+ }
}
diff --git a/frysk-core/frysk/proc/dummy/ChangeLog b/frysk-core/frysk/proc/dummy/ChangeLog
index a3e4dc1..1d7c444 100644
--- a/frysk-core/frysk/proc/dummy/ChangeLog
+++ b/frysk-core/frysk/proc/dummy/ChangeLog
@@ -1,5 +1,7 @@
2008-01-07 Andrew Cagney <cagney@redhat.com>
+ * DummyTask.java (getMod()): New.
+
* DummyProc.java (getCommand()): Replace sendrecCommand().
(getExe()): Replace sendrecExe().
(getUID()): Replace sendrecUID().
diff --git a/frysk-core/frysk/proc/dummy/DummyTask.java b/frysk-core/frysk/proc/dummy/DummyTask.java
index d6f2f8d..6f20f77 100644
--- a/frysk-core/frysk/proc/dummy/DummyTask.java
+++ b/frysk-core/frysk/proc/dummy/DummyTask.java
@@ -142,4 +142,8 @@ public class DummyTask extends Task {
public void requestDeleteInstructionObserver(TaskObserver.Instruction o) {
throw new RuntimeException("oops!");
}
+
+ public int getMod() {
+ return 1;
+ }
}
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 2b87080..0cfc486 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,5 +1,11 @@
2008-01-07 Andrew Cagney <cagney@redhat.com>
+ * State.java: Moved from frysk.proc.State.
+ * LinuxPtraceProcState.java: Update.
+ * LinuxPtraceTaskState.java: Update.
+
+ * LinuxPtraceTask.java (modCount, incrementMod(), getMod()): New.
+
* LinuxPtraceProc.java (getCommand()): Replace sendrecCommand().
(getExe()): Replace sendrecExe().
(getUID()): Replace sendrecUID().
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
index 0c0b443..ce77c57 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProcState.java
@@ -46,7 +46,6 @@ import java.util.logging.Level;
import frysk.proc.Observation;
import frysk.proc.TaskId;
import frysk.proc.Manager;
-import frysk.proc.State;
/**
* A UNIX Process State
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index d4913e6..37cf9d8 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -946,4 +946,13 @@ public class LinuxPtraceTask extends LiveTask {
* XXX: This should be a state in Linux/PTRACE state machine.
*/
public boolean syscallSigretXXX;
+
+ private int modCount = 0;
+ public void incrementMod() {
+ modCount++;
+ }
+
+ public int getMod() {
+ return modCount;
+ }
}
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index 6b13c8a..77424df 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -50,7 +50,6 @@ import frysk.proc.Isa;
import java.util.logging.Level;
import frysk.proc.TaskObservable;
import frysk.sys.Signal;
-import frysk.proc.State;
/**
* A Linux Task's State tracked using PTRACE.
diff --git a/frysk-core/frysk/proc/State.java b/frysk-core/frysk/proc/live/State.java
similarity index 95%
rename from frysk-core/frysk/proc/State.java
rename to frysk-core/frysk/proc/live/State.java
index 350d2d1..db00efd 100644
--- a/frysk-core/frysk/proc/State.java
+++ b/frysk-core/frysk/proc/live/State.java
@@ -37,14 +37,14 @@
// version and license this file solely under the GPL without
// exception.
-package frysk.proc;
+package frysk.proc.live;
import java.util.logging.Level;
import java.util.logging.Logger;
import frysk.event.Event;
-public class State {
- protected static Logger logger = Logger.getLogger(ProcLogger.LOGGER_ID);
+class State {
+ protected static Logger logger = Logger.getLogger("frysk");
private String name;
protected State (String name)
hooks/post-receive
--
frysk system monitor/debugger