[SCM] master: Kill each proc only once(bz #5691).

[rmoseley@sourceware.org]

The branch, master has been updated
       via  a64ca5fc6fca9c433c1ffe95bc3a7002b2b93a93 (commit)
      from  f86b535baf401af5fb2ff146202109be5a964282 (commit)

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

- Log -----------------------------------------------------------------
commit a64ca5fc6fca9c433c1ffe95bc3a7002b2b93a93
Author: Rick Moseley <rmoseley@dhcp-215.hsv.redhat.com>
Date:   Tue Jan 29 16:23:34 2008 -0600

    Kill each proc only once(bz #5691).
    
    * StartRun.java: Kill each proc only once(bz #5691).

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

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

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 6fd6fab..7f9ec5c 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-29  Rick Moseley  <rmoseley@redhat.com>
+
+	* StartRun.java: Kill each proc only once(bz #5691).
+
 2008-01-25  Rick Moseley  <rmoseley@redhat.com>
 
 	* TestHpdTestHarness.java: Fix pattern matches.
diff --git a/frysk-core/frysk/hpd/StartRun.java b/frysk-core/frysk/hpd/StartRun.java
index e25f9e3..e9a6beb 100644
--- a/frysk-core/frysk/hpd/StartRun.java
+++ b/frysk-core/frysk/hpd/StartRun.java
@@ -145,13 +145,17 @@ class StartRun extends ParameterizedCommand {
 	if (foo.hasNext()) {
 	    if (cli.coreProcs.isEmpty() && cli.loadedProcs.isEmpty()) {
 		// Clear the parameters for this process
+		int oldPid = -1;
 		while (foo.hasNext()) {
 		    Task task = (Task) foo.next();
+		    if (task.getProc().getPid() == oldPid)
+		        continue;
 		    String paramList = getParameters(cmd, task);
 		    cli.execCommand("kill\n");
 		    cli.execCommand("start " + paramList + "\n");
 		    if (runToBreak)
 			cli.execCommand("go\n");
+		    oldPid = task.getProc().getPid();
 		}
 		return;
 	    }
@@ -277,4 +281,4 @@ class StartRun extends ParameterizedCommand {
 	return CompletionFactory.completeFileName(cli, input, cursor,
 		completions);
     }
-}
\ No newline at end of file
+}


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