From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25364 invoked by alias); 14 Mar 2008 11:42:14 -0000 Received: (qmail 25349 invoked by uid 22791); 14 Mar 2008 11:42:14 -0000 X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_34,J_CHICKENPOX_44 X-Spam-Check-By: sourceware.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (83.160.170.119) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 14 Mar 2008 11:41:50 +0000 Received: from dijkstra.wildebeest.org ([192.168.1.29]) by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1Ja8IF-0003Lv-0D; Fri, 14 Mar 2008 12:41:47 +0100 Subject: Re: [SCM] master: Fix minor logging errors. From: Mark Wielaard To: frysk@sourceware.org Cc: rmoseley@sourceware.org In-Reply-To: <20080313154756.26703.qmail@sourceware.org> References: <20080313154756.26703.qmail@sourceware.org> Content-Type: multipart/mixed; boundary="=-BF9EmEka5nnXQymZ+zH+" Date: Fri, 14 Mar 2008 11:42:00 -0000 Message-Id: <1205494906.27548.39.camel@dijkstra.wildebeest.org> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-3.fc8) X-Spam-Score: -4.4 (----) X-Virus-Checked: Checked by ClamAV on sourceware.org X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00151.txt.bz2 --=-BF9EmEka5nnXQymZ+zH+ Content-Type: text/plain Content-Transfer-Encoding: 7bit Content-length: 1138 Hi Rick, On Thu, 2008-03-13 at 15:47 +0000, rmoseley@sourceware.org wrote: > commit f7bc2b759574fce3842b3b60fe473a9bb8b10431 > Author: Rick Moseley > Date: Thu Mar 13 10:47:17 2008 -0500 > > Fix minor logging errors. > > * CLI.java: Synchronize message adding when type specified. > * LoadCommand.java: Use message logger instead of direct print. Nice cleanup of message handling, but... As mentioned in bugzilla #5938 it causes one testsuite failure in frysk.bindir.TestFhpd. The fix was pretty easy though, just make sure that all messages logged by any of the startup Commands are published to the user before showing the first prompt: frysk-core/frysk/bindir/ChangeLog 2008-03-14 Mark Wielaard * fhpd.java (CommandLine.run): Make sure all messages are flushed before first prompt. frysk-core/frysk/hpd/ChangeLog 2008-03-14 Mark Wielaard * CLI.java (flushMessages): Make public and document for usage in fhpd. Committed and pushed. All frysk.bindir.TestFhpd test PASS again and no regressions. Cheers, Mark --=-BF9EmEka5nnXQymZ+zH+ Content-Disposition: inline; filename=cli-flush.patch Content-Type: text/x-patch; name=cli-flush.patch; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-length: 1162 diff --git a/frysk-core/frysk/bindir/fhpd.java b/frysk-core/frysk/bindir/fhpd.java index af1a5bc..aa8dca7 100644 --- a/frysk-core/frysk/bindir/fhpd.java +++ b/frysk-core/frysk/bindir/fhpd.java @@ -139,6 +139,10 @@ public class fhpd { LoadCommand.load(command, cli); } + // Make sure any messages logged by the Attach or Load commands + // are displayed to the user before the first prompt. + cli.flushMessages(); + try { do { line = reader.readLine(cli.getPrompt()); diff --git a/frysk-core/frysk/hpd/CLI.java b/frysk-core/frysk/hpd/CLI.java index a95bcdf..1d47869 100644 --- a/frysk-core/frysk/hpd/CLI.java +++ b/frysk-core/frysk/hpd/CLI.java @@ -337,7 +337,10 @@ public class CLI { } } - private void flushMessages() { + // Makes sure that all messages for the user by commands through + // addMessage() are displayed. Normally called after an update event + // or when a command has been executed before displaying a prompt. + public void flushMessages() { synchronized (messages) { for (Iterator iter = messages.iterator(); iter.hasNext();) { Message tempmsg = (Message) iter.next(); --=-BF9EmEka5nnXQymZ+zH+--