summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-04-29 03:26:48 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-04-30 04:04:04 +0300
commitbcf986d07b1faf5412304cf63a0dfd05dbd91472 (patch)
tree80f36bf80261a31cec20754769948c3c23dc7092
parentbf01e04f29931aa6d64f3d408ce2a374b79254b6 (diff)
libcamera: ipa_module: Add log prefix
Make the IPAModule class inherit from Loggable to log the IPA module name in all messages. Before: [14:19:55.743795676] [20250] ERROR IPAModule ipa_module.cpp:279 IPA module is not an ELF file After: [14:20:22.343795887] [20270] ERROR IPAModule ipa_module.cpp:279 ipa_vimc.so: IPA module is not an ELF file Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--src/libcamera/include/ipa_module.h6
-rw-r--r--src/libcamera/ipa_module.cpp5
2 files changed, 10 insertions, 1 deletions
diff --git a/src/libcamera/include/ipa_module.h b/src/libcamera/include/ipa_module.h
index a9a35117..15022e19 100644
--- a/src/libcamera/include/ipa_module.h
+++ b/src/libcamera/include/ipa_module.h
@@ -14,11 +14,12 @@
#include <ipa/ipa_interface.h>
#include <ipa/ipa_module_info.h>
+#include "log.h"
#include "pipeline_handler.h"
namespace libcamera {
-class IPAModule
+class IPAModule : public Loggable
{
public:
explicit IPAModule(const std::string &libPath);
@@ -37,6 +38,9 @@ public:
bool match(PipelineHandler *pipe,
uint32_t minVersion, uint32_t maxVersion) const;
+protected:
+ std::string logPrefix() const override;
+
private:
struct IPAModuleInfo info_;
std::vector<uint8_t> signature_;
diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp
index 52823e88..3444a788 100644
--- a/src/libcamera/ipa_module.cpp
+++ b/src/libcamera/ipa_module.cpp
@@ -471,4 +471,9 @@ bool IPAModule::match(PipelineHandler *pipe,
!strcmp(info_.pipelineName, pipe->name());
}
+std::string IPAModule::logPrefix() const
+{
+ return utils::basename(libPath_.c_str());
+}
+
} /* namespace libcamera */