public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Remove utrace stubs.
@ 2008-07-07 15:16 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-07-07 15:16 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  f13cb684cd4a80a3c1080cbc5b2823ba5e4b65d0 (commit)
      from  44038d6b0cfa52d6ee37adc061cb4142997d99b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit f13cb684cd4a80a3c1080cbc5b2823ba5e4b65d0
Author: Andrew Cagney <cagney@redhat.com>
Date:   Mon Jul 7 11:15:53 2008 -0400

    Remove utrace stubs.

-----------------------------------------------------------------------

Summary of changes:
 frysk-sys/frysk/sys/ChangeLog              |    8 ++
 frysk-sys/frysk/sys/Fork.java              |   26 -----
 frysk-sys/frysk/sys/cni/Fork.cxx           |   10 --
 frysk-sys/frysk/sys/cni/Fork.hxx           |    1 -
 frysk-sys/frysk/sys/jni/Fork.cxx           |   11 --
 frysk-sys/frysk/sys/jni/Fork.hxx           |    1 -
 frysk-sys/frysk/sys/ptrace/ChangeLog       |    7 ++
 frysk-sys/frysk/sys/ptrace/TestUtrace.java |  156 ----------------------------
 frysk-sys/frysk/sys/ptrace/Utrace.java     |  123 ----------------------
 frysk-sys/frysk/sys/ptrace/cni/Utrace.cxx  |   91 ----------------
 frysk-sys/frysk/sys/ptrace/jni/Utrace.cxx  |   40 -------
 11 files changed, 15 insertions(+), 459 deletions(-)
 delete mode 100644 frysk-sys/frysk/sys/ptrace/TestUtrace.java
 delete mode 100644 frysk-sys/frysk/sys/ptrace/Utrace.java
 delete mode 100644 frysk-sys/frysk/sys/ptrace/cni/Utrace.cxx
 delete mode 100644 frysk-sys/frysk/sys/ptrace/jni/Utrace.cxx

First 500 lines of diff:
diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog
index 30c807d..a96417f 100644
--- a/frysk-sys/frysk/sys/ChangeLog
+++ b/frysk-sys/frysk/sys/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-07  Andrew Cagney  <cagney@redhat.com>
+
+	* cni/Fork.hxx: Remove utrace stubs.
+	* Fork.java: Ditto.
+	* jni/Fork.hxx: Ditto.
+	* jni/Fork.cxx: Ditto.
+	* cni/Fork.cxx: Ditto.
+
 2008-06-20  Andrew Cagney  <cagney@redhat.com>
 
 	* Poll.java: Move to frysk.sys.poll.
diff --git a/frysk-sys/frysk/sys/Fork.java b/frysk-sys/frysk/sys/Fork.java
index 7e2f39c..46c98cb 100644
--- a/frysk-sys/frysk/sys/Fork.java
+++ b/frysk-sys/frysk/sys/Fork.java
@@ -53,9 +53,6 @@ public final class Fork {
     private static native int ptrace(String exe,
 				     String in, String out, String err,
 				     String[] args, String[] environ);
-    private static native int utrace(String exe,
-				     String in, String out, String err,
-				     String[] args, String[] environ);
     private static native int daemon(String exe,
 				     String in, String out, String err,
 				     String[] args, String[] environ);
@@ -118,29 +115,6 @@ public final class Fork {
     }
 
     /**
-     * Create a child process running EXE with arguments ARGS[0...];
-     * mark the process for utracing.
-     *
-     * Also wire up IN, OUT, and ERR.
-     */
-    public static ProcessIdentifier utrace(File exe,
-					   String in, String out,
-					   String err, String[] args) {
-	return ProcessIdentifierFactory.create(utrace(exe.getPath(),
-						      in, out, err,
-						      args, null));
-    }
-    /**
-     * Create a child process running ARGS[0] with arguments
-     * ARGV[0...]; mark the process for utracing.
-     */
-    public static ProcessIdentifier utrace(String[] args) {
-	return ProcessIdentifierFactory.create(utrace(args[0],
-						      null, null, null,
-						      args, null));
-    }
-
-    /**
      * Create a "daemon" process running ARGV[0] with arguments
      * ARGV[1...]; a daemon has process ID 1 as its parent.
      */
diff --git a/frysk-sys/frysk/sys/cni/Fork.cxx b/frysk-sys/frysk/sys/cni/Fork.cxx
index 9d35ffd..ef6e3a8 100644
--- a/frysk-sys/frysk/sys/cni/Fork.cxx
+++ b/frysk-sys/frysk/sys/cni/Fork.cxx
@@ -115,9 +115,6 @@ spawn(tracing trace, redirect& redirection, exec& execute) {
 	::_exit(errno);
       }
       break;
-    case UTRACE:
-      fprintf(stderr, "\n\n>>>>> in spawn(...utrace)\n\n");
-      break;
     case CHILD:
       break;
     case DAEMON:
@@ -188,13 +185,6 @@ frysk::sys::Fork::ptrace(jstring exe,
 }
 
 jint
-frysk::sys::Fork::utrace(jstring exe,
-			jstring in, jstring out, jstring err,
-			jstringArray args, jstringArray environ) {
-  return ::spawn(exe, in, out, err, args, environ, UTRACE);
-}
-
-jint
 frysk::sys::Fork::daemon (jstring exe, jstring in, jstring out, jstring err,
 			  jstringArray args, jstringArray environ) {
   return ::spawn(exe, in, out, err, args, environ, DAEMON);
diff --git a/frysk-sys/frysk/sys/cni/Fork.hxx b/frysk-sys/frysk/sys/cni/Fork.hxx
index a4b8438..2cc021b 100644
--- a/frysk-sys/frysk/sys/cni/Fork.hxx
+++ b/frysk-sys/frysk/sys/cni/Fork.hxx
@@ -41,7 +41,6 @@ enum tracing {
   CHILD,
   DAEMON,
   PTRACE,
-  UTRACE,
 };
 
 /**
diff --git a/frysk-sys/frysk/sys/jni/Fork.cxx b/frysk-sys/frysk/sys/jni/Fork.cxx
index 02d9799..bb1549b 100644
--- a/frysk-sys/frysk/sys/jni/Fork.cxx
+++ b/frysk-sys/frysk/sys/jni/Fork.cxx
@@ -115,9 +115,6 @@ spawn(jnixx::env env, tracing trace, redirect& redirection, exec& execute) {
 	::_exit(errno);
       }
       break;
-    case UTRACE:
-      fprintf(stderr, "\n\n>>>>> in spawn(...utrace)\n\n");
-      break;
     case CHILD:
       break;
     case DAEMON:
@@ -199,14 +196,6 @@ frysk::sys::Fork::ptrace(jnixx::env env, String exe,
 }
 
 jint
-frysk::sys::Fork::utrace(jnixx::env env, String exe,
-			 String in, String out, String err,
-			 jnixx::array<String> args,
-			 jnixx::array<String> environ) {
-  return ::spawn(env, exe, in, out, err, args, environ, UTRACE);
-}
-
-jint
 frysk::sys::Fork::daemon(jnixx::env env, String exe,
 			 String in, String out, String err,
 			 jnixx::array<String> args,
diff --git a/frysk-sys/frysk/sys/jni/Fork.hxx b/frysk-sys/frysk/sys/jni/Fork.hxx
index 2df12a4..6bf9dd1 100644
--- a/frysk-sys/frysk/sys/jni/Fork.hxx
+++ b/frysk-sys/frysk/sys/jni/Fork.hxx
@@ -41,7 +41,6 @@ enum tracing {
   CHILD,
   DAEMON,
   PTRACE,
-  UTRACE,
 };
 
 /**
diff --git a/frysk-sys/frysk/sys/ptrace/ChangeLog b/frysk-sys/frysk/sys/ptrace/ChangeLog
index 740dbac..0a363c5 100644
--- a/frysk-sys/frysk/sys/ptrace/ChangeLog
+++ b/frysk-sys/frysk/sys/ptrace/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-07  Andrew Cagney  <cagney@redhat.com>
+
+	* Utrace.java: Delete stub.
+	* jni/Utrace.java: Delete stub.
+	* cni/Utrace.java: Delete stub.
+	* TestUtrace.java: Delete stub.
+
 2008-07-04  Andrew Cagney  <cagney@redhat.com>
 
 	* jni/ByteSpace.cxx: Rename jni/AddressSpace.java.
diff --git a/frysk-sys/frysk/sys/ptrace/TestUtrace.java b/frysk-sys/frysk/sys/ptrace/TestUtrace.java
deleted file mode 100644
index e04c5be..0000000
--- a/frysk-sys/frysk/sys/ptrace/TestUtrace.java
+++ /dev/null
@@ -1,156 +0,0 @@
-// This file is part of the program FRYSK.
-//
-// Copyright 2005, 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
-// 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.sys.ptrace;
-
-import frysk.sys.ProcessIdentifier;
-import frysk.junit.TestCase;
-import frysk.testbed.TearDownProcess;
-import frysk.sys.Fork;
-//import frysk.sys.Itimer;
-//import frysk.sys.Execute;
-//import frysk.sys.Errno;
-//import frysk.sys.DaemonFactory;
-//import frysk.sys.Wait;
-//import frysk.sys.Signal;
-//import frysk.sys.UnhandledWaitBuilder;
-
-/**
- * Check the plumming of Ptrace.
- */
-
-public class TestUtrace extends TestCase {
-    /**
-     * Rip down everything related to PID.
-     */
-    public void tearDown() {
-	TearDownProcess.tearDown ();
-    }
- 
-    public void testChildContinue() {
-	final ProcessIdentifier pid
-	    = Fork.utrace(new String[] {
-			      "/bin/true"
-			  });
-	System.err.println("pid = " + pid);
-	/***************** kill for now
-	assertTrue("pid", pid.intValue() > 0);
-	TearDownProcess.add(pid);
-	
-	// The initial stop.
-	Wait.waitOnce(pid, new UnhandledWaitBuilder() {
-		private final ProcessIdentifier id = pid;
-		protected void unhandled(String why) {
-		    fail (why);
-		}
-		public void stopped(ProcessIdentifier pid, Signal signal) {
-		    assertSame("stopped pid", id, pid);
-		    assertSame("stopped sig", Signal.TRAP, signal);
-		}
-	    });
-
-	Utrace.singleStep(pid, Signal.NONE);
-	Wait.waitOnce(pid, new UnhandledWaitBuilder() {
-		private final ProcessIdentifier id = pid;
-		protected void unhandled(String why) {
-		    fail (why);
-		}
-		public void stopped(ProcessIdentifier pid, Signal signal) {
-		    assertSame("stopped pid", id, pid);
-		    assertSame("stopped sig", Signal.TRAP, signal);
-		}
-	    });
-
-	Utrace.cont(pid, Signal.TERM);
-	Wait.waitOnce(pid, new UnhandledWaitBuilder() {
-		private final ProcessIdentifier id = pid;
-		protected void unhandled(String why) {
-		    fail (why);
-		}
-		public void terminated(ProcessIdentifier pid, Signal signal,
-				       int status, boolean coreDumped) {
-		    assertSame("terminated pid", id, pid);
-		    assertSame("terminated signal", Signal.TERM, signal);
-		    assertEquals("terminated status", -Signal.TERM.intValue(),
-				 status);
-		}
-	    });
-	********************/
-    }
-	
-    /**
-     * Check attach (to oneself).
-     */
-    /**********************  kill it for now
-    public void testAttachDetach() {
-	final ProcessIdentifier pid = DaemonFactory.create(new Execute() {
-		public void execute() {
-		    Itimer.sleep (TestCase.getTimeoutSeconds());
-		}
-	    });
-	TearDownProcess.add(pid);
-	assertTrue ("pid", pid.intValue() > 0);
-
-	Utrace.attach(pid);
-	Wait.waitOnce(pid, new UnhandledWaitBuilder() {
-		private final ProcessIdentifier id = pid;
-		protected void unhandled(String why) {
-		    fail (why);
-		}
-		public void stopped(ProcessIdentifier pid, Signal signal) {
-		    assertSame("stopped pid", id, pid);
-		    assertSame("stopped sig", Signal.STOP, signal);
-		}
-	    });
-
-	Utrace.detach(pid, Signal.NONE);
-	Errno errno = null;
-	try {
-	    Wait.waitOnce(pid, new UnhandledWaitBuilder() {
-		    protected void unhandled(String why) {
-			fail (why);
-		    }
-		});
-	} catch (Errno e) {
-	    errno = e;
-	}
-	assertEquals("Errno", Errno.Echild.class, errno.getClass());
-    }
-    **********************************/
-}
diff --git a/frysk-sys/frysk/sys/ptrace/Utrace.java b/frysk-sys/frysk/sys/ptrace/Utrace.java
deleted file mode 100644
index 89efccf..0000000
--- a/frysk-sys/frysk/sys/ptrace/Utrace.java
+++ /dev/null
@@ -1,123 +0,0 @@
-// This file is part of the program FRYSK.
-// 
-// 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
-// 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.sys.ptrace;
-
-import frysk.rsl.Log;
-import frysk.sys.ProcessIdentifier;
-import frysk.sys.Signal;
-
-/**
- * Trace a process.
- */
-
-public class Utrace {
-    private static final Log fine = Log.fine(Utrace.class);
-
-    /**
-     * Attach to the process specified by PID.
-     */
-    public static void attach(ProcessIdentifier pid) {
-	fine.log("attach", pid);
-	attach(pid.intValue());
-    }
-    private static native void attach(int pid);
-
-    /**
-     * Detach from the process specified by PID.
-     */
-    public static void detach(ProcessIdentifier pid, Signal signal) {
-	fine.log("detach", pid, "signal", signal);
-	detach(pid.intValue(), signal.intValue());
-    }
-    private static native void detach(int pid, int sig);
-
-    /**
-     * Single-step (instruction step) the process specified by PID, if
-     * SIG is non-zero, deliver the signal.
-     */
-    public static void singleStep(ProcessIdentifier pid, Signal signal) {
-	fine.log("signleStep", pid, "signal", signal);
-	singleStep(pid.intValue(), signal.intValue());
-    }
-    private static native void singleStep(int pid, int sig);
-
-    /**
-     * Continue the process specified by PID, if SIG is non-zero,
-     * deliver the signal.
-     */
-    public static void cont(ProcessIdentifier pid, Signal signal) {
-	fine.log("cont", pid, "signal", signal);
-	cont(pid.intValue(), signal.intValue());
-    }
-    private static native void cont(int pid, int signal);
-
-    /**
-     * Continue the process specified by PID, stopping when there is a
-     * system-call; if SIG is non-zero deliver the signal.
-     */
-    public static void sysCall(ProcessIdentifier pid, Signal signal) {
-	fine.log("sysCall", pid, "signal", signal);
-	sysCall(pid.intValue(), signal.intValue());
-    }
-    private static native void sysCall(int pid, int sig);
-
-    /**
-     * Fetch the auxilary information associated with PID's last WAIT
-     * event.
-     */ 
-    public static long getEventMsg(ProcessIdentifier pid) {
-	fine.log("getEventMsg", pid, "...");
-	long ret = getEventMsg(pid.intValue());
-	fine.log("... getEventMsg", pid, "returns", ret);
-	return ret;
-    }
-    private static native long getEventMsg(int pid);
-
-    /**
-     * Set PID's trace options.  OPTIONS is formed by or'ing the
-     * values returned by the option* methods below.
-     */
-    public static void setOptions(ProcessIdentifier pid, long options) {
-	fine.log("setOptions", pid, "options", options);
-	setOptions(pid.intValue(), options);
-    }
-    private static native void setOptions (int pid, long options);
-
-}
diff --git a/frysk-sys/frysk/sys/ptrace/cni/Utrace.cxx b/frysk-sys/frysk/sys/ptrace/cni/Utrace.cxx
deleted file mode 100644
index cdc0ac7..0000000
--- a/frysk-sys/frysk/sys/ptrace/cni/Utrace.cxx
+++ /dev/null
@@ -1,91 +0,0 @@
-// This file is part of the program FRYSK.
-//
-// 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
-// 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.
-
-#include <errno.h>
-#include <stdio.h>
-#include <sys/ptrace.h>
-#include "linux.ptrace.h"
-
-#include <gcj/cni.h>
-
-#include "frysk/sys/cni/Errno.hxx"


hooks/post-receive
--
frysk system monitor/debugger


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-07-07 15:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-07-07 15:16 [SCM] master: Remove utrace stubs 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).