From patchwork Tue Apr 20 13:07:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 12015 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 1B29EBDB16 for ; Tue, 20 Apr 2021 13:07:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 93DB260516; Tue, 20 Apr 2021 15:07:52 +0200 (CEST) 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="rTEeviZv"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BB3C068840 for ; Tue, 20 Apr 2021 15:07:47 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3A05C1051; Tue, 20 Apr 2021 15:07:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1618924067; bh=ey58rlmbpyMlhmZ+G5GXv23lVH3y3Lqx3oMP1V/IdaY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rTEeviZv7YdXSm1/tBRe6SiQFuZ21hDGY/z30TQ5RQS90q0zum3KD/8pPwOYu+sw5 Y6DLDfPbTh6EvVuYubbDX65T6q62KZ77QifwcLNIb0fDL+VWIlXjtz2pSS1uyuSLAA loX3Gynxp3rlPhbqxSAKaoEC/EAi2k/RrzT8elJY= From: Kieran Bingham To: libcamera devel Date: Tue, 20 Apr 2021 14:07:40 +0100 Message-Id: <20210420130741.236848-6-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420130741.236848-1-kieran.bingham@ideasonboard.com> References: <20210420130741.236848-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 5/6] libcamera: internal: log: Report function on asserts 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" Report the function which fails an assertion as well as the actual assertion. This now reports as: [30:08:53.218816270] [226567] FATAL default request.cpp:150 assertion "d" failed in reuse() rather than: [30:11:05.271888926] [228531] FATAL default request.cpp:150 assertion "d" failed Signed-off-by: Kieran Bingham Reviewed-by: Jean-Michel Hautbois Reviewed-by: Laurent Pinchart --- We could use __PRETTY_FUNCTION__ instead to get: [30:17:16.736265045] [232054] FATAL default request.cpp:150 assertion "d" failed in void libcamera::Request::reuse(libcamera::Request::ReuseFlag) include/libcamera/internal/log.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h index be0bab3c1272..b66bf55bc57d 100644 --- a/include/libcamera/internal/log.h +++ b/include/libcamera/internal/log.h @@ -117,9 +117,10 @@ LogMessage _log(const LogCategory *category, LogSeverity severity, #endif /* __DOXYGEN__ */ #ifndef NDEBUG -#define ASSERT(condition) static_cast(({ \ - if (!(condition)) \ - LOG(Fatal) << "assertion \"" #condition "\" failed"; \ +#define ASSERT(condition) static_cast(({ \ + if (!(condition)) \ + LOG(Fatal) << "assertion \"" #condition "\" failed in " \ + << __func__ << "()"; \ })) #else #define ASSERT(condition) static_cast(false && (condition))