From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13120 invoked by alias); 29 Jan 2008 22:23:46 -0000 Received: (qmail 13093 invoked by uid 9519); 29 Jan 2008 22:23:45 -0000 Date: Tue, 29 Jan 2008 22:23:00 -0000 Message-ID: <20080129222345.13078.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Kill each proc only once(bz #5691). X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f86b535baf401af5fb2ff146202109be5a964282 X-Git-Newrev: a64ca5fc6fca9c433c1ffe95bc3a7002b2b93a93 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00141.txt.bz2 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 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 + + * StartRun.java: Kill each proc only once(bz #5691). + 2008-01-25 Rick Moseley * 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