{"id":150,"url":"https://patchwork.libcamera.org/api/patches/150/?format=json","web_url":"https://patchwork.libcamera.org/patch/150/","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":"<20190106023328.10989-1-laurent.pinchart@ideasonboard.com>","date":"2019-01-06T02:33:18","name":"[libcamera-devel,01/11] libcamera: log: Add a LogFatal log level","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f0964091f7101578b45888b5fbd4e940ece895fa","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/150/mbox/","series":[{"id":53,"url":"https://patchwork.libcamera.org/api/series/53/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=53","date":"2019-01-06T02:33:18","name":"[libcamera-devel,01/11] libcamera: log: Add a LogFatal log level","version":1,"mbox":"https://patchwork.libcamera.org/series/53/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/150/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/150/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F218B60B2E\n\tfor ;\n\tSun, 6 Jan 2019 03:32:26 +0100 (CET)","from avalon.bb.dnainternet.fi\n\t(dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 726D8513\n\tfor ;\n\tSun, 6 Jan 2019 03:32:26 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1546741946;\n\tbh=+0ER7+nIS3PE8vH/Tgfdbnl5PktMPE0/jBgk03Jh7Gs=;\n\th=From:To:Subject:Date:From;\n\tb=lRUSDb1cFDa7MSfIHIiPMlYxB3sGRX7Ltm4wtUSb8I2hN5/KhAl671pcwzaExl518\n\tlf9VBkOS7c7Ja4MC2EnGrPdeODFEr4MgfyRE6wbSsUQJU/9S7XKcF4xS/4LrwaFcL3\n\t/k8OZHUsuEiDIFwwb5LP95f2rv1a+M4YzUhb084o=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 6 Jan 2019 04:33:18 +0200","Message-Id":"<20190106023328.10989-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 01/11] libcamera: log: Add a LogFatal log\n\tlevel","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 02:32:27 -0000"},"content":"The LogFatal log level is similar to the LogError level, but\nadditionally abort program execution. This is useful to implement\nassertion handlers.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/include/log.h | 2 ++\n src/libcamera/log.cpp | 19 +++++++++++++++----\n 2 files changed, 17 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/include/log.h b/src/libcamera/include/log.h\nindex 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()\ndiff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp\nindex 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","prefixes":["libcamera-devel","01/11"]}