From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67DACC433E2 for ; Mon, 13 Jul 2020 09:31:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0B8120773 for ; Mon, 13 Jul 2020 09:31:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="URCZ/fO0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729219AbgGMJbN (ORCPT ); Mon, 13 Jul 2020 05:31:13 -0400 Received: from lb2-smtp-cloud7.xs4all.net ([194.109.24.28]:53941 "EHLO lb2-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727834AbgGMJbM (ORCPT ); Mon, 13 Jul 2020 05:31:12 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud7.xs4all.net with ESMTPA id uunij6VjzGLmCuunljArPs; Mon, 13 Jul 2020 11:31:09 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s1; t=1594632669; bh=V9P6DossB42VSwcwGGArhjKZRArsFnE8CF4WV9FWoMo=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=URCZ/fO094gbKiC7cE/M2hRMjSc4djFCaKMmG1rwY8Hy2fqMzwkhGNHcscsTCrW+A 3jpZKf7iJdOX6jzEwgZZ+YFc9axADyy+GJpHfAtFcZvxF5T1tpm1dE2SRuFg7ZP/bg DJrzCuzuH4eTDd4facIHZEatIwhuyIb9sujBmjYTm4cGHreNGYInX43lVVug2M9at9 8oZi/n7eSlsglDLSMh4G4a/chUzC/ZDxJRr2juq33PEhOz2GHYFEK2I38ovrOS6nmq dDHk+96pdTe7wdUaR3Eet9iAX6uwmhjvaPEVUDIkMdGj/keZG9X5KAlelVEj/9CJYU VwlGwtwSa2sLQ== Subject: Re: [PATCH v3] media: videobuf2: Print videobuf2 buffer state by name To: Ezequiel Garcia , linux-media@vger.kernel.org Cc: kernel@collabora.com, Nicolas Dufresne References: <20200710125129.159710-1-ezequiel@collabora.com> <20200710130010.160712-1-ezequiel@collabora.com> From: Hans Verkuil Message-ID: Date: Mon, 13 Jul 2020 11:31:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200710130010.160712-1-ezequiel@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfGqkcJv6C7QhHvtUuLkKD24ZmuHU1sEq4Y6Axy8q7G0ow6UbK2kHh2bRJYiLDVyuPZ1685HYOH5gmrTbOPZJvS3Ul0qgZhbXZGr5J9Z/grK7sdjpRffh dTAsg21n1J6XxNENsjrKXc7J17PTUwWsU1LBsqliXtzaPzf9TQOroQzufS4EAr5HVe49SDCGlNzTar4O1NratS7V/6zAw4az99zASPMQKpyl22kG4+u+9f9j sAgJH+AmvA8SNyFCmQT4OF9SDoBZzac4G9sRuo8Ccdh35i9IdRUTnY1T9Pq0L03S Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 10/07/2020 15:00, Ezequiel Garcia wrote: > For debugging purposes, seeing the state integer > representation is really inconvenient. > > Improve this and be developer-friendly by printing > the state name instead. > > Suggested-by: Nicolas Dufresne > Signed-off-by: Ezequiel Garcia > --- > v3: > * Drop static modifier from the now local name array. > v2: > * Use a proper function instead of a C macro. > > .../media/common/videobuf2/videobuf2-core.c | 35 ++++++++++++++----- > 1 file changed, 27 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c > index abaf28e057eb..d5942cd455bf 100644 > --- a/drivers/media/common/videobuf2/videobuf2-core.c > +++ b/drivers/media/common/videobuf2/videobuf2-core.c > @@ -191,6 +191,23 @@ module_param(debug, int, 0644); > static void __vb2_queue_cancel(struct vb2_queue *q); > static void __enqueue_in_driver(struct vb2_buffer *vb); > > +static inline const char *vb2_state_name(enum vb2_buffer_state s) Why inline? That adds nothing of value. It's too big for an inline anyway and it's only used when debug is on. > +{ > + const char * const state_names[] = { This really should be static, local or not. I'm not sure why you dropped that. Possibly because of the inline? Regards, Hans > + [VB2_BUF_STATE_DEQUEUED] = "dequeued", > + [VB2_BUF_STATE_IN_REQUEST] = "in request", > + [VB2_BUF_STATE_PREPARING] = "preparing", > + [VB2_BUF_STATE_QUEUED] = "queued", > + [VB2_BUF_STATE_ACTIVE] = "active", > + [VB2_BUF_STATE_DONE] = "done", > + [VB2_BUF_STATE_ERROR] = "error", > + }; > + > + if ((unsigned int)(s) < ARRAY_SIZE(state_names)) > + return state_names[s]; > + return "unknown"; > +} > + > /* > * __vb2_buf_mem_alloc() - allocate video memory for the given buffer > */ > @@ -1015,8 +1032,8 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) > */ > vb->cnt_buf_done++; > #endif > - dprintk(q, 4, "done processing on buffer %d, state: %d\n", > - vb->index, state); > + dprintk(q, 4, "done processing on buffer %d, state: %s\n", > + vb->index, vb2_state_name(state)); > > if (state != VB2_BUF_STATE_QUEUED) > __vb2_buf_mem_finish(vb); > @@ -1490,8 +1507,8 @@ int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb) > > vb = q->bufs[index]; > if (vb->state != VB2_BUF_STATE_DEQUEUED) { > - dprintk(q, 1, "invalid buffer state %d\n", > - vb->state); > + dprintk(q, 1, "invalid buffer state %s\n", > + vb2_state_name(vb->state)); > return -EINVAL; > } > if (vb->prepared) { > @@ -1670,7 +1687,8 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb, > dprintk(q, 1, "buffer still being prepared\n"); > return -EINVAL; > default: > - dprintk(q, 1, "invalid buffer state %d\n", vb->state); > + dprintk(q, 1, "invalid buffer state %s\n", > + vb2_state_name(vb->state)); > return -EINVAL; > } > > @@ -1884,7 +1902,8 @@ int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb, > dprintk(q, 3, "returning done buffer with errors\n"); > break; > default: > - dprintk(q, 1, "invalid buffer state\n"); > + dprintk(q, 1, "invalid buffer state %s\n", > + vb2_state_name(vb->state)); > return -EINVAL; > } > > @@ -1915,8 +1934,8 @@ int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb, > media_request_put(vb->request); > vb->request = NULL; > > - dprintk(q, 2, "dqbuf of buffer %d, with state %d\n", > - vb->index, vb->state); > + dprintk(q, 2, "dqbuf of buffer %d, state: %s\n", > + vb->index, vb2_state_name(vb->state)); > > return 0; > >