From c1283ae8472dbd4e2c3593b76b7600ac72640b80 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sat, 20 May 2017 21:42:38 -0400 Subject: Add support for callbacks Callbacks are the response in the PDM 'trigger->response' model. Add general support for implementing callbacks and implement a log to systemd journal using that framework. Signed-off-by: Brad Bishop Change-Id: I8bead5368ee5472a02b47e8bba9e9df3a1f346bc --- src/templates/generated.mako.hpp | 29 +++++++++++++++++++++++------ src/templates/journal.mako.cpp | 3 +++ 2 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 src/templates/journal.mako.cpp (limited to 'src/templates') diff --git a/src/templates/generated.mako.hpp b/src/templates/generated.mako.hpp index 0911e3a..61c2b6f 100644 --- a/src/templates/generated.mako.hpp +++ b/src/templates/generated.mako.hpp @@ -5,6 +5,7 @@ #include #include #include "data_types.hpp" +#include "journal.hpp" #include "propertywatchimpl.hpp" #include "sdbusplus.hpp" @@ -107,15 +108,15 @@ struct ConfigPropertyIndicies { PropertyIndex::key_type { - ConfigPaths::get()[${i[0]}], - ConfigInterfaces::get()[${i[2]}], - ConfigProperties::get()[${i[3]}] + std::cref(ConfigPaths::get()[${i[0]}]), + std::cref(ConfigInterfaces::get()[${i[2]}]), + std::cref(ConfigProperties::get()[${i[3]}]) }, PropertyIndex::mapped_type { - ConfigMeta::get()[${i[1]}], - ConfigMeta::get()[${i[4]}], - ConfigPropertyStorage::get()[${i[5]}] + std::cref(ConfigMeta::get()[${i[1]}]), + std::cref(ConfigMeta::get()[${i[4]}]), + std::ref(ConfigPropertyStorage::get()[${i[5]}]) }, }, % endfor @@ -127,6 +128,22 @@ struct ConfigPropertyIndicies } }; +struct ConfigPropertyCallbacks +{ + using Callbacks = std::array, ${len(callbacks)}>; + + static auto& get() + { + static const Callbacks propertyCallbacks = + { +% for c in callbacks: + ${c.construct(loader, indent=indent +3)}, +% endfor + }; + return propertyCallbacks; + } +}; + struct ConfigPropertyWatches { using PropertyWatches = std::array, ${len(watches)}>; diff --git a/src/templates/journal.mako.cpp b/src/templates/journal.mako.cpp new file mode 100644 index 0000000..787337d --- /dev/null +++ b/src/templates/journal.mako.cpp @@ -0,0 +1,3 @@ +std::make_unique>( +${indent(1)}"${c.message}", +${indent(1)}ConfigPropertyIndicies::get()[${c.instances}])\ -- cgit v1.2.1