public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: cagney@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM] master: Replace TaskId with "int tid" in Task constructors.
Date: Thu, 14 Feb 2008 14:30:00 -0000 [thread overview]
Message-ID: <20080214143021.9438.qmail@sourceware.org> (raw)
The branch, master has been updated
via 6f90ccc376e5bc50e2ad3a6cd97f1424660d6329 (commit)
from fab366e5dcc0c0efd89b85a311ecb155d4836e4c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 6f90ccc376e5bc50e2ad3a6cd97f1424660d6329
Author: Andrew Cagney <cagney@redhat.com>
Date: Thu Feb 14 09:29:59 2008 -0500
Replace TaskId with "int tid" in Task constructors.
frysk-core/frysk/proc/ChangeLog
2008-02-13 Andrew Cagney <cagney@redhat.com>
* Task.java (tid): New. Replace TaskId with "int tid" in
constructors.
frysk-core/frysk/proc/dead/ChangeLog
2008-02-14 Andrew Cagney <cagney@redhat.com>
* DeadTask.java: Update to match Task.
* LinuxCoreTask.java: Ditto.
* LinuxExeTask.java: Ditto.
* LinuxExeProc.java: Ditto.
frysk-core/frysk/proc/dummy/ChangeLog
2008-02-14 Andrew Cagney <cagney@redhat.com>
* DummyTask.java: Update to match Task.
frysk-core/frysk/proc/live/ChangeLog
2008-02-14 Andrew Cagney <cagney@redhat.com>
* LiveTask.java: Update to match Task.
* LinuxPtraceProc.java: Ditto.
* LinuxPtraceHost.java: Ditto.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/ChangeLog | 3 ++
frysk-core/frysk/proc/Task.java | 22 +++++++++++---------
frysk-core/frysk/proc/dead/ChangeLog | 7 ++++++
frysk-core/frysk/proc/dead/DeadTask.java | 6 +---
frysk-core/frysk/proc/dead/LinuxCoreTask.java | 3 +-
frysk-core/frysk/proc/dead/LinuxExeProc.java | 3 +-
frysk-core/frysk/proc/dead/LinuxExeTask.java | 5 +--
frysk-core/frysk/proc/dummy/ChangeLog | 4 +++
frysk-core/frysk/proc/dummy/DummyTask.java | 5 +--
frysk-core/frysk/proc/live/ChangeLog | 6 +++++
frysk-core/frysk/proc/live/LinuxPtraceHost.java | 2 +-
frysk-core/frysk/proc/live/LinuxPtraceProc.java | 4 +-
frysk-core/frysk/proc/live/LinuxPtraceTask.java | 13 ++---------
frysk-core/frysk/proc/live/LiveTask.java | 24 ++++++++++++++++++----
14 files changed, 65 insertions(+), 42 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 6879721..c3e52f0 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,8 @@
2008-02-13 Andrew Cagney <cagney@redhat.com>
+ * Task.java (tid): New. Replace TaskId with "int tid" in
+ constructors.
+
* TestMapGet.java: Update to match MapsBuilder.
* Proc.java: Update to match frysk.sys.Signal.
diff --git a/frysk-core/frysk/proc/Task.java b/frysk-core/frysk/proc/Task.java
index 99c7be1..d42fe74 100644
--- a/frysk-core/frysk/proc/Task.java
+++ b/frysk-core/frysk/proc/Task.java
@@ -72,19 +72,20 @@ public abstract class Task {
return id;
}
private final TaskId id;
+ private final int tid;
/**
* Return the task's process id.
*/
public final int getTid() {
- return id.id;
+ return tid;
}
/**
* Return the task's (derived) name
*/
public final String getName() {
- return "Task " + getTid();
+ return "Task " + tid;
}
/**
@@ -120,10 +121,11 @@ public abstract class Task {
/**
* Create a new Task skeleton.
*/
- private Task(TaskId id, Proc proc, Task creator) {
+ private Task(int pid, Proc proc, Task creator) {
this.proc = proc;
- this.id = id;
+ this.tid = pid;
this.creator = creator;
+ this.id = new TaskId(pid);
proc.add(this);
proc.getHost().add(this);
}
@@ -131,16 +133,16 @@ public abstract class Task {
/**
* Create a new unattached Task.
*/
- protected Task(Proc proc, TaskId id) {
- this(id, proc, null);
+ protected Task(Proc proc, int pid) {
+ this(pid, proc, null);
logger.log(Level.FINEST, "{0} new -- create unattached\n", this);
}
/**
- * Create a new attached clone of Task.
+ * Create a new attached CLONE of TASK.
*/
- protected Task(Task task, TaskId cloneId) {
- this(cloneId, task.proc, task);
+ protected Task(Task task, int clone) {
+ this(clone, task.proc, task);
logger.log(Level.FINE, "{0} new -- create attached clone\n", this);
}
@@ -154,7 +156,7 @@ public abstract class Task {
* have the containing proc.
*/
protected Task(Proc proc, TaskObserver.Attached attached) {
- this(new TaskId(proc.getPid()), proc, proc.creator);
+ this(proc.getPid(), proc, proc.creator);
}
public class TaskEventObservable extends java.util.Observable {
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index d58e759..aa3fdd0 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-14 Andrew Cagney <cagney@redhat.com>
+
+ * DeadTask.java: Update to match Task.
+ * LinuxCoreTask.java: Ditto.
+ * LinuxExeTask.java: Ditto.
+ * LinuxExeProc.java: Ditto.
+
2008-02-12 Andrew Cagney <cagney@redhat.com>
* LinuxCoreProc.java: Use Log.CALLER.
diff --git a/frysk-core/frysk/proc/dead/DeadTask.java b/frysk-core/frysk/proc/dead/DeadTask.java
index 85e3c51..bfdf6c4 100644
--- a/frysk-core/frysk/proc/dead/DeadTask.java
+++ b/frysk-core/frysk/proc/dead/DeadTask.java
@@ -42,7 +42,6 @@ package frysk.proc.dead;
import java.util.logging.Level;
import frysk.proc.Task;
import frysk.proc.Proc;
-import frysk.proc.TaskId;
import frysk.proc.TaskObserver;
import frysk.isa.ISA;
import frysk.isa.banks.RegisterBanks;
@@ -54,9 +53,8 @@ import frysk.isa.banks.RegisterBanks;
*/
abstract class DeadTask extends Task {
- DeadTask(Proc proc, TaskId taskId, ISA isa,
- RegisterBanks registerBanks) {
- super(proc, taskId);
+ DeadTask(Proc proc, int pid, ISA isa, RegisterBanks registerBanks) {
+ super(proc, pid);
this.isa = isa;
this.registerBanks = registerBanks;
}
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreTask.java b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
index 590bcc2..c537e1f 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreTask.java
@@ -45,7 +45,6 @@ import lib.dwfl.ElfPrXFPRegSet;
import inua.eio.ByteBuffer;
import inua.eio.ArrayByteBuffer;
import inua.eio.ByteOrder;
-import frysk.proc.TaskId;
import frysk.isa.ISA;
import frysk.isa.banks.RegisterBanks;
import frysk.isa.registers.RegistersFactory;
@@ -127,7 +126,7 @@ public class LinuxCoreTask extends DeadTask {
*/
LinuxCoreTask(LinuxCoreProc proc, ElfPrstatus elfTask, ElfPrFPRegSet
elfFPRegs, ElfPrXFPRegSet elfXFPRegs, ISA isa) {
- super(proc, new TaskId(elfTask.getPrPid()), isa,
+ super(proc, elfTask.getPrPid(), isa,
simulateRegisterBanks(elfTask, elfFPRegs, elfXFPRegs, isa));
this.parent = proc;
}
diff --git a/frysk-core/frysk/proc/dead/LinuxExeProc.java b/frysk-core/frysk/proc/dead/LinuxExeProc.java
index 5a781a8..72acd75 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeProc.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeProc.java
@@ -49,7 +49,6 @@ import frysk.isa.ElfMap;
import frysk.proc.Auxv;
import frysk.proc.MemoryMap;
import frysk.proc.ProcId;
-import frysk.proc.TaskId;
public class LinuxExeProc extends DeadProc {
@@ -69,7 +68,7 @@ public class LinuxExeProc extends DeadProc {
public void sendRefresh() {
ISA isa = ElfMap.getISA(elfData.getParent().getEHeader());
- LinuxExeTask newTask = new LinuxExeTask(this, new TaskId(0), isa);
+ LinuxExeTask newTask = new LinuxExeTask(this, isa);
newTask.getClass();
}
diff --git a/frysk-core/frysk/proc/dead/LinuxExeTask.java b/frysk-core/frysk/proc/dead/LinuxExeTask.java
index 2fdf506..7d0dd02 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeTask.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeTask.java
@@ -42,7 +42,6 @@ package frysk.proc.dead;
import inua.eio.ArrayByteBuffer;
import inua.eio.ByteBuffer;
import frysk.isa.banks.RegisterBanks;
-import frysk.proc.TaskId;
import frysk.isa.ISA;
import lib.dwfl.Elf;
import lib.dwfl.ElfCommand;
@@ -53,8 +52,8 @@ public class LinuxExeTask extends DeadTask {
private final long pc;
private final LinuxExeProc proc;
- protected LinuxExeTask(LinuxExeProc proc, TaskId id, ISA isa) {
- super(proc, id, isa, constructRegisterBanks(isa));
+ LinuxExeTask(LinuxExeProc proc, ISA isa) {
+ super(proc, 0, isa, constructRegisterBanks(isa));
this.proc = proc;
// Compute a Fake PC. XXX should be done in Proc instead of
// creating Elf object in the Task itself.
diff --git a/frysk-core/frysk/proc/dummy/ChangeLog b/frysk-core/frysk/proc/dummy/ChangeLog
index f326bb1..d71dfa6 100644
--- a/frysk-core/frysk/proc/dummy/ChangeLog
+++ b/frysk-core/frysk/proc/dummy/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-14 Andrew Cagney <cagney@redhat.com>
+
+ * DummyTask.java: Update to match Task.
+
2008-02-08 Andrew Cagney <cagney@redhat.com>
* DummyTask.java (DummyTask(Proc,int)): New.
diff --git a/frysk-core/frysk/proc/dummy/DummyTask.java b/frysk-core/frysk/proc/dummy/DummyTask.java
index f01de93..29f9c80 100644
--- a/frysk-core/frysk/proc/dummy/DummyTask.java
+++ b/frysk-core/frysk/proc/dummy/DummyTask.java
@@ -45,15 +45,14 @@ import frysk.isa.ISA;
import frysk.isa.banks.RegisterBanks;
import frysk.proc.Task;
import frysk.proc.Proc;
-import frysk.proc.TaskId;
public class DummyTask extends Task {
public DummyTask (Proc parent) {
- super (parent, new TaskId(parent.getPid()));
+ super(parent, parent.getPid());
}
public DummyTask (Proc parent, int pid) {
- super(parent, new TaskId(pid));
+ super(parent, pid);
}
public String getStateString() {
return "Attached";
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 2a3989f..0cec713 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-14 Andrew Cagney <cagney@redhat.com>
+
+ * LiveTask.java: Update to match Task.
+ * LinuxPtraceProc.java: Ditto.
+ * LinuxPtraceHost.java: Ditto.
+
2008-02-13 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceProc.java: Update to match Status.
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceHost.java b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
index bd83b53..724ea42 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceHost.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceHost.java
@@ -262,7 +262,7 @@ public class LinuxPtraceHost extends LiveHost {
if (myTask == null) {
// If not, find this process and add this task to it.
Proc myProc = getSelf();
- myTask = new LinuxPtraceTask(myProc, myTaskId);
+ myTask = new LinuxPtraceTask(myProc, pid);
}
LinuxPtraceProc proc = new LinuxPtraceProc(myTask, pid);
new LinuxPtraceTask(proc, attachedObserver);
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceProc.java b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
index 5cb5e57..2c179c3 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceProc.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceProc.java
@@ -254,8 +254,8 @@ public class LinuxPtraceProc extends LiveProc {
}
else {
// Add the process (it currently isn't attached).
- Task newTask = new LinuxPtraceTask(LinuxPtraceProc.this,
- new TaskId (tid.intValue()));
+ Task newTask
+ = new LinuxPtraceTask(LinuxPtraceProc.this, tid);
added.put (newTask.getTaskId(), newTask);
}
}
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTask.java b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
index 16dcd60..ecad2a8 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTask.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTask.java
@@ -52,7 +52,6 @@ import frysk.proc.Manager;
import frysk.proc.TaskObserver.Terminating;
import frysk.proc.TaskObserver;
import frysk.proc.Proc;
-import frysk.proc.TaskId;
import frysk.proc.Task;
import java.util.logging.Level;
import frysk.event.Event;
@@ -60,7 +59,6 @@ import inua.eio.ByteBuffer;
import inua.eio.ByteOrder;
import frysk.sys.Errno;
import frysk.sys.ProcessIdentifier;
-import frysk.sys.ProcessIdentifierFactory;
import frysk.sys.ptrace.Ptrace;
import frysk.sys.ptrace.AddressSpace;
import frysk.sys.Signal;
@@ -75,14 +73,11 @@ import frysk.isa.banks.RegisterBanks;
*/
public class LinuxPtraceTask extends LiveTask {
- final ProcessIdentifier tid;
-
/**
* Create a new unattached Task.
*/
- public LinuxPtraceTask(Proc proc, TaskId id) {
- super(proc, id);
- tid = ProcessIdentifierFactory.create(id.hashCode());
+ public LinuxPtraceTask(Proc proc, ProcessIdentifier pid) {
+ super(proc, pid);
((LinuxPtraceHost)proc.getHost()).putTask(tid, this);
newState = LinuxPtraceTaskState.detachedState();
}
@@ -91,8 +86,7 @@ public class LinuxPtraceTask extends LiveTask {
*/
public LinuxPtraceTask(Task task, ProcessIdentifier clone) {
// XXX: shouldn't need to grub around in the old task's state.
- super(task, new TaskId(clone.intValue()));
- tid = clone;
+ super(task, clone);
((LinuxPtraceHost)getProc().getHost()).putTask(tid, this);
newState = LinuxPtraceTaskState.clonedState(((LinuxPtraceTask)task).getState ());
}
@@ -102,7 +96,6 @@ public class LinuxPtraceTask extends LiveTask {
public LinuxPtraceTask(LinuxPtraceProc proc,
TaskObserver.Attached attached) {
super(proc, attached);
- tid = ProcessIdentifierFactory.create(proc.getPid());
((LinuxPtraceHost)proc.getHost()).putTask(tid, this);
newState = LinuxPtraceTaskState.mainState();
if (attached != null) {
diff --git a/frysk-core/frysk/proc/live/LiveTask.java b/frysk-core/frysk/proc/live/LiveTask.java
index 692933c..b6b31ed 100644
--- a/frysk-core/frysk/proc/live/LiveTask.java
+++ b/frysk-core/frysk/proc/live/LiveTask.java
@@ -42,8 +42,9 @@ package frysk.proc.live;
import inua.eio.ByteBuffer;
import frysk.proc.Task;
import frysk.proc.Proc;
-import frysk.proc.TaskId;
import frysk.proc.TaskObserver.Attached;
+import frysk.sys.ProcessIdentifier;
+import frysk.sys.ProcessIdentifierFactory;
/**
* A live Host/Proc/Task is characterised by its stateful nature;
@@ -52,14 +53,27 @@ import frysk.proc.TaskObserver.Attached;
*/
abstract class LiveTask extends Task {
- LiveTask(Proc proc, TaskId taskId) {
- super(proc, taskId);
+ final ProcessIdentifier tid;
+ /**
+ * New un-attached task of Proc.
+ */
+ LiveTask(Proc proc, ProcessIdentifier pid) {
+ super(proc, pid.intValue());
+ tid = pid;
}
- LiveTask(Task task, TaskId taskId) {
- super(task, taskId);
+ /**
+ * New attached clone.
+ */
+ LiveTask(Task task, ProcessIdentifier clone) {
+ super(task, clone.intValue());
+ tid = clone;
}
+ /**
+ * New attached child.
+ */
LiveTask(LiveProc proc, Attached attached) {
super(proc, attached);
+ tid = ProcessIdentifierFactory.create(proc.getPid());
}
/**
hooks/post-receive
--
frysk system monitor/debugger
reply other threads:[~2008-02-14 14:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080214143021.9438.qmail@sourceware.org \
--to=cagney@sourceware.org \
--cc=frysk-cvs@sourceware.org \
--cc=frysk@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).