{"id":12015,"url":"https://patchwork.libcamera.org/api/patches/12015/?format=json","web_url":"https://patchwork.libcamera.org/patch/12015/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210420130741.236848-6-kieran.bingham@ideasonboard.com>","date":"2021-04-20T13:07:40","name":"[libcamera-devel,v4,5/6] libcamera: internal: log: Report function on asserts","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"10fae4e88b6c87ab0255b67c5ae557f8c734fa95","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12015/mbox/","series":[{"id":1952,"url":"https://patchwork.libcamera.org/api/series/1952/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1952","date":"2021-04-20T13:07:35","name":"IPU3 Debug Improvements","version":4,"mbox":"https://patchwork.libcamera.org/series/1952/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12015/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12015/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1B29EBDB16\n\tfor ;\n\tTue, 20 Apr 2021 13:07:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 93DB260516;\n\tTue, 20 Apr 2021 15:07:52 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BB3C068840\n\tfor ;\n\tTue, 20 Apr 2021 15:07:47 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3A05C1051;\n\tTue, 20 Apr 2021 15:07:47 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"rTEeviZv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618924067;\n\tbh=ey58rlmbpyMlhmZ+G5GXv23lVH3y3Lqx3oMP1V/IdaY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rTEeviZv7YdXSm1/tBRe6SiQFuZ21hDGY/z30TQ5RQS90q0zum3KD/8pPwOYu+sw5\n\tY6DLDfPbTh6EvVuYubbDX65T6q62KZ77QifwcLNIb0fDL+VWIlXjtz2pSS1uyuSLAA\n\tloX3Gynxp3rlPhbqxSAKaoEC/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\n\tfunction on asserts","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Report the function which fails an assertion as well as the actual\nassertion.\n\nThis now reports as:\n\n[30:08:53.218816270] [226567] FATAL default request.cpp:150 assertion \"d\" failed in reuse()\nrather than:\n[30:11:05.271888926] [228531] FATAL default request.cpp:150 assertion \"d\" failed\n\nSigned-off-by: Kieran Bingham \n\n---\nWe could use __PRETTY_FUNCTION__ instead to get:\n[30:17:16.736265045] [232054] FATAL default request.cpp:150 assertion \"d\" failed in void libcamera::Request::reuse(libcamera::Request::ReuseFlag)\n\n include/libcamera/internal/log.h | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h\nindex be0bab3c1272..b66bf55bc57d 100644\n--- a/include/libcamera/internal/log.h\n+++ b/include/libcamera/internal/log.h\n@@ -117,9 +117,10 @@ LogMessage _log(const LogCategory *category, LogSeverity severity,\n #endif /* __DOXYGEN__ */\n \n #ifndef NDEBUG\n-#define ASSERT(condition) static_cast(({\t\t\t\t\\\n-\tif (!(condition))\t\t\t\t\t\t\\\n-\t\tLOG(Fatal) << \"assertion \\\"\" #condition \"\\\" failed\";\t\\\n+#define ASSERT(condition) static_cast(({ \\\n+\tif (!(condition)) \\\n+\t\tLOG(Fatal) << \"assertion \\\"\" #condition \"\\\" failed in \" \\\n+\t\t\t << __func__ << \"()\"; \\\n }))\n #else\n #define ASSERT(condition) static_cast(false && (condition))\n","prefixes":["libcamera-devel","v4","5/6"]}