diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-10-17 21:54:09 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-10-20 16:35:51 -0500 |
| commit | 0966ce8c06feeab490f23024f18f120cd6225843 (patch) | |
| tree | ce0623d2678bce2dc913567cca62a5c437223ac5 /tools | |
| parent | d1102f4b3db8c02fc4a6440319ef857069e47267 (diff) | |
| download | sdbusplus-0966ce8c06feeab490f23024f18f120cd6225843.tar.gz sdbusplus-0966ce8c06feeab490f23024f18f120cd6225843.zip | |
server: minor refactoring
Move files into a server subdirectory to correspond to the 'server'
namespace and create a 'server.hpp' as method to gain includes
needed by any server instance. Create a few type aliases to
reduce namespace levels.
Change-Id: I8f8ea8e57177393faa007351a540d08873d36632
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/templates/interface.mako.server.cpp | 3 | ||||
| -rw-r--r-- | tools/templates/interface.mako.server.hpp | 6 | ||||
| -rw-r--r-- | tools/templates/method.mako.prototype.hpp | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/tools/templates/interface.mako.server.cpp b/tools/templates/interface.mako.server.cpp index 382ae7c..63bc788 100644 --- a/tools/templates/interface.mako.server.cpp +++ b/tools/templates/interface.mako.server.cpp @@ -1,5 +1,4 @@ -#include <sdbusplus/bus.hpp> -#include <sdbusplus/message.hpp> +#include <sdbusplus/server.hpp> #include <${"/".join(interface.name.split('.') + [ 'server.hpp' ])}> <% namespaces = interface.name.split('.') diff --git a/tools/templates/interface.mako.server.hpp b/tools/templates/interface.mako.server.hpp index fa499b4..1d23646 100644 --- a/tools/templates/interface.mako.server.hpp +++ b/tools/templates/interface.mako.server.hpp @@ -1,9 +1,7 @@ #pragma once #include <tuple> #include <systemd/sd-bus.h> -#include <sdbusplus/vtable.hpp> -#include <sdbusplus/interface.hpp> -#include <sdbusplus/bus.hpp> +#include <sdbusplus/server.hpp> <% namespaces = interface.name.split('.') classname = namespaces.pop() @@ -51,7 +49,7 @@ ${ m.cpp_prototype(loader, interface=interface, ptype='callback-header') } % endfor static constexpr auto _interface = "${interface.name}"; - static const sdbusplus::vtable::vtable_t _vtable[]; + static const vtable::vtable_t _vtable[]; interface::interface _${"_".join(interface.name.split('.'))}_interface; }; diff --git a/tools/templates/method.mako.prototype.hpp b/tools/templates/method.mako.prototype.hpp index 5e8f2ac..d8155c7 100644 --- a/tools/templates/method.mako.prototype.hpp +++ b/tools/templates/method.mako.prototype.hpp @@ -91,7 +91,7 @@ int ${interface_name()}::_callback_${ method.CamelCase }( sd_bus_message* msg, void* context, sd_bus_error* error) { ### Need to add a ref to msg since we attached it to an sdbusplus::message. - auto m = sdbusplus::message::message(sd_bus_message_ref(msg)); + auto m = message::message(sd_bus_message_ref(msg)); % if len(method.parameters) != 0: ${parameters_as_local()}{}; |
