public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Make Host.getName() abstract.
@ 2008-02-08 16:04 cagney
0 siblings, 0 replies; only message in thread
From: cagney @ 2008-02-08 16:04 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via b5f3352b84deae5f16bbd33f4e736f6a82d6ee07 (commit)
from 12ad3f3bda382725291d9d8d5bed2f26ae2f4282 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit b5f3352b84deae5f16bbd33f4e736f6a82d6ee07
Author: Andrew Cagney <cagney@redhat.com>
Date: Fri Feb 8 11:03:20 2008 -0500
Make Host.getName() abstract.
frysk-core/frysk/proc/ChangeLog
2008-02-08 Andrew Cagney <cagney@redhat.com>
* Host.java (getName()): Make abstract.
frysk-core/frysk/proc/dead/ChangeLog
2008-02-08 Andrew Cagney <cagney@redhat.com>
* LinuxCoreHost.java (getName()): Implement.
* LinuxExeHost.java (getName()): Ditto.
frysk-core/frysk/proc/dummy/ChangeLog
2008-02-08 Andrew Cagney <cagney@redhat.com>
* DummyProc.java (DummyProc(DummyHost,int)): New.
* DummyHost.java (getName()): Implement.
(DummyHost(String)): New.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/proc/ChangeLog | 4 ++++
frysk-core/frysk/proc/Host.java | 11 +----------
frysk-core/frysk/proc/dead/ChangeLog | 5 +++++
frysk-core/frysk/proc/dead/LinuxCoreHost.java | 5 +++++
frysk-core/frysk/proc/dead/LinuxExeHost.java | 6 +++++-
frysk-core/frysk/proc/dummy/ChangeLog | 6 ++++++
frysk-core/frysk/proc/dummy/DummyHost.java | 11 +++++++++++
frysk-core/frysk/proc/dummy/DummyProc.java | 5 ++++-
frysk-core/frysk/proc/live/LiveHost.java | 13 ++++++++++++-
9 files changed, 53 insertions(+), 13 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/ChangeLog b/frysk-core/frysk/proc/ChangeLog
index a30eb3f..ed52f58 100644
--- a/frysk-core/frysk/proc/ChangeLog
+++ b/frysk-core/frysk/proc/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-08 Andrew Cagney <cagney@redhat.com>
+
+ * Host.java (getName()): Make abstract.
+
2008-02-07 Andrew Cagney <cagney@redhat.com>
* Host.java (requestRefreshXXX()): Delete.
diff --git a/frysk-core/frysk/proc/Host.java b/frysk-core/frysk/proc/Host.java
index c3f8a95..3ecc2b0 100644
--- a/frysk-core/frysk/proc/Host.java
+++ b/frysk-core/frysk/proc/Host.java
@@ -40,7 +40,6 @@
package frysk.proc;
import java.util.Collection;
-import java.net.UnknownHostException;
import java.util.Map;
import java.util.HashMap;
import java.util.Observable; // XXX: Temporary.
@@ -231,13 +230,5 @@ public abstract class Host {
/**
* Returns the name of the host
*/
- public String getName() {
- try {
- return java.net.InetAddress.getLocalHost().getHostName();
- } catch (UnknownHostException e) {
- return "Unknown Host";
- } catch (NullPointerException npe) {
- return "Problem reading network address";
- }
- }
+ public abstract String getName();
}
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 35fb5b6..9f8091a 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-08 Andrew Cagney <cagney@redhat.com>
+
+ * LinuxCoreHost.java (getName()): Implement.
+ * LinuxExeHost.java (getName()): Ditto.
+
2008-02-08 Phil Muldoon <pmuldoon@redhat.com>
* LinuxCoreHost.java: Use CanonicalFile() througout.
diff --git a/frysk-core/frysk/proc/dead/LinuxCoreHost.java b/frysk-core/frysk/proc/dead/LinuxCoreHost.java
index 10078d3..926175a 100644
--- a/frysk-core/frysk/proc/dead/LinuxCoreHost.java
+++ b/frysk-core/frysk/proc/dead/LinuxCoreHost.java
@@ -202,7 +202,12 @@ public class LinuxCoreHost extends DeadHost {
}
+ public String getName() {
+ return coreFile.getName();
+ }
+
protected void finalize() throws Throwable {
corefileElf = null;
}
+
}
diff --git a/frysk-core/frysk/proc/dead/LinuxExeHost.java b/frysk-core/frysk/proc/dead/LinuxExeHost.java
index ab9575f..9a78796 100644
--- a/frysk-core/frysk/proc/dead/LinuxExeHost.java
+++ b/frysk-core/frysk/proc/dead/LinuxExeHost.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
@@ -129,6 +129,10 @@ public class LinuxExeHost extends DeadHost {
}
}
+ public String getName() {
+ return exeFile.getName();
+ }
+
/**
* finalize closes the file descriptor for the executable.
*/
diff --git a/frysk-core/frysk/proc/dummy/ChangeLog b/frysk-core/frysk/proc/dummy/ChangeLog
index 9389c51..4b86ce2 100644
--- a/frysk-core/frysk/proc/dummy/ChangeLog
+++ b/frysk-core/frysk/proc/dummy/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-08 Andrew Cagney <cagney@redhat.com>
+
+ * DummyProc.java (DummyProc(DummyHost,int)): New.
+ * DummyHost.java (getName()): Implement.
+ (DummyHost(String)): New.
+
2008-02-07 Andrew Cagney <cagney@redhat.com>
* DummyHost.java (requestRefreshXXX()): Delete.
diff --git a/frysk-core/frysk/proc/dummy/DummyHost.java b/frysk-core/frysk/proc/dummy/DummyHost.java
index 0378669..b1db590 100644
--- a/frysk-core/frysk/proc/dummy/DummyHost.java
+++ b/frysk-core/frysk/proc/dummy/DummyHost.java
@@ -47,6 +47,14 @@ import java.util.Collection;
import frysk.proc.HostRefreshBuilder;
public class DummyHost extends Host {
+ private final String name;
+ public DummyHost(String name) {
+ this.name = name;
+ }
+ public DummyHost() {
+ this("dummy-host");
+ }
+
public void requestCreateAttachedProc(String stdin, String stdout,
String stderr, String[] args,
Attached attached) {
@@ -62,4 +70,7 @@ public class DummyHost extends Host {
HostRefreshBuilder results) {
throw new RuntimeException("requestRefresh");
}
+ public String getName() {
+ return name;
+ }
}
diff --git a/frysk-core/frysk/proc/dummy/DummyProc.java b/frysk-core/frysk/proc/dummy/DummyProc.java
index 768169b..1333e1f 100644
--- a/frysk-core/frysk/proc/dummy/DummyProc.java
+++ b/frysk-core/frysk/proc/dummy/DummyProc.java
@@ -45,8 +45,11 @@ import frysk.proc.MemoryMap;
import frysk.proc.Proc;
public class DummyProc extends Proc {
+ public DummyProc(DummyHost host, int pid) {
+ super(host, null, new ProcId(pid));
+ }
public DummyProc() {
- super(new DummyHost(), null, new ProcId(42));
+ this(new DummyHost(), 42);
}
public String getCommand() {
diff --git a/frysk-core/frysk/proc/live/LiveHost.java b/frysk-core/frysk/proc/live/LiveHost.java
index a004414..f57dfbe 100644
--- a/frysk-core/frysk/proc/live/LiveHost.java
+++ b/frysk-core/frysk/proc/live/LiveHost.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.live;
import frysk.proc.Host;
+import java.net.UnknownHostException;
+import java.net.InetAddress;
/**
* A live Host/Proc/Task is characterised by its stateful nature;
@@ -49,4 +51,13 @@ import frysk.proc.Host;
abstract class LiveHost extends Host {
+ public String getName() {
+ try {
+ return InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException e) {
+ return "Unknown Host";
+ } catch (NullPointerException npe) {
+ return "Problem reading network address";
+ }
+ }
}
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-02-08 16:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-08 16:04 [SCM] master: Make Host.getName() abstract 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).