From patchwork Tue Apr 13 21:51:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11922 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 A9E49BD224 for ; Tue, 13 Apr 2021 21:52:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4A803602D1; Tue, 13 Apr 2021 23:52:18 +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="KFXcGCYu"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6D30A602D1 for ; Tue, 13 Apr 2021 23:52:16 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F2E019F0 for ; Tue, 13 Apr 2021 23:52:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1618350736; bh=PdEjLeBIcQmJ4Ym3GKto2J0Z86/U0EyyE6QQ5cAAu3s=; h=From:To:Subject:Date:In-Reply-To:References:From; b=KFXcGCYuCcj5jz+D1dgAIiZ3qbeTKrhfZwlX52+jm/9a4XclvYsjDfbcopa+HEg55 CWxsgjznrswt9AeJUSOWx+HKAOabcPCR6kMSZwl2pMWdpk+sTQCZryy8wOZ/9hpzlP jH/0/eNPsXV11zeJFxZ2I7BeBI3PIrM0B37B+rNo= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 14 Apr 2021 00:51:20 +0300 Message-Id: <20210413215121.15538-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.28.1 In-Reply-To: <20210413215121.15538-1-laurent.pinchart@ideasonboard.com> References: <20210413215121.15538-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: log: De-duplicate _log() functions and LogMessage constructor 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" The _log() functions, as well as the LogMessage constructor, exist in two versions, one that takes a log category, and one that doesn't. The latter uses the default log category. This can be simplied by passing a LogCategory pointer to _log(), which can then be null for the default category, and moving the retrieval of the default log category from the LogMessage constructor to the _log() function. Signed-off-by: Laurent Pinchart Tested-by: Sebastian Fricke Reviewed-by: Kieran Bingham --- include/libcamera/internal/log.h | 13 ++----- src/libcamera/log.cpp | 66 ++++---------------------------- 2 files changed, 12 insertions(+), 67 deletions(-) diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h index e76ae913c857..0fdacc4733fe 100644 --- a/include/libcamera/internal/log.h +++ b/include/libcamera/internal/log.h @@ -55,8 +55,6 @@ const LogCategory &_LOG_CATEGORY(name)() \ class LogMessage { public: - LogMessage(const char *fileName, unsigned int line, - LogSeverity severity); LogMessage(const char *fileName, unsigned int line, const LogCategory &category, LogSeverity severity); @@ -92,23 +90,20 @@ protected: virtual std::string logPrefix() const = 0; LogMessage _log(const char *file, unsigned int line, - LogSeverity severity) const; - LogMessage _log(const char *file, unsigned int line, - const LogCategory &category, + const LogCategory *category, LogSeverity severity) const; }; -LogMessage _log(const char *file, unsigned int line, LogSeverity severity); LogMessage _log(const char *file, unsigned int line, - const LogCategory &category, LogSeverity severity); + const LogCategory *category, LogSeverity severity); #ifndef __DOXYGEN__ #define _LOG_CATEGORY(name) logCategory##name #define _LOG1(severity) \ - _log(__FILE__, __LINE__, Log##severity).stream() + _log(__FILE__, __LINE__, nullptr, Log##severity).stream() #define _LOG2(category, severity) \ - _log(__FILE__, __LINE__, _LOG_CATEGORY(category)(), Log##severity).stream() + _log(__FILE__, __LINE__, &_LOG_CATEGORY(category)(), Log##severity).stream() /* * Expand the LOG() macro to _LOG1() or _LOG2() based on the number of diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index 45c7c2d24652..9f86e645ac58 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -763,24 +763,6 @@ const LogCategory &LogCategory::defaultCategory() * directly. Use the LOG() macro instead access the log infrastructure. */ -/** - * \brief Construct a log message for the default category - * \param[in] fileName The file name where the message is logged from - * \param[in] line The line number where the message is logged from - * \param[in] severity The log message severity, controlling how the message - * will be displayed - * - * Create a log message pertaining to line \a line of file \a fileName. The - * \a severity argument sets the message severity to control whether it will be - * output or dropped. - */ -LogMessage::LogMessage(const char *fileName, unsigned int line, - LogSeverity severity) - : category_(LogCategory::defaultCategory()), severity_(severity) -{ - init(fileName, line); -} - /** * \brief Construct a log message for a given category * \param[in] fileName The file name where the message is logged from @@ -913,26 +895,6 @@ Loggable::~Loggable() * \return A string to be prefixed to the log message */ -/** - * \brief Create a temporary LogMessage object to log a message - * \param[in] fileName The file name where the message is logged from - * \param[in] line The line number where the message is logged from - * \param[in] severity The log message severity - * - * This method is used as a backeng by the LOG() macro to create a log message - * for locations inheriting from the Loggable class. - * - * \return A log message - */ -LogMessage Loggable::_log(const char *fileName, unsigned int line, - LogSeverity severity) const -{ - LogMessage msg(fileName, line, severity); - - msg.stream() << logPrefix() << ": "; - return msg; -} - /** * \brief Create a temporary LogMessage object to log a message * \param[in] fileName The file name where the message is logged from @@ -946,31 +908,17 @@ LogMessage Loggable::_log(const char *fileName, unsigned int line, * \return A log message */ LogMessage Loggable::_log(const char *fileName, unsigned int line, - const LogCategory &category, + const LogCategory *category, LogSeverity severity) const { - LogMessage msg(fileName, line, category, severity); + LogMessage msg(fileName, line, + category ? *category : LogCategory::defaultCategory(), + severity); msg.stream() << logPrefix() << ": "; return msg; } -/** - * \brief Create a temporary LogMessage object to log a message - * \param[in] fileName The file name where the message is logged from - * \param[in] line The line number where the message is logged from - * \param[in] severity The log message severity - * - * This function is used as a backeng by the LOG() macro to create a log - * message for locations not inheriting from the Loggable class. - * - * \return A log message - */ -LogMessage _log(const char *fileName, unsigned int line, LogSeverity severity) -{ - return LogMessage(fileName, line, severity); -} - /** * \brief Create a temporary LogMessage object to log a message * \param[in] fileName The file name where the message is logged from @@ -984,9 +932,11 @@ LogMessage _log(const char *fileName, unsigned int line, LogSeverity severity) * \return A log message */ LogMessage _log(const char *fileName, unsigned int line, - const LogCategory &category, LogSeverity severity) + const LogCategory *category, LogSeverity severity) { - return LogMessage(fileName, line, category, severity); + return LogMessage(fileName, line, + category ? *category : LogCategory::defaultCategory(), + severity); } /**