[SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk

[rmoseley@sourceware.org]

The branch, master has been updated
       via  f9eb110e2b34a5a881aec96c6b886fe571cb29d0 (commit)
       via  21463c80295c6960786f6415c29820bcd0a4790b (commit)
      from  6a3ed1921c83fce6bac4eadda31dfa9c014f2952 (commit)

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

- Log -----------------------------------------------------------------
commit f9eb110e2b34a5a881aec96c6b886fe571cb29d0
Merge: 21463c80295c6960786f6415c29820bcd0a4790b 6a3ed1921c83fce6bac4eadda31dfa9c014f2952
Author: Rick Moseley <rmoseley@dhcp-215.hsv.redhat.com>
Date:   Thu Jan 24 13:22:43 2008 -0600

    Merge branch 'master' of ssh://sources.redhat.com/git/frysk

commit 21463c80295c6960786f6415c29820bcd0a4790b
Author: Rick Moseley <rmoseley@dhcp-215.hsv.redhat.com>
Date:   Thu Jan 24 13:21:29 2008 -0600

    Print command line for start/run.
    
    * StartRun.java: Print command line for start/run.

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

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog     |    4 ++++
 frysk-core/frysk/hpd/StartRun.java |   16 ++--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 8d67eb9..5344c42 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-24  Rick Moseley  <rmoseley@redhat.com>
+
+	* StartRun.java: Print command line for start/run.
+
 2008-01-24  Andrew Cagney  <cagney@redhat.com>
 
 	* RegsCommand.java: Update; Register moved to frysk.isa.registers.
diff --git a/frysk-core/frysk/hpd/StartRun.java b/frysk-core/frysk/hpd/StartRun.java
index 1d803d8..e25f9e3 100644
--- a/frysk-core/frysk/hpd/StartRun.java
+++ b/frysk-core/frysk/hpd/StartRun.java
@@ -143,23 +143,15 @@ class StartRun extends ParameterizedCommand {
 	// if there are not any procs loaded with the load/core commands
 	Iterator foo = cli.targetset.getTasks();
 	if (foo.hasNext()) {
-	    //System.out.println("StartRun.interpretCmd: foo.hasNext()");
 	    if (cli.coreProcs.isEmpty() && cli.loadedProcs.isEmpty()) {
-		//System.out.println("StartRun.interpretCmd: coreProcs.isEmpty && loadedProcs.isEmpty");
 		// Clear the parameters for this process
 		while (foo.hasNext()) {
-		    //System.out.println("StartRun.interpretCmd: inside while");
 		    Task task = (Task) foo.next();
 		    String paramList = getParameters(cmd, task);
-		    //System.out.println("StartRun.interpretCmd: fixing to kill");
 		    cli.execCommand("kill\n");
-		    //cli.execCommand("focus\n");
-		    //System.out.println("StartRun.interpretCmd: fixing to start");
 		    cli.execCommand("start " + paramList + "\n");
-		    //cli.execCommand("focus\n");
 		    if (runToBreak)
 			cli.execCommand("go\n");
-		    //cli.execCommand("focus\n");
 		}
 		return;
 	    }
@@ -175,7 +167,6 @@ class StartRun extends ParameterizedCommand {
 
 	/* This is the case where there are loaded procs */
 	if (!cli.loadedProcs.isEmpty()) {
-	    //System.out.println("StartRun.interpretCmd: if !cli.loadedProcs.isEmpty");
 	    Set procSet = cli.loadedProcs.entrySet();
 	    runProcs(cli, procSet, cmd);
 	    synchronized (cli) {
@@ -194,7 +185,6 @@ class StartRun extends ParameterizedCommand {
     }
 
     private void run(CLI cli, Input cmd) {
-	//System.out.println("StartRun.run: beginning of run");
 	Runner runner = new Runner(cli);
 	Manager.host.requestCreateAttachedProc(cmd.stringArrayValue(), runner);
 	while (true) {
@@ -219,7 +209,6 @@ class StartRun extends ParameterizedCommand {
 	int ctr = 0;
 	while (foo.hasNext()) {
 	    ctr++;
-	    //System.out.println("StartRun.runProcs: ctr = " + ctr);
 	    Map.Entry me = (Map.Entry) foo.next();
 	    Proc proc = (Proc) me.getKey();
 	    Integer taskid = (Integer) me.getValue();
@@ -228,11 +217,11 @@ class StartRun extends ParameterizedCommand {
 	    synchronized (cli) {
 		cli.taskID = taskid.intValue();
 	    }
-	    //System.out.println("StartRun.runProcs: proc.getExe = " + proc.getExe());
 	    Input newcmd = new Input(proc.getExe() + " " +
 		    getParameters(cmd, proc.getMainTask()));
+	    cli.addMessage("starting/running with this command: " + 
+		    newcmd, Message.TYPE_NORMAL);
 	    run(cli, newcmd);
-	    //System.out.println("StartRun.runProcs: runToBreak = " + runToBreak);
 	    if (runToBreak)
 		cli.execCommand("go\n");
 	    synchronized (cli) {
@@ -281,7 +270,6 @@ class StartRun extends ParameterizedCommand {
 	String paramList = "";
 	for (int j = i; j < parameters.length; j++) 
 	    paramList = paramList + parameters[j] + " ";
-	    System.out.println("StartRun.parseParameters");
 	    return paramList;
     }
     


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