public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Eliminate Host.sendrecSelf().
@ 2008-01-04 22:06 cagney
0 siblings, 0 replies; only message in thread
From: cagney @ 2008-01-04 22:06 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 36d3c3df1ee1a988cc5ee922f9f4652e9b8789b3 (commit)
via fe1066e2ad35a81ea7c05503b3313fc230e589d4 (commit)
via 74d22595c6864975f784d04534e554e973bf7ecb (commit)
via ae64fb0a2d00c1f918242c3f0b1d66fa4959843b (commit)
from 6261f1b370301704c58f6ac48f25c8b6a6e4033e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 36d3c3df1ee1a988cc5ee922f9f4652e9b8789b3
Author: Andrew Cagney <cagney@redhat.com>
Date: Fri Jan 4 16:54:07 2008 -0500
Eliminate Host.sendrecSelf().
frysk-core/frysk/proc/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* Host.java (getSelf()): Make abstract.
(sendrecSelf()): Delete.
(self): Delete.
frysk-core/frysk/proc/dead/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* DeadHost.java (getSelf()): New.
* LinuxCoreHost.java (sendrecSelf()): Delete.
* LinuxExeHost.java (sendrecSelf()): Delete.
frysk-core/frysk/proc/dummy/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* DummyHost.java (getSelf()): Replace sendrecSelf().
frysk-core/frysk/proc/live/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceHost.java (getSelf()): Replace sendrecSelf().
commit fe1066e2ad35a81ea7c05503b3313fc230e589d4
Author: Andrew Cagney <cagney@redhat.com>
Date: Fri Jan 4 15:18:56 2008 -0500
frysk-core/frysk/proc/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* Host.java (requestRefreshXXX()): Make abstract.
(sendRefresh(boolean)): Delete.
frysk-core/frysk/proc/dead/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* LinuxExeHost.java (sendRefresh(boolean)): Delete.
* LinuxCoreHost.java (sendRefresh()): Replace
sendRefresh(boolean), make private.
frysk-core/frysk/proc/dummy/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* DummyHost.java (requestRefreshXXX()): Replace
sendRefresh(boolean).
frysk-core/frysk/proc/live/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceHost.java (requestRefreshXXX()): New.
(sendRefresh(boolean)): Make private.
commit 74d22595c6864975f784d04534e554e973bf7ecb
Author: Andrew Cagney <cagney@redhat.com>
Date: Fri Jan 4 14:49:09 2008 -0500
Push requestCreateAttachedProc into LinuxPtraceHost.
frysk-core/frysk/proc/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* Host.java (requestCreateAttachedProc(String,String,String,String[],Attached)): Make abstract.
(sendCreateAttachedProc(String,String,String,String[],Attached)): Delete.
frysk-core/frysk/proc/dead/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* DeadHost.java (requestCreateAttachedProc(String,String,String,String[],Attached)): New.
* LinuxExeHost.java (sendCreateAttachedProc(String,String,String,String[],Attached)): Delete.
* LinuxCoreHost.java (sendCreateAttachedProc(String,String,String,String[],Attached)): Delete.
frysk-core/frysk/proc/dummy/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* DummyHost.java (requestCreateAttachedProc): Replace
sendCreateAttachedProc.
frysk-core/frysk/proc/live/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* LinuxPtraceHost.java (requestCreateAttachedProc(String,String,String,String[],Attached)): New.
(sendCreateAttachedProc(String,String,String,String[],Attached)): Delete.
commit ae64fb0a2d00c1f918242c3f0b1d66fa4959843b
Author: Andrew Cagney <cagney@redhat.com>
Date: Fri Jan 4 14:12:17 2008 -0500
frysk-core/frysk/proc/ChangeLog
2008-01-04 Andrew Cagney <cagney@redhat.com>
* HostState.java: Delete.
* Host.java (requestRefreshXXX()): Eliminate state code.
(requestCreateAttachedProc(String,String,String,String[],Attached)):
Ditto.
(requestFindProc(ProcId, FindProc)): Ditto.
(oldState(), getState()): Delete.
(oldState, newState): Delete.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/ChangeLog | 18 ++++
frysk-core/frysk/proc/Host.java | 106 ++++-------------------
frysk-core/frysk/proc/HostState.java | 87 -------------------
frysk-core/frysk/proc/dead/ChangeLog | 14 +++
frysk-core/frysk/proc/dead/DeadHost.java | 16 +++-
frysk-core/frysk/proc/dead/LinuxCoreHost.java | 16 +---
frysk-core/frysk/proc/dead/LinuxExeHost.java | 42 +--------
frysk-core/frysk/proc/dummy/ChangeLog | 10 ++
frysk-core/frysk/proc/dummy/DummyHost.java | 14 ++--
frysk-core/frysk/proc/live/ChangeLog | 8 ++
frysk-core/frysk/proc/live/LinuxPtraceHost.java | 79 ++++++++++-------
11 files changed, 143 insertions(+), 267 deletions(-)
delete mode 100644 frysk-core/frysk/proc/HostState.java
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index 9a413e1..5842faa 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,5 +1,23 @@
2008-01-04 Andrew Cagney <cagney@redhat.com>
+ * Host.java (getSelf()): Make abstract.
+ (sendrecSelf()): Delete.
+ (self): Delete.
+
+ * Host.java (requestRefreshXXX()): Make abstract.
+ (sendRefresh(boolean)): Delete.
+
+ * Host.java (requestCreateAttachedProc(String,String,String,String[],Attached)): Make abstract.
+ (sendCreateAttachedProc(String,String,String,String[],Attached)): Delete.
+
+ * HostState.java: Delete.
+ * Host.java (requestRefreshXXX()): Eliminate state code.
+ (requestCreateAttachedProc(String,String,String,String[],Attached)):
+ Ditto.
+ (requestFindProc(ProcId, FindProc)): Ditto.
+ (oldState(), getState()): Delete.
+ (oldState, newState): Delete.
+
* ProcState.java: Delete; merged into
frysk.proc.live.LinuxPtraceProcState.
diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java
index 12d2834..946e901 100644
--- a/frysk-core/frysk/proc/Host.java
+++ b/frysk-core/frysk/proc/Host.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2005, 2006, 2007, Red Hat Inc.
+// Copyright 2005, 2006, 2007, 2008, Red Hat Inc.
//
// FRYSK is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
@@ -62,7 +62,6 @@ public abstract class Host {
* The host corresponds to a specific system.
*/
protected Host() {
- newState = HostState.initial(this);
logger.log(Level.FINE, "{0} Host\n", this);
}
@@ -117,70 +116,14 @@ public abstract class Host {
}
// Refresh the list of processes.
- protected abstract void sendRefresh(boolean refreshAll);
-
protected abstract void sendRefresh(ProcId procId, FindProc finder);
/**
- * Tell the host to create a running child process.
- *
- * Unlike other requests, this operation is bound to an explicit
- * call-back. Doing this means that the requestor has a robust
- * way of receiving an acknolwedge of the operation. Without this
- * there would be no reliable way to bind to the newly created
- * process - frysk's state machine could easily detach before the
- * requestor had an oportunity to add an attached observer.
- *
- * XXX: Is this the best thing?
- */
- protected abstract void sendCreateAttachedProc(String stdin,
- String stdout,
- String stderr,
- String[] args,
- TaskObserver.Attached attached);
-
- /**
- * The current state of this host.
- */
- private HostState oldState;
- private HostState newState;
- /**
- * Return the current state.
- */
- HostState getState() {
- if (newState != null)
- return newState;
- else
- return oldState;
- }
- /**
- * Return the current state while at the same time marking that
- * the state is in flux. If a second attempt to change state
- * occurs before the current state transition has completed, barf.
- * XXX: Bit of a hack, but at least this prevents state transition
- * code attempting a second recursive state transition.
- */
- private HostState oldState() {
- if (newState == null)
- throw new RuntimeException("double state transition");
- oldState = newState;
- newState = null;
- return oldState;
- }
-
- /**
* Request that the Host scan the system's process tables
* refreshing the internal structure to match. Optionally refresh
* each processes task list.
*/
- public void requestRefreshXXX() {
- logger.log(Level.FINEST, "{0} requestRefreshXXX\n", this);
- Manager.eventLoop.add(new HostEvent("RequestRefresh") {
- public void execute() {
- newState = oldState().handleRefresh(Host.this, false);
- }
- });
- }
+ public abstract void requestRefreshXXX();
/**
* Find a specifc process from its Id.
@@ -188,26 +131,26 @@ public abstract class Host {
public void requestFindProc(final ProcId procId, final FindProc finder) {
Manager.eventLoop.add(new HostEvent("FindProc") {
public void execute() {
- newState = oldState().handleRefresh(Host.this, procId, finder);
+ logger.log(Level.FINE, "{0} handleRefresh\n", Host.this);
+ Host.this.sendRefresh (procId, finder);
}});
}
/**
- * Request that a new attached and running process be created.
+ * Tell the host to create a running child process.
+ *
+ * Unlike other requests, this operation is bound to an explicit
+ * call-back. Doing this means that the requestor has a robust
+ * way of receiving an acknolwedge of the operation. Without this
+ * there would be no reliable way to bind to the newly created
+ * process - frysk's state machine could easily detach before the
+ * requestor had an oportunity to add an attached observer.
*/
- public final void requestCreateAttachedProc(final String stdin,
- final String stdout,
- final String stderr,
- final String[] args,
- final TaskObserver.Attached attachedObserver) {
- logger.log(Level.FINE, "{0} requestCreateAttachedProc\n", this);
- Manager.eventLoop.add(new HostEvent("requestCreateAttachedProc") {
- public void execute() {
- newState= oldState().handleCreateAttachedProc
- (Host.this, stdin, stdout, stderr, args, attachedObserver);
- }
- });
- }
+ public abstract void requestCreateAttachedProc(String stdin,
+ String stdout,
+ String stderr,
+ String[] args,
+ TaskObserver.Attached attachedObserver);
/**
* Request that a new attached and running process(with stdin,
* stdout, and stderr are shared with this process) be created.
@@ -270,26 +213,13 @@ public abstract class Host {
* Return the process corresponding to this running frysk instance
* found on this host.
*/
- public Proc getSelf() {
- if (self == null)
- self = sendrecSelf();
- return self;
- }
- /**
- * Pointer to <em>frysk</em> running on this Host.
- */
- private Proc self;
- /**
- * Extract a pointer to <em>frysk</em> running on this Host.
- */
- protected abstract Proc sendrecSelf();
+ public abstract Proc getSelf();
/**
* Print this.
*/
public String toString() {
return ("{" + super.toString()
- + ",state=" + getState()
+ "}");
}
diff --git a/frysk-core/frysk/proc/HostState.java b/frysk-core/frysk/proc/HostState.java
deleted file mode 100644
index 3c8913c..0000000
--- a/frysk-core/frysk/proc/HostState.java
+++ /dev/null
@@ -1,87 +0,0 @@
-// This file is part of the program FRYSK.
-//
-// Copyright 2005, 2006, 2007, Red Hat Inc.
-//
-// FRYSK is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// FRYSK is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with FRYSK; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-//
-// In addition, as a special exception, Red Hat, Inc. gives You the
-// additional right to link the code of FRYSK with code not covered
-// under the GNU General Public License ("Non-GPL Code") and to
-// distribute linked combinations including the two, subject to the
-// limitations in this paragraph. Non-GPL Code permitted under this
-// exception must only link to the code of FRYSK through those well
-// defined interfaces identified in the file named EXCEPTION found in
-// the source code files (the "Approved Interfaces"). The files of
-// Non-GPL Code may instantiate templates or use macros or inline
-// functions from the Approved Interfaces without causing the
-// resulting work to be covered by the GNU General Public
-// License. Only Red Hat, Inc. may make changes or additions to the
-// list of Approved Interfaces. You must obey the GNU General Public
-// License in all respects for all of the FRYSK code and other code
-// used in conjunction with FRYSK except the Non-GPL Code covered by
-// this exception. If you modify this file, you may extend this
-// exception to your version of the file, but you are not obligated to
-// do so. If you do not wish to provide this exception without
-// modification, you must delete this exception statement from your
-// version and license this file solely under the GPL without
-// exception.
-
-package frysk.proc;
-
-import java.util.logging.Level;
-
-/**
- * State machine to handle host events. At present there's only a
- * single state.
- */
-
-public abstract class HostState
- extends State
-{
- private static final HostState initialState = new HostState()
- {
- };
- static HostState initial (Host host)
- {
- return initialState;
- }
- private HostState ()
- {
- super ("running");
- }
- HostState handleRefresh (Host host, boolean refreshAll)
- {
- logger.log (Level.FINE, "{0} handleRefresh\n", host);
- host.sendRefresh (refreshAll);
- return this;
- }
- HostState handleCreateAttachedProc (Host host,
- String stdin,
- String stdout,
- String stderr,
- String[] args,
- TaskObserver.Attached attached)
- {
- logger.log (Level.FINE, "{0} handleCreateAttachedProc\n", host);
- host.sendCreateAttachedProc (stdin, stdout, stderr, args,
- attached);
- return this;
- }
- HostState handleRefresh (Host host, ProcId procId, FindProc finder)
- {
- logger.log (Level.FINE, "{0} handleRefresh\n", host);
- host.sendRefresh (procId, finder);
- return this;
- }
-}
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 6a8eed6..c62f280 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-04 Andrew Cagney <cagney@redhat.com>
+
+ * DeadHost.java (getSelf()): New.
+ * LinuxCoreHost.java (sendrecSelf()): Delete.
+ * LinuxExeHost.java (sendrecSelf()): Delete.
+
+ * LinuxExeHost.java (sendRefresh(boolean)): Delete.
+ * LinuxCoreHost.java (sendRefresh()): Replace
+ sendRefresh(boolean), make private.
+
+ * DeadHost.java (requestCreateAttachedProc(String,String,String,String[],Attached)): New.
+ * LinuxExeHost.java (sendCreateAttachedProc(String,String,String,String[],Attached)): Delete.
+ * LinuxCoreHost.java (sendCreateAttachedProc(String,String,String,String[],Attached)): Delete.
+
2008-01-03 Andrew Cagney <cagney@redhat.com>
* LinuxExeProcState.java: Delete.
diff --git a/frysk-core/frysk/proc/dead/DeadHost.java b/frysk-core/frysk/proc/dead/DeadHost.java
index 29a077e..984ca6b 100644
--- a/frysk-core/frysk/proc/dead/DeadHost.java
+++ b/frysk-core/frysk/proc/dead/DeadHost.java
@@ -1,6 +1,6 @@
// This file is part of the program FRYSK.
//
-// Copyright 2007 Red Hat Inc.
+// Copyright 2007, 2008 Red Hat Inc.
//
// FRYSK is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
@@ -40,6 +40,8 @@
package frysk.proc.dead;
import frysk.proc.Host;
+import frysk.proc.TaskObserver.Attached;
+import frysk.proc.Proc;
/**
* A dead Host/Proc/Task is characterised by its lack of state, and an
@@ -48,5 +50,15 @@ import frysk.proc.Host;
*/
abstract class DeadHost extends Host {
-
+ public void requestCreateAttachedProc(String in, String out, String err,
+ String[] args,
+ Attached attached) {
+ throw new RuntimeException("requestCreateAttachedProc");
+ }
+ public void requestRefreshXXX() {
+ // ignore.
+ }
+ public Proc getSelf() {
+ throw new RuntimeException("getSelf");
+ }
}
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreHost.java b/frysk-core/frysk/proc/dead/LinuxCoreHost.java
index c9b1e43..dddc8f7 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreHost.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreHost.java
@@ -54,7 +54,6 @@ import lib.dwfl.ElfPHeader;
import lib.dwfl.ElfPrpsinfo;
import frysk.proc.Proc;
import frysk.proc.ProcId;
-import frysk.proc.TaskObserver;
import frysk.proc.FindProc;
public class LinuxCoreHost extends DeadHost {
@@ -92,7 +91,7 @@ public class LinuxCoreHost extends DeadHost {
}
if (doRefresh)
- this.sendRefresh(true);
+ this.sendRefresh();
}
public LinuxCoreHost(EventLoop eventLoop, File coreFile) {
@@ -115,15 +114,14 @@ public class LinuxCoreHost extends DeadHost {
status.message = "The user provided executable: "
+ exeFile.getAbsolutePath() + " could not be accessed";
}
- this.sendRefresh(true);
+ this.sendRefresh();
}
public CorefileStatus getStatus() {
return status;
}
- protected void sendRefresh(boolean refreshAll) {
-
+ private void sendRefresh() {
if (this.hasRefreshed)
return;
// Iterate (build) the /proc tree, passing each found PID to
@@ -161,14 +159,6 @@ public class LinuxCoreHost extends DeadHost {
}
- protected void sendCreateAttachedProc(String stdin, String stdout,
- String stderr, String[] args, TaskObserver.Attached attached) {
- }
-
- protected Proc sendrecSelf() {
- return null;
- }
-
private class DeconstructCoreFile {
List addedProcs = new LinkedList();
diff --git a/frysk-core/frysk/proc/dead/LinuxExeHost.java b/frysk-core/frysk/proc/dead/LinuxExeHost.java
index a517918..46e78c3 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeHost.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeHost.java
@@ -54,56 +54,30 @@ import frysk.event.EventLoop;
import frysk.proc.FindProc;
import frysk.proc.Proc;
import frysk.proc.ProcId;
-import frysk.proc.TaskObserver.Attached;
public class LinuxExeHost extends DeadHost {
protected File exeFile = null;
EventLoop eventLoop = null;
Elf exeFileElf = null;
- private boolean hasRefreshed;
- public LinuxExeHost(EventLoop eventLoop, File exeFile)
- {
+ public LinuxExeHost(EventLoop eventLoop, File exeFile) {
this.exeFile = exeFile;
this.eventLoop = eventLoop;
- try
- {
+ try {
this.exeFileElf = new Elf (exeFile.getPath(), ElfCommand.ELF_C_READ);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new RuntimeException("ExeFile " + this.exeFile + " is "+
"not a valid ELF file.");
}
-
- this.sendRefresh(true);
- }
-
- protected void sendCreateAttachedProc(String stdin, String stdout,
- String stderr, String[] args, Attached attached) {
-
- }
-
- /**
- * sendRefresh refreshes the list of processes.
- *
- * @param refreshAll is a boolean, true=refresh, false=not
- */
- protected void sendRefresh(boolean refreshAll) {
- if (this.hasRefreshed)
- return;
// Iterate (build) the /proc tree, passing each found PID to
// procChanges where it can update the /proc tree.
// Changes individual process.
new DeconstructExeFile(this.exeFileElf);
-
- for (Iterator i = procPool.values().iterator(); i.hasNext();)
- {
+ for (Iterator i = procPool.values().iterator(); i.hasNext();) {
LinuxExeProc proc = (LinuxExeProc) i.next();
proc.sendRefresh();
}
- this.hasRefreshed = true;
}
/**
@@ -114,14 +88,6 @@ public class LinuxExeHost extends DeadHost {
return;
}
- /**
- * sendrecSelf sends a point to frysk back, but no need for this
- * for an executable.
- */
- protected Proc sendrecSelf() {
- return null;
- }
-
private class DeconstructExeFile
{
List addedProcs = new LinkedList();
diff --git a/frysk-core/frysk/proc/dummy/ChangeLog b/frysk-core/frysk/proc/dummy/ChangeLog
index f8cf0b2..b19bda9 100644
--- a/frysk-core/frysk/proc/dummy/ChangeLog
+++ b/frysk-core/frysk/proc/dummy/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-04 Andrew Cagney <cagney@redhat.com>
+
+ * DummyHost.java (getSelf()): Replace sendrecSelf().
+
+ * DummyHost.java (requestRefreshXXX()): Replace
+ sendRefresh(boolean).
+
+ * DummyHost.java (requestCreateAttachedProc): Replace
+ sendCreateAttachedProc.
+
2008-01-03 Andrew Cagney <cagney@redhat.com>
* DummyTask.java (requestAddInstructionObserver(TaskObserver.Instruction)): New.
diff --git a/frysk-core/frysk/proc/dummy/DummyHost.java b/frysk-core/frysk/proc/dummy/DummyHost.java
index fc30302..f7746ba 100644
--- a/frysk-core/frysk/proc/dummy/DummyHost.java
+++ b/frysk-core/frysk/proc/dummy/DummyHost.java
@@ -39,21 +39,23 @@
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-04 22:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-04 22:06 [SCM] master: Eliminate Host.sendrecSelf() 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).