From nobody Sun Oct 5 19:25:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613078427; cv=none; d=zohomail.com; s=zohoarc; b=mVlYBnHe5i/XYcn1cEFuFd8//6FLbxJsv3r8BnyicHIzcY/pZnX2jLhyWuVSE6QBhLhH/s4LJW6moWDWyr1zNMjzsob8eBoMYqu0rXopETyz5mOWnUfTJrkRFxyCojHV4ceYSmsCEcWba6N80K5MdhlT4AJMzke/2S72Y8y3NHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613078427; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wr1IAzfe30rhb7m/BSh9G7kt+HzJhVBA0gnMMwAHsDo=; b=QWswYxscYbrMWZsvtqgIzT81v7ThjHLc0IKTqzyTk+UfUq1iqr1e8YvrnbMOe+mkmBinP2u+ZkzunDOSUBSTaU4+TK+C+OFhdPCrOHYI5JsNbZFYZa1T08au78xuucPDP5VGrE2zY9KLUZXHl6Dxrv2bo5UTwqmCeDykjKnbhjk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613078426803684.122511367745; Thu, 11 Feb 2021 13:20:26 -0800 (PST) Received: from localhost ([::1]:53320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAIvh-0002x9-OF for importer@patchew.org; Thu, 11 Feb 2021 15:51:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAIpX-0005sh-Df for qemu-devel@nongnu.org; Thu, 11 Feb 2021 15:44:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lAIpR-0007Os-JG for qemu-devel@nongnu.org; Thu, 11 Feb 2021 15:44:51 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-27-tIm2zacaPG6B-bUcHrvDQw-1; Thu, 11 Feb 2021 15:44:43 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D90DB100CCC2; Thu, 11 Feb 2021 20:44:41 +0000 (UTC) Received: from blue.redhat.com (ovpn-114-150.phx2.redhat.com [10.3.114.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31BC510013D7; Thu, 11 Feb 2021 20:44:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613076285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wr1IAzfe30rhb7m/BSh9G7kt+HzJhVBA0gnMMwAHsDo=; b=KKdKdjocXjQ1XGqB8RqmMpNumJSsIXsLBmL4zafhusN3MT1VS5xRA1jp1ZMuDSIrOb/Rm7 +4ZmCkClkGa2EV20kN9wx+qGBwvRMm6OtyyPuC4KRQ4ki6CTmcesWkgHEw/waTHgP2grr3 EezTCjKt326AJCTs5Ka30KOfVrzP7Qc= X-MC-Unique: tIm2zacaPG6B-bUcHrvDQw-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] utils: Enhance testsuite for do_strtosz() Date: Thu, 11 Feb 2021 14:44:35 -0600 Message-Id: <20210211204438.1184395-2-eblake@redhat.com> In-Reply-To: <20210211204438.1184395-1-eblake@redhat.com> References: <20210211204438.1184395-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, berrange@redhat.com, qemu-block@nongnu.org, tao3.xu@intel.com, rjones@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Enhance our testsuite coverage of do_strtosz() to cover some things we know that existing users want to continue working (hex bytes), as well as some things that accidentally work but shouldn't (hex fractions) or accidentally fail but that users want to work (64-bit precision on byte values). This includes fixing a typo in the comment regarding our parsing near 2^64. Signed-off-by: Eric Blake Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/test-cutils.c | 154 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 11 deletions(-) diff --git a/tests/test-cutils.c b/tests/test-cutils.c index 1aa8351520ae..6d9802e00b1b 100644 --- a/tests/test-cutils.c +++ b/tests/test-cutils.c @@ -1960,11 +1960,19 @@ static void test_qemu_strtosz_simple(void) g_assert_cmpint(res, =3D=3D, 0); g_assert(endptr =3D=3D str + 1); - str =3D "12345"; + /* Leading 0 gives decimal results, not octal */ + str =3D "08"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 8); + g_assert(endptr =3D=3D str + 2); + + /* Leading space is ignored */ + str =3D " 12345"; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 12345); - g_assert(endptr =3D=3D str + 5); + g_assert(endptr =3D=3D str + 6); err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, 0); @@ -1984,7 +1992,7 @@ static void test_qemu_strtosz_simple(void) g_assert_cmpint(res, =3D=3D, 0x20000000000000); g_assert(endptr =3D=3D str + 16); - str =3D "9007199254740993"; /* 2^53+1 */ + str =3D "9007199254740993"; /* 2^53+1 FIXME loss of precision is a bug= */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0x20000000000000); /* rounded to 53 bits = */ @@ -1996,14 +2004,42 @@ static void test_qemu_strtosz_simple(void) g_assert_cmpint(res, =3D=3D, 0xfffffffffffff800); g_assert(endptr =3D=3D str + 20); - str =3D "18446744073709550591"; /* 0xfffffffffffffbff */ + str =3D "18446744073709550591"; /* 0xfffffffffffffbff FIXME */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 0xfffffffffffff800); /* rounded to 53 bit= s */ g_assert(endptr =3D=3D str + 20); - /* 0x7ffffffffffffe00..0x7fffffffffffffff get rounded to - * 0x8000000000000000, thus -ERANGE; see test_qemu_strtosz_erange() */ + /* + * FIXME 0xfffffffffffffe00..0xffffffffffffffff get rounded to + * 2^64, thus -ERANGE; see test_qemu_strtosz_erange() + */ +} + +static void test_qemu_strtosz_hex(void) +{ + const char *str; + const char *endptr; + int err; + uint64_t res =3D 0xbaadf00d; + + str =3D "0x0"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 3); + + str =3D "0xab"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 171); + g_assert(endptr =3D=3D str + 4); + + str =3D "0xae"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 174); + g_assert(endptr =3D=3D str + 4); } static void test_qemu_strtosz_units(void) @@ -2064,14 +2100,36 @@ static void test_qemu_strtosz_units(void) static void test_qemu_strtosz_float(void) { - const char *str =3D "12.345M"; + const char *str; int err; const char *endptr; uint64_t res =3D 0xbaadf00d; + str =3D "0.5E"; err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); - g_assert_cmpint(res, =3D=3D, 12.345 * MiB); + g_assert_cmpint(res, =3D=3D, EiB / 2); + g_assert(endptr =3D=3D str + 4); + + /* For convenience, a fraction of 0 is tolerated even on bytes */ + str =3D "1.0B"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 1); + g_assert(endptr =3D=3D str + 4); + + /* An empty fraction is tolerated */ + str =3D "1.k"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 1024); + g_assert(endptr =3D=3D str + 3); + + /* For convenience, we permit values that are not byte-exact */ + str =3D "12.345M"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, (uint64_t) (12.345 * MiB)); g_assert(endptr =3D=3D str + 7); } @@ -2106,6 +2164,47 @@ static void test_qemu_strtosz_invalid(void) err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); g_assert(endptr =3D=3D str); + + /* Fractional values require scale larger than bytes */ + /* FIXME endptr shouldn't move on -EINVAL */ + str =3D "1.1B"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert(endptr =3D=3D str + 4); + + /* FIXME endptr shouldn't move on -EINVAL */ + str =3D "1.1"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, -EINVAL); + g_assert(endptr =3D=3D str + 3); + + /* FIXME we should reject floating point exponents */ + str =3D "1.5e1k"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 15360); + g_assert(endptr =3D=3D str + 6); + + /* FIXME we should reject floating point exponents */ + str =3D "1.5E+0k"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 1536); + g_assert(endptr =3D=3D str + 7); + + /* FIXME we should reject hex fractions */ + str =3D "0x1.8k"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 1536); + g_assert(endptr =3D=3D str + 6); + + /* FIXME we reject all other attempts at negative, why not -0 */ + str =3D "-0"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 2); } static void test_qemu_strtosz_trailing(void) @@ -2131,6 +2230,30 @@ static void test_qemu_strtosz_trailing(void) err =3D qemu_strtosz(str, NULL, &res); g_assert_cmpint(err, =3D=3D, -EINVAL); + + str =3D "0x"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(res, =3D=3D, 0); + g_assert(endptr =3D=3D str + 1); + + err =3D qemu_strtosz(str, NULL, &res); + g_assert_cmpint(err, =3D=3D, -EINVAL); + + str =3D "0.NaN"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert(endptr =3D=3D str + 2); + + err =3D qemu_strtosz(str, NULL, &res); + g_assert_cmpint(err, =3D=3D, -EINVAL); + + str =3D "123-45"; + err =3D qemu_strtosz(str, &endptr, &res); + g_assert_cmpint(res, =3D=3D, 123); + g_assert(endptr =3D=3D str + 3); + + err =3D qemu_strtosz(str, NULL, &res); + g_assert_cmpint(err, =3D=3D, -EINVAL); } static void test_qemu_strtosz_erange(void) @@ -2145,12 +2268,12 @@ static void test_qemu_strtosz_erange(void) g_assert_cmpint(err, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 2); - str =3D "18446744073709550592"; /* 0xfffffffffffffc00 */ + str =3D "18446744073709550592"; /* 0xfffffffffffffc00 FIXME accept thi= s */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 20); - str =3D "18446744073709551615"; /* 2^64-1 */ + str =3D "18446744073709551615"; /* 2^64-1 FIXME accept this */ err =3D qemu_strtosz(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, -ERANGE); g_assert(endptr =3D=3D str + 20); @@ -2168,15 +2291,22 @@ static void test_qemu_strtosz_erange(void) static void test_qemu_strtosz_metric(void) { - const char *str =3D "12345k"; + const char *str; int err; const char *endptr; uint64_t res =3D 0xbaadf00d; + str =3D "12345k"; err =3D qemu_strtosz_metric(str, &endptr, &res); g_assert_cmpint(err, =3D=3D, 0); g_assert_cmpint(res, =3D=3D, 12345000); g_assert(endptr =3D=3D str + 6); + + str =3D "12.345M"; + err =3D qemu_strtosz_metric(str, &endptr, &res); + g_assert_cmpint(err, =3D=3D, 0); + g_assert_cmpint(res, =3D=3D, 12345000); + g_assert(endptr =3D=3D str + 7); } int main(int argc, char **argv) @@ -2443,6 +2573,8 @@ int main(int argc, char **argv) g_test_add_func("/cutils/strtosz/simple", test_qemu_strtosz_simple); + g_test_add_func("/cutils/strtosz/hex", + test_qemu_strtosz_hex); g_test_add_func("/cutils/strtosz/units", test_qemu_strtosz_units); g_test_add_func("/cutils/strtosz/float", --=20 2.30.1