Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5EA4FC4332F for ; Tue, 7 Nov 2023 12:43:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BDCF38744B; Tue, 7 Nov 2023 13:43:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nYH3/1ap"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 07E8E87257; Tue, 7 Nov 2023 13:43:08 +0100 (CET) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AAD758726A for ; Tue, 7 Nov 2023 13:43:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=clamor95@gmail.com Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-544455a4b56so5333504a12.1 for ; Tue, 07 Nov 2023 04:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699360985; x=1699965785; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qA9duQ5yv7KypTqrV2i44L0Y4kJbTp5MzuWD5nKclPQ=; b=nYH3/1apAcI5K7/s129vaqiGHp1yStmBNtFlKIMgi9aF/uuh+5Tx9eRIjT2VYWW7Si Xm7R8eRX6RyGAlxj5r5KoFqbkx2CiCrl9SkJPPbWACM5QIqiWULVC7+en0Pu+COzW5r0 iFOF1tNh6Y91dXOnaRPC4qZ8afRrrUDXQvC2CIkGAZi5g5UV6CY3saZmwtVGRY3GrsvU 33T46SImkW1JtvJD7mxnUjlHE+f6hrzyINAkdHAMYCDHyOvV/5zjC1az6qFNVnN5FoT1 yKTRwLcsM5CznaiqtP6zpDLhQxUvG8j76A7QjCQ5N43wX9n741fgaQlNd14uNINTixMc i9dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699360985; x=1699965785; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qA9duQ5yv7KypTqrV2i44L0Y4kJbTp5MzuWD5nKclPQ=; b=Gu7wJXtG6rxThqZ81bcYb5rbIpv8/U8bFedxTj+rdVPz9uwZ0rGjtYUhbyURt4/5w/ q8rbIlseK5fxO/EctilE6Wv4lq2iyAfocqdCBCpX/0Tep6lKQt/fD3/n2NjfIGLRcH4a CZoIAln6V13n2AneIu3KRzozmLbkN5o1AGEj0w8qV0ZzKHvzMIonh1b0s+oKTS0YOK5W 9tUyVdsHqj/19N65w1u9MMPa89+Y6MwC2WrKZ5nEHNsT66jST3168gV8wTk5zB0gG29p TriXR/xsqZHM8YhBqgFlosDaBL6/hgFeJMjwf1R7GdEnTqC+MsX4BJKn5ewNTmperEV5 hNoA== X-Gm-Message-State: AOJu0YzHKLjCww/gIavlo8D6yipiLWZ9QbICflNllpUT57QS0PjPo4OK rIrRV2i62uKDMMath+rWRoJJGzq9Adc= X-Google-Smtp-Source: AGHT+IGzEoA032ssPCAVMN0/uxjrGyBI+deZiUVox6dME7ReQ6rkFJyZPPTgmzCYieqm7P+Lyx7SiQ== X-Received: by 2002:a50:aa96:0:b0:543:7115:eb15 with SMTP id q22-20020a50aa96000000b005437115eb15mr17214234edc.20.1699360985209; Tue, 07 Nov 2023 04:43:05 -0800 (PST) Received: from xeon.. ([188.163.112.64]) by smtp.gmail.com with ESMTPSA id u16-20020a509510000000b0053e89721d4esm5481831eda.68.2023.11.07.04.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 04:43:04 -0800 (PST) From: Svyatoslav Ryhel To: Simon Glass , Lukasz Majewski , Marek Vasut , Joe Hershberger , Ramon Fried , Bin Meng , Ion Agorria , Svyatoslav Ryhel , Heinrich Schuchardt , Harald Seiler , Sean Anderson , Heiko Schocher , Dmitrii Merkurev , Mattijs Korpershoek , Patrick Delaunay , Matthias Schiffer Cc: u-boot@lists.denx.de Subject: [PATCH v1 3/5] commonn: console: introduce overflow and isempty calls Date: Tue, 7 Nov 2023 14:42:39 +0200 Message-Id: <20231107124241.35432-4-clamor95@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231107124241.35432-1-clamor95@gmail.com> References: <20231107124241.35432-1-clamor95@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Ion Agorria Separate record overflow logic and add console_record_isempty as available calls don't serve to know output has been read fully with readline's. Signed-off-by: Ion Agorria Signed-off-by: Svyatoslav Ryhel --- common/console.c | 15 ++++++++++++--- include/console.h | 14 ++++++++++++++ test/ut.c | 9 ++++----- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/common/console.c b/common/console.c index 98c3ee6ca6..8a869b137e 100644 --- a/common/console.c +++ b/common/console.c @@ -818,6 +818,8 @@ int console_record_init(void) ret = membuff_new((struct membuff *)&gd->console_in, CONFIG_CONSOLE_RECORD_IN_SIZE); + gd->flags |= GD_FLG_RECORD; + return ret; } @@ -836,11 +838,13 @@ int console_record_reset_enable(void) return 0; } -int console_record_readline(char *str, int maxlen) +bool console_record_overflow(void) { - if (gd->flags & GD_FLG_RECORD_OVF) - return -ENOSPC; + return gd->flags & GD_FLG_RECORD_OVF ? true : false; +} +int console_record_readline(char *str, int maxlen) +{ return membuff_readline((struct membuff *)&gd->console_out, str, maxlen, '\0'); } @@ -850,6 +854,11 @@ int console_record_avail(void) return membuff_avail((struct membuff *)&gd->console_out); } +bool console_record_isempty(void) +{ + return membuff_isempty((struct membuff *)&gd->console_out); +} + int console_in_puts(const char *str) { return membuff_put((struct membuff *)&gd->console_in, str, strlen(str)); diff --git a/include/console.h b/include/console.h index ceb733b5cb..c053bc9ba8 100644 --- a/include/console.h +++ b/include/console.h @@ -64,6 +64,13 @@ void console_record_reset(void); */ int console_record_reset_enable(void); +/** + * console_record_overflow() - returns state of buffers overflow + * + * Return: true if the console buffer was overflowed + */ +bool console_record_overflow(void); + /** * console_record_readline() - Read a line from the console output * @@ -84,6 +91,13 @@ int console_record_readline(char *str, int maxlen); */ int console_record_avail(void); +/** + * console_record_isempty() - Returns if console output is empty + * + * Return: true if empty + */ +bool console_record_isempty(void); + /** * console_in_puts() - Write a string to the console input buffer * diff --git a/test/ut.c b/test/ut.c index 28da417686..d202644a15 100644 --- a/test/ut.c +++ b/test/ut.c @@ -53,15 +53,14 @@ long ut_check_delta(ulong last) static int readline_check(struct unit_test_state *uts) { - int ret; - - ret = console_record_readline(uts->actual_str, sizeof(uts->actual_str)); - if (ret == -ENOSPC) { + if (console_record_overflow()) { ut_fail(uts, __FILE__, __LINE__, __func__, "Console record buffer too small - increase CONFIG_CONSOLE_RECORD_OUT_SIZE"); - return ret; + return -ENOSPC; } + console_record_readline(uts->actual_str, sizeof(uts->actual_str)); + return 0; } -- 2.40.1