From patchwork Fri Mar 12 06:11:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11562 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C9451BD1F1 for ; Fri, 12 Mar 2021 06:11:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D875F68C7D; Fri, 12 Mar 2021 07:11:39 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Ab7X32Wt"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9627D602ED for ; Fri, 12 Mar 2021 07:11:36 +0100 (CET) Received: from localhost.localdomain (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 24C90A27; Fri, 12 Mar 2021 07:11:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1615529496; bh=mio3TBRsq6S1QTk5nncX/izBn0dtYPYRAfyfChvig+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ab7X32Wt8gyxiNjYs80uR9YqC5EY9h0u49gTGAYg+d5NnIMIImS9/AYldjexE/81a qZqL1NiFrnDIopmujSp331pg8o/jgJHNegbdgwMVP+t4y+oWM7c8WXkeLt/i2CbqKb YjrFzMQ5XPcnvVHDEVVI1F1+Wq+iJEnFsyEqI7E8= From: Kieran Bingham To: libcamera devel Date: Fri, 12 Mar 2021 06:11:25 +0000 Message-Id: <20210312061131.854849-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210312061131.854849-1-kieran.bingham@ideasonboard.com> References: <20210312061131.854849-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/8] libcamera: request: Add a toString() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Provide a toString helper to assist in printing Request state for debug and logging contexts. Signed-off-by: Kieran Bingham --- include/libcamera/request.h | 2 ++ src/libcamera/request.cpp | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/libcamera/request.h b/include/libcamera/request.h index 6f2f881e840a..59d7f4bac0d2 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -56,6 +56,8 @@ public: bool hasPendingBuffers() const { return !pending_.empty(); } + const std::string toString() const; + private: LIBCAMERA_DISABLE_COPY(Request) diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 24c3694de5fc..12c2e7d425f9 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -268,7 +268,7 @@ void Request::complete() status_ = cancelled_ ? RequestCancelled : RequestComplete; LOG(Request, Debug) - << "Request has completed - cookie: " << cookie_ + << toString() << " has completed - cookie: " << cookie_ << (cancelled_ ? " [Cancelled]" : ""); LIBCAMERA_TRACEPOINT(request_complete, this); @@ -302,4 +302,22 @@ bool Request::completeBuffer(FrameBuffer *buffer) return !hasPendingBuffers(); } +const std::string Request::toString() const +{ + std::stringstream ss; + + static const char *statuses[] = { + "Pending", + "Complete", + "Cancelled", + }; + + ss << "Request (" << sequence_ << ") " << statuses[status_]; + + if (hasPendingBuffers()) + ss << " [Pending:" << pending_.size() << "]"; + + return ss.str(); +} + } /* namespace libcamera */