Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp1508508ybi; Wed, 3 Jul 2019 17:38:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwoER6JHQdQ40lLG+nVN22z9P1UpxSdQN7rkiH6QxVJoHGxsCxiJJbvAZUsKCAPMY0wUr8v X-Received: by 2002:a65:4044:: with SMTP id h4mr5718956pgp.164.1562200701655; Wed, 03 Jul 2019 17:38:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562200701; cv=none; d=google.com; s=arc-20160816; b=FS/bJE5bpAZiDrN2ut9BSzXvuiXOiXyW+PErR5/3N6h+rSQmne10mWrk3wOxiWdCxG Aw1F4UXxYQJrvOdbEXkFSVSYESW3USeQRFRleZVZBJn7iqF1CxhBkLHtW8HSPHrl/yeV KIBBD+RPPyKiou3Dhvg5EUv15FHhql9C6VlbloyNLy/Gvm+EEYrarQWzwz48Mwd3co/p Bwg+453GYFUTM2aXudkYZq9PGd+PoZJft/01qLLYnf8SYAiJ0T99QMFaSPY0K0Djfql4 HIyXb/rLyMiBKczPpfs+qb9m9t8x8aUuhWgF6jhEL+JdFSTuj5PBi+CS3YBqlwX9Y8B+ Y7gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=ef4x4rIYEjXAUsOwLGAl/ehMOJtbGdS1NNHHbtE3RYE=; b=AKID7B+p17PifbkWcLK+7T1xyMlH0gwRF2C4RcFzTFduE7m3b4fAwtbN42AZk6TPoe 7gJjkhi1egNKvd85WsZOGNJzhrLKCMPB/7RXsCSOEGyZTwgSDjO1mSfjm2kxn/axPp6v 3XXB11caraW2rjumU4o/Q+KACAH9cE0bauuxkFyhS9Gn0ygZXIwRCacNvvvculjiF+Xf ZKA6lzXooNOzLEcw9AnjXCfjpTejLoKFVcitYITh90TpK7ffLNIoCfgodrTjEj2lvfcU sJa4jZYlfQEkDeShbzGHcD83UclGOg8WfJl031tdpvw73SA2+YmPeswnoT30uEZ3cz0N orWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=vekD44Sr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h21si3771603pgv.266.2019.07.03.17.38.06; Wed, 03 Jul 2019 17:38:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=vekD44Sr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727448AbfGDAhf (ORCPT + 99 others); Wed, 3 Jul 2019 20:37:35 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:43395 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727586AbfGDAhd (ORCPT ); Wed, 3 Jul 2019 20:37:33 -0400 Received: by mail-pf1-f202.google.com with SMTP id 6so2510355pfz.10 for ; Wed, 03 Jul 2019 17:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ef4x4rIYEjXAUsOwLGAl/ehMOJtbGdS1NNHHbtE3RYE=; b=vekD44Sr2DV7bF8T9dsY8uFialJk5O+Tj5XVv9/VPa8GHaBp+3/I3TfVCXmsNE0dhM fFgwpUgiaXH3wFJP3UxEqcozWxtwADx6DlZsj+DejvV9GHY/KSVjfyGVpG/32sZczV7Z Hy7VbS1TDjIrhpTTb6o7rZ7zBixvJmYYz5V2/8blLYnf6fp1XaTjaO+v4Sx1fPvgvsLQ 8j+LB42socQnbNpaGFOSrbNGhCVllMsMRhsoBuEZJq1uhDKOiDuQS3BH5sfVxwoMpbE5 QjA232auzNXznJsS//aqHi9v1t/MeeNLUKtX5Xx1mDgv66ufdu+kFdkkUwyM+6K1pzHU zS7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ef4x4rIYEjXAUsOwLGAl/ehMOJtbGdS1NNHHbtE3RYE=; b=keP+CmTxaGxdkC/9FeTJKyM3ZW2g7NNwzwEdrewWnoaz9as5meqUGChrVmDsiRRKy6 DGtbZBzulaStyWOFiCrcWTg3X+LHs5F7gstc04oXddZCkPHhcpACfeA+Y+cOSMJVnc/D P286M1rRpL0ZpUGkZ2YVOl8U6CH86EqLK/yL/Aq+4NEC/gy8XjCEQnyRFscJNHP4AW1O d1IKxvelwakV9Kb+i2pzFyVbFTkfxBXIpQJxPbA2uUdar3PzaUA/FqAQ5BvYBH/OCjXe Kk4Zmpeujs6KqzRMMiPpPtmnq8NqPGVrub7T+SMPgzqOx/GAZF+UFo3435CBy4iJpd4B A4SA== X-Gm-Message-State: APjAAAVLipu218D6jlcavm65msn4TQEtUz5qDzxJ14ZfE5np79OXarYG LTg6rjJoJdT0oSscECzUVdKKhcVi8FVrbQKTppMSjA== X-Received: by 2002:a65:500d:: with SMTP id f13mr39255780pgo.151.1562200651299; Wed, 03 Jul 2019 17:37:31 -0700 (PDT) Date: Wed, 3 Jul 2019 17:36:00 -0700 In-Reply-To: <20190704003615.204860-1-brendanhiggins@google.com> Message-Id: <20190704003615.204860-4-brendanhiggins@google.com> Mime-Version: 1.0 References: <20190704003615.204860-1-brendanhiggins@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH v6 03/18] kunit: test: add string_stream a std::stream like string builder From: Brendan Higgins To: frowand.list@gmail.com, gregkh@linuxfoundation.org, jpoimboe@redhat.com, keescook@google.com, kieran.bingham@ideasonboard.com, mcgrof@kernel.org, peterz@infradead.org, robh@kernel.org, sboyd@kernel.org, shuah@kernel.org, tytso@mit.edu, yamada.masahiro@socionext.com Cc: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, kunit-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org, linux-um@lists.infradead.org, Alexander.Levin@microsoft.com, Tim.Bird@sony.com, amir73il@gmail.com, dan.carpenter@oracle.com, daniel@ffwll.ch, jdike@addtoit.com, joel@jms.id.au, julia.lawall@lip6.fr, khilman@baylibre.com, knut.omang@oracle.com, logang@deltatee.com, mpe@ellerman.id.au, pmladek@suse.com, rdunlap@infradead.org, richard@nod.at, rientjes@google.com, rostedt@goodmis.org, wfg@linux.intel.com, Brendan Higgins Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A number of test features need to do pretty complicated string printing where it may not be possible to rely on a single preallocated string with parameters. So provide a library for constructing the string as you go similar to C++'s std::string. Signed-off-by: Brendan Higgins Reviewed-by: Greg Kroah-Hartman Reviewed-by: Logan Gunthorpe --- include/kunit/string-stream.h | 49 ++++++++++++ kunit/Makefile | 3 +- kunit/string-stream.c | 147 ++++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 include/kunit/string-stream.h create mode 100644 kunit/string-stream.c diff --git a/include/kunit/string-stream.h b/include/kunit/string-stream.h new file mode 100644 index 0000000000000..0552a05781afe --- /dev/null +++ b/include/kunit/string-stream.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * C++ stream style string builder used in KUnit for building messages. + * + * Copyright (C) 2019, Google LLC. + * Author: Brendan Higgins + */ + +#ifndef _KUNIT_STRING_STREAM_H +#define _KUNIT_STRING_STREAM_H + +#include +#include +#include +#include + +struct string_stream_fragment { + struct list_head node; + char *fragment; +}; + +struct string_stream { + size_t length; + struct list_head fragments; + /* length and fragments are protected by this lock */ + spinlock_t lock; +}; + +struct kunit; + +struct string_stream *alloc_string_stream(struct kunit *test); + +void string_stream_get(struct string_stream *stream); + +int string_stream_put(struct string_stream *stream); + +int string_stream_add(struct string_stream *stream, const char *fmt, ...); + +int string_stream_vadd(struct string_stream *stream, + const char *fmt, + va_list args); + +char *string_stream_get_string(struct string_stream *stream); + +void string_stream_clear(struct string_stream *stream); + +bool string_stream_is_empty(struct string_stream *stream); + +#endif /* _KUNIT_STRING_STREAM_H */ diff --git a/kunit/Makefile b/kunit/Makefile index 5efdc4dea2c08..275b565a0e81f 100644 --- a/kunit/Makefile +++ b/kunit/Makefile @@ -1 +1,2 @@ -obj-$(CONFIG_KUNIT) += test.o +obj-$(CONFIG_KUNIT) += test.o \ + string-stream.o diff --git a/kunit/string-stream.c b/kunit/string-stream.c new file mode 100644 index 0000000000000..0463a92dad74b --- /dev/null +++ b/kunit/string-stream.c @@ -0,0 +1,147 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * C++ stream style string builder used in KUnit for building messages. + * + * Copyright (C) 2019, Google LLC. + * Author: Brendan Higgins + */ + +#include +#include +#include +#include + +int string_stream_vadd(struct string_stream *stream, + const char *fmt, + va_list args) +{ + struct string_stream_fragment *frag_container; + int len; + va_list args_for_counting; + unsigned long flags; + + /* Make a copy because `vsnprintf` could change it */ + va_copy(args_for_counting, args); + + /* Need space for null byte. */ + len = vsnprintf(NULL, 0, fmt, args_for_counting) + 1; + + va_end(args_for_counting); + + frag_container = kmalloc(sizeof(*frag_container), GFP_KERNEL); + if (!frag_container) + return -ENOMEM; + + frag_container->fragment = kmalloc(len, GFP_KERNEL); + if (!frag_container->fragment) { + kfree(frag_container); + return -ENOMEM; + } + + len = vsnprintf(frag_container->fragment, len, fmt, args); + spin_lock_irqsave(&stream->lock, flags); + stream->length += len; + list_add_tail(&frag_container->node, &stream->fragments); + spin_unlock_irqrestore(&stream->lock, flags); + + return 0; +} + +int string_stream_add(struct string_stream *stream, const char *fmt, ...) +{ + va_list args; + int result; + + va_start(args, fmt); + result = string_stream_vadd(stream, fmt, args); + va_end(args); + + return result; +} + +void string_stream_clear(struct string_stream *stream) +{ + struct string_stream_fragment *frag_container, *frag_container_safe; + unsigned long flags; + + spin_lock_irqsave(&stream->lock, flags); + list_for_each_entry_safe(frag_container, + frag_container_safe, + &stream->fragments, + node) { + list_del(&frag_container->node); + kfree(frag_container->fragment); + kfree(frag_container); + } + stream->length = 0; + spin_unlock_irqrestore(&stream->lock, flags); +} + +char *string_stream_get_string(struct string_stream *stream) +{ + struct string_stream_fragment *frag_container; + size_t buf_len = stream->length + 1; /* +1 for null byte. */ + char *buf; + unsigned long flags; + + buf = kzalloc(buf_len, GFP_KERNEL); + if (!buf) + return NULL; + + spin_lock_irqsave(&stream->lock, flags); + list_for_each_entry(frag_container, &stream->fragments, node) + strlcat(buf, frag_container->fragment, buf_len); + spin_unlock_irqrestore(&stream->lock, flags); + + return buf; +} + +bool string_stream_is_empty(struct string_stream *stream) +{ + bool is_empty; + unsigned long flags; + + spin_lock_irqsave(&stream->lock, flags); + is_empty = list_empty(&stream->fragments); + spin_unlock_irqrestore(&stream->lock, flags); + + return is_empty; +} + +static int string_stream_init(struct kunit_resource *res, void *context) +{ + struct string_stream *stream; + + stream = kzalloc(sizeof(*stream), GFP_KERNEL); + if (!stream) + return -ENOMEM; + + res->allocation = stream; + INIT_LIST_HEAD(&stream->fragments); + spin_lock_init(&stream->lock); + + return 0; +} + +static void string_stream_free(struct kunit_resource *res) +{ + struct string_stream *stream = res->allocation; + + string_stream_clear(stream); + kfree(stream); +} + +struct string_stream *alloc_string_stream(struct kunit *test) +{ + struct kunit_resource *res; + + res = kunit_alloc_resource(test, + string_stream_init, + string_stream_free, + NULL); + + if (!res) + return NULL; + + return res->allocation; +} -- 2.22.0.410.gd8fdbe21b5-goog