[{"id":205,"web_url":"https://patchwork.libcamera.org/comment/205/","msgid":"<20190106110538.GB11987@bigcity.dyn.berto.se>","date":"2019-01-06T11:05:38","subject":"Re: [libcamera-devel] [PATCH 01/11] libcamera: log: Add a LogFatal\n\tlog level","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2019-01-06 04:33:18 +0200, Laurent Pinchart wrote:\n> The LogFatal log level is similar to the LogError level, but\n> additionally abort program execution. This is useful to implement\n> assertion handlers.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/include/log.h | 2 ++\n> src/libcamera/log.cpp | 19 +++++++++++++++----\n> 2 files changed, 17 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/include/log.h b/src/libcamera/include/log.h\n> index 74439848c6ca..03842be02d0e 100644\n> --- a/src/libcamera/include/log.h\n> +++ b/src/libcamera/include/log.h\n> @@ -16,6 +16,7 @@ enum LogSeverity {\n> \tLogInfo,\n> \tLogWarning,\n> \tLogError,\n> +\tLogFatal,\n> };\n> \n> class LogMessage\n> @@ -30,6 +31,7 @@ public:\n> \n> private:\n> \tstd::ostringstream msgStream;\n> +\tLogSeverity severity_;\n> };\n> \n> #define LOG(severity) LogMessage(__FILE__, __LINE__, Log##severity).stream()\n> diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp\n> index 44b3a5bbe279..a5823c64eaa6 100644\n> --- a/src/libcamera/log.cpp\n> +++ b/src/libcamera/log.cpp\n> @@ -6,6 +6,7 @@\n> */\n> \n> #include \n> +#include \n> #include \n> #include \n> #include \n> @@ -31,6 +32,8 @@ namespace libcamera {\n> * Warning message, signals a potential issue\n> * \\var LogError\n> * Error message, signals an unrecoverable issue\n> + * \\var LogFatal\n> + * Fatal message, signals an unrecoverable issue and aborts execution\n> */\n> \n> /**\n> @@ -40,15 +43,19 @@ namespace libcamera {\n> * Return an std::ostream reference to which a message can be logged using the\n> * iostream API. The \\a severity controls whether the message is printed or\n> * dropped, depending on the global log level.\n> + *\n> + * If the severity is set to Fatal, execution is aborted and the program\n> + * terminates immediately after printing the message.\n> */\n> \n> static const char *log_severity_name(LogSeverity severity)\n> {\n> \tstatic const char * const names[] = {\n> -\t\t\" DBG\",\n> -\t\t\"INFO\",\n> -\t\t\"WARN\",\n> -\t\t\" ERR\",\n> +\t\t\" DBG\",\n> +\t\t\" INFO\",\n> +\t\t\" WARN\",\n> +\t\t\" ERR\",\n> +\t\t\"FATAL\",\n> \t};\n> \n> \tif (static_cast(severity) < ARRAY_SIZE(names))\n> @@ -73,6 +80,7 @@ static const char *log_severity_name(LogSeverity severity)\n> */\n> LogMessage::LogMessage(const char *fileName, unsigned int line,\n> \t\t LogSeverity severity)\n> +\t: severity_(severity)\n> {\n> \t/* Log the timestamp, severity and file information. */\n> \tstruct timespec timestamp;\n> @@ -93,6 +101,9 @@ LogMessage::~LogMessage()\n> \tstd::string msg(msgStream.str());\n> \tfwrite(msg.data(), msg.size(), 1, stderr);\n> \tfflush(stderr);\n> +\n> +\tif (severity_ == LogSeverity::LogFatal)\n> +\t\tstd::abort();\n> }\n> \n> /**\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lj1-x242.google.com (mail-lj1-x242.google.com\n\t[IPv6:2a00:1450:4864:20::242])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C0C6860B2C\n\tfor ;\n\tSun, 6 Jan 2019 12:05:41 +0100 (CET)","by mail-lj1-x242.google.com with SMTP id n18-v6so35805158lji.7\n\tfor ;\n\tSun, 06 Jan 2019 03:05:41 -0800 (PST)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tr1-v6sm13353162ljb.64.2019.01.06.03.05.39\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tSun, 06 Jan 2019 03:05:39 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=MgWvvat8eNdiOcMRnuEp9P5/ftRhgbAWU4lpt6UrThg=;\n\tb=fHILipskYcHH8rCgfAHggAFDeUv0xQh+nRVZ+caPziMPzP0ZLijXD63uCttet0L5bD\n\tzQ2Qb12BscjyCs8sShWk91fEV8bDGuBU+QFzzwpTxGuOPlHqW26lX7/GgtpS5ZBK1/yw\n\tsj7CS4sTNm789sizm4xofYWhaglHq28pudZHdtzqUAre2ussUK8Zkxmz6ar3BB4IweXb\n\tlwqjxfi330vibnG2+Dc/rH9neplWmdMSIdiqMyRB52CVSaf9et9bRYGgzOV/Z5zS2QZg\n\tF6jS6X7XhA21zH7OPfn4rUVXkPXtVPLtYFlxJRekYSqdNaii+cj9ew8QSdz0ZM+3oK21\n\tZ2ZA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=MgWvvat8eNdiOcMRnuEp9P5/ftRhgbAWU4lpt6UrThg=;\n\tb=rqgk0WYgoI6Rq+wP4bqTQNN+1Vm3L4xMTenren5DABnhTjP8kikOL3qWhtfOCMPduK\n\tp7Tdwz0fMzPld8d5pciQUT/boXzeCYa72MagLVoNeWeHFsoKpliU5066iuPxQZ6+tNeg\n\tG3nb5xsz7Wc7Y5NZgpwilWzHmL842Xyc2f7SejUqCogGq+tYUkhnlIyFp308ut7gfQbI\n\txDyVoAkQXqeGk21FUvtXjJiBdv1HKTnoiVI+z4v7g4i3SEEb/kDziWIhbrHsg2hXGqcu\n\td2rwRkp8gPwY0jzk7sEJRy1/JiAQQA48+Z/yHtyfLEVhrkGLB26u6SuL3xgcC5sz9B/U\n\tPBbQ==","X-Gm-Message-State":"AJcUukdRIjyqToJkv2gRtWjSmVyhHCFGFu3lZw0oRvRJr2h8k8WDOJhZ\n\t+7HIGnGhYXPWEQ1NBegD3kmpKWsQQuY=","X-Google-Smtp-Source":"ALg8bN56uIxfTwqRjoEYxUMYDAkwuN+gHSwF/cDnHrzN24yhovi/tC+PvOPgvO0NX5kIaiFIvIPY3g==","X-Received":"by 2002:a2e:55d3:: with SMTP id\n\tg80-v6mr36228315lje.78.1546772740743; \n\tSun, 06 Jan 2019 03:05:40 -0800 (PST)","Date":"Sun, 6 Jan 2019 12:05:38 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190106110538.GB11987@bigcity.dyn.berto.se>","References":"<20190106023328.10989-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190106023328.10989-1-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 01/11] libcamera: log: Add a LogFatal\n\tlog level","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sun, 06 Jan 2019 11:05:42 -0000"}}]