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 1E2B0C61D85 for ; Tue, 21 Nov 2023 18:36:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A71AB87611; Tue, 21 Nov 2023 19:35:45 +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="WBIEP8TF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DA44F87253; Tue, 21 Nov 2023 19:35:40 +0100 (CET) Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) (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 77452869F6 for ; Tue, 21 Nov 2023 19:35:37 +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-lf1-x12a.google.com with SMTP id 2adb3069b0e04-507b9408c61so8104882e87.0 for ; Tue, 21 Nov 2023 10:35:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700591737; x=1701196537; 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=4rMAWzmusYUDsZk7ci6JrKCxjHNZYVX0mwEluINib7U=; b=WBIEP8TFTpNrQ1+bQMPOJOx4t5UYrCsCA8V/yfbM3x6PALi/Ugsp2RDECJAGJlmeTV LHRsgJLFlXDD51j6/iKYC0PkFZSN6jCms5nvEw/7JFRh7ny5jaRlRId3F1qXweDEqZ/T Gs9HTBQMg1j/MnrbJZ010+ppR64/jifutwvcS5suppXcvrGqf8AHA2f2bt3fALGpBH5v t96PFTut7t9Vkvudg3egYPpdDXz8F9hl3BV97e2vKZWoR8wJmlA9KUsnHkmmf2q1CFAl qxtwqtpe3gL0VG9ni4LqYIFontawcUGNHrFO0/LuAERAmq+F/qWa7Lw2KK7x01XnhQ7Y 6I+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700591737; x=1701196537; 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=4rMAWzmusYUDsZk7ci6JrKCxjHNZYVX0mwEluINib7U=; b=gEof2ONqABsF/6/qHaj93yaDR7jhzb5oWp0EtzxqiXk8yFdjpS8vrxsiSoIJqlP/CY wAl/YLBm4528st/fECtBXliaROK8pY2t8023CbhOLPyzTpvus/wkAKhtxqYRVegaMrV2 fRavlc4euwZ9zfEELxcF4RwJhQdT3Qi/svOleffTcieJc1mHq7yMVVLRG+l9zyttgkyW 2NIo1smzaPCgdMCN9xY5LMgDev/JC/BZK93yhLaLMNXBIj4Y8GeOeM007klWsphOZKha hGWhNOdjIqCdL6hV+tSaegBeLHbJr+u2oJTnDPaPtOfgrovnVNm54MaP/dAWkb0WIwVS 477A== X-Gm-Message-State: AOJu0YwMn24qVD4ZCT87rrnsxGEXojYNMEIN9Df4/TgSCTf17Jlj9112 BDYHXymhpB9oU8bVrrTVJgg= X-Google-Smtp-Source: AGHT+IGEhdGkLFf+EGd7eaQ0dAuBIaXRNBHJWc1yioWwNgAM69m9sNPZFljytVGs66dFlnbv7CL69A== X-Received: by 2002:a05:6512:2349:b0:505:79f2:5c6c with SMTP id p9-20020a056512234900b0050579f25c6cmr84239lfu.6.1700591736596; Tue, 21 Nov 2023 10:35:36 -0800 (PST) Received: from xeon.. ([188.163.112.64]) by smtp.gmail.com with ESMTPSA id a22-20020ac25e76000000b0050089b26ea1sm1592862lfr.276.2023.11.21.10.35.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 10:35:36 -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 v3 3/5] common: console: introduce overflow and isempty calls Date: Tue, 21 Nov 2023 20:35:08 +0200 Message-Id: <20231121183510.6451-4-clamor95@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231121183510.6451-1-clamor95@gmail.com> References: <20231121183510.6451-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 Reviewed-by: Mattijs Korpershoek --- common/console.c | 15 ++++++++++++--- include/console.h | 26 ++++++++++++++++++++++++++ test/ut.c | 9 ++++----- 3 files changed, 42 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..d949d29c13 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 * @@ -113,6 +127,12 @@ static inline int console_record_reset_enable(void) return -ENOSYS; } +static inline bool console_record_overflow(void) +{ + /* No overflow */ + return false; +} + static inline int console_record_readline(char *str, int maxlen) { /* Nothing to read */ @@ -131,6 +151,12 @@ static inline int console_in_puts(const char *str) return 0; } +static inline bool console_record_isempty(void) +{ + /* Always empty */ + return true; +} + #endif /* !CONFIG_CONSOLE_RECORD */ /** 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