mirror of
https://github.com/toyota-connected/ivi-homescreen-plugins.git
synced 2026-06-21 07:19:32 -07:00
Add SDBus singleton to plugin_common
-Usage: plugin_common_sdbus::SDBus::Instance()->GetSystemBus() Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
This commit is contained in:
Joel Winarske
@@ -42,6 +42,8 @@ jobs:
|
||||
mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev \
|
||||
mesa-utils \
|
||||
\
|
||||
libsystemd-dev \
|
||||
\
|
||||
libcurl4-openssl-dev \
|
||||
libevent-dev \
|
||||
libglfw3-dev \
|
||||
|
||||
@@ -83,6 +83,8 @@ jobs:
|
||||
mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev \
|
||||
mesa-utils \
|
||||
\
|
||||
libsystemd-dev \
|
||||
\
|
||||
libcurl4-openssl-dev \
|
||||
libevent-dev \
|
||||
libglfw3-dev \
|
||||
|
||||
@@ -44,6 +44,8 @@ jobs:
|
||||
mesa-common-dev libegl1-mesa-dev libgles2-mesa-dev libosmesa6-dev \
|
||||
mesa-utils \
|
||||
\
|
||||
libsystemd-dev \
|
||||
\
|
||||
libcurl4-openssl-dev \
|
||||
libevent-dev \
|
||||
libglfw3-dev \
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
[submodule "plugins/common/sdbus/third_party/sdbus-cpp"]
|
||||
path = plugins/common/sdbus/third_party/sdbus-cpp
|
||||
url = https://github.com/Kistler-Group/sdbus-cpp.git
|
||||
@@ -7,6 +7,8 @@ add_library(plugin_common STATIC
|
||||
tools/command.cc
|
||||
uuid/uuidxx.cc
|
||||
)
|
||||
add_subdirectory(sdbus)
|
||||
|
||||
target_include_directories(plugin_common PUBLIC . ${PROJECT_BINARY_DIR})
|
||||
target_compile_definitions(plugin_common PUBLIC EGL_NO_X11)
|
||||
target_link_libraries(plugin_common PUBLIC flutter toolchain::toolchain)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include "json/json_utils.h"
|
||||
#include "logging.h"
|
||||
#include "sdbus/sdbus.h"
|
||||
#include "shared_library/shared_library.h"
|
||||
#include "string/string_tools.h"
|
||||
#include "time/time_tools.h"
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
#
|
||||
# Copyright 2023-2025 Toyota Connected North America
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
# Ensure CMP0079 is NEW so linking to targets created in other directories is allowed
|
||||
if(POLICY CMP0079)
|
||||
cmake_policy(SET CMP0079 NEW)
|
||||
endif()
|
||||
|
||||
set(SDBUSCPP_BUILD_CODEGEN OFF)
|
||||
set(SDBUSCPP_INSTALL OFF)
|
||||
add_subdirectory(third_party/sdbus-cpp)
|
||||
if (ENABLE_LTO AND IPO_SUPPORT_RESULT)
|
||||
set_property(TARGET sdbus-c++ PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||
endif ()
|
||||
target_link_libraries(sdbus-c++-objlib PUBLIC toolchain::toolchain)
|
||||
target_link_libraries(sdbus-c++ PUBLIC toolchain::toolchain)
|
||||
install(TARGETS toolchain EXPORT sdbus-c++-targets)
|
||||
|
||||
target_sources(plugin_common PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/sdbus.cc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/utils/utils.cc
|
||||
)
|
||||
target_include_directories(plugin_common PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/utils
|
||||
)
|
||||
|
||||
target_link_libraries(plugin_common PUBLIC
|
||||
sdbus-c++
|
||||
)
|
||||
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
* Copyright 2020-2025 Toyota Connected North America
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "sdbus.h"
|
||||
|
||||
namespace plugin_common_sdbus {
|
||||
|
||||
SDBus& SDBus::Instance() {
|
||||
static SDBus instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
SDBus::SDBus() {
|
||||
conn_ = sdbus::createSystemBusConnection();
|
||||
conn_->enterEventLoopAsync();
|
||||
}
|
||||
|
||||
SDBus::~SDBus() {
|
||||
conn_->leaveEventLoop();
|
||||
}
|
||||
|
||||
sdbus::IConnection& SDBus::GetSystemBus() {
|
||||
return *conn_;
|
||||
}
|
||||
} // namespace plugin_common_sdbus
|
||||
@@ -0,0 +1,43 @@
|
||||
/*
|
||||
* Copyright 2020-2025 Toyota Connected North America
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef PLUGINS_COMMON_SDBUS_H_
|
||||
#define PLUGINS_COMMON_SDBUS_H_
|
||||
|
||||
#include <sdbus-c++/sdbus-c++.h>
|
||||
#include <memory>
|
||||
|
||||
namespace plugin_common_sdbus {
|
||||
|
||||
class SDBus final {
|
||||
public:
|
||||
static SDBus& Instance();
|
||||
sdbus::IConnection& GetSystemBus();
|
||||
|
||||
SDBus(const SDBus&) = delete;
|
||||
SDBus& operator=(const SDBus&) = delete;
|
||||
SDBus(SDBus&&) = delete;
|
||||
SDBus& operator=(SDBus&&) = delete;
|
||||
|
||||
private:
|
||||
SDBus();
|
||||
~SDBus();
|
||||
|
||||
std::unique_ptr<sdbus::IConnection> conn_;
|
||||
};
|
||||
} // namespace plugin_common_sdbus
|
||||
|
||||
#endif // PLUGINS_COMMON_SDBUS_H_
|
||||
+1
Submodule plugins/common/sdbus/third_party/sdbus-cpp added at 7fbfcec455
@@ -0,0 +1,478 @@
|
||||
/*
|
||||
* Copyright 2024 Toyota Connected North America
|
||||
* Copyright (c) 2025 Joel Winarske
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "sdbus/utils/utils.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <iomanip>
|
||||
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
namespace plugin_common_sdbus {
|
||||
|
||||
void Utils::append_property(const sdbus::Variant& value,
|
||||
std::ostringstream& os) {
|
||||
const std::string_view type = value.peekValueType();
|
||||
os << "[" << type << "] ";
|
||||
if (const auto it = type_map_.find(type); it != type_map_.end()) {
|
||||
it->second(value, os);
|
||||
} else {
|
||||
os << "Unknown type: " << type << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
void Utils::append_properties(
|
||||
const std::map<sdbus::MemberName, sdbus::Variant>& props,
|
||||
std::ostringstream& os) {
|
||||
for (auto& [key, value] : props) {
|
||||
os << " " << key << ": ";
|
||||
append_property(value, os);
|
||||
}
|
||||
}
|
||||
|
||||
void Utils::append_properties(
|
||||
const std::map<std::string, sdbus::Variant>& props,
|
||||
std::ostringstream& os) {
|
||||
for (auto& [key, value] : props) {
|
||||
os << " " << key << ": ";
|
||||
append_property(value, os);
|
||||
}
|
||||
}
|
||||
|
||||
void Utils::print_changed_properties(
|
||||
const sdbus::InterfaceName& interfaceName,
|
||||
const std::map<sdbus::PropertyName, sdbus::Variant>& changedProperties,
|
||||
const std::vector<sdbus::PropertyName>& invalidatedProperties) {
|
||||
std::ostringstream os;
|
||||
os << std::endl;
|
||||
os << "[" << interfaceName << "] Properties changed" << std::endl;
|
||||
append_properties(changedProperties, os);
|
||||
for (const auto& name : invalidatedProperties) {
|
||||
os << "[" << interfaceName << "] Invalidated property: " << name
|
||||
<< std::endl;
|
||||
}
|
||||
spdlog::info(os.str());
|
||||
}
|
||||
|
||||
std::vector<std::string> Utils::ListNames(sdbus::IConnection& connection) {
|
||||
const auto proxy =
|
||||
createProxy(connection, sdbus::ServiceName("org.freedesktop.DBus"),
|
||||
sdbus::ObjectPath("/org/freedesktop/DBus"));
|
||||
|
||||
std::vector<std::string> dbus_interfaces;
|
||||
proxy->callMethod("ListNames")
|
||||
.onInterface("org.freedesktop.DBus")
|
||||
.storeResultsTo(dbus_interfaces);
|
||||
|
||||
return dbus_interfaces;
|
||||
}
|
||||
|
||||
bool Utils::isServicePresent(const std::vector<std::string>& dbus_interfaces,
|
||||
const std::string_view& service) {
|
||||
return std::find_if(dbus_interfaces.begin(), dbus_interfaces.end(),
|
||||
[&](const std::string& s) { return s == service; }) !=
|
||||
dbus_interfaces.end();
|
||||
}
|
||||
|
||||
const std::unordered_map<
|
||||
std::string_view,
|
||||
std::function<void(const sdbus::Variant&, std::ostringstream&)>>
|
||||
Utils::
|
||||
type_map_ = {{"u",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<std::uint32_t>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"d",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<double>()) << std::endl;
|
||||
}},
|
||||
{"n",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<std::int16_t>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"o",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << v.get<sdbus::ObjectPath>() << std::endl;
|
||||
}},
|
||||
{"ao",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
for (const auto& object_path :
|
||||
v.get<std::vector<sdbus::ObjectPath>>()) {
|
||||
os << object_path << std::endl;
|
||||
}
|
||||
}},
|
||||
{"i",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<std::int32_t>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"b",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << (v.get<bool>() ? "True" : "False") << std::endl;
|
||||
}},
|
||||
{"y",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<std::uint8_t>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"q",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<std::uint16_t>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"s",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << (v.get<std::string>().empty()
|
||||
? "\"\""
|
||||
: v.get<std::string>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"x",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<std::int64_t>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"t",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::to_string(v.get<std::uint64_t>())
|
||||
<< std::endl;
|
||||
}},
|
||||
{"as",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& s :
|
||||
v.get<std::vector<std::string>>()) {
|
||||
os << "\t" << s << std::endl;
|
||||
}
|
||||
if (v.get<std::vector<std::string>>().empty())
|
||||
os << "\t" << "\"\"" << std::endl;
|
||||
}},
|
||||
{"au",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& s :
|
||||
v.get<std::vector<std::uint32_t>>()) {
|
||||
os << "\t" << std::to_string(s) << std::endl;
|
||||
}
|
||||
if (v.get<std::vector<std::uint32_t>>().empty())
|
||||
os << "\t" << "\"\"" << std::endl;
|
||||
else
|
||||
os << std::endl;
|
||||
}},
|
||||
{"aau",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& it :
|
||||
v.get<std::vector<std::vector<std::uint32_t>>>()) {
|
||||
for (const auto& address : it) {
|
||||
os << "\t" << std::to_string(address) << std::endl;
|
||||
}
|
||||
}
|
||||
if (v.get<std::vector<std::vector<std::uint32_t>>>()
|
||||
.empty())
|
||||
os << "\t" << "\"\"" << std::endl;
|
||||
else
|
||||
os << std::endl;
|
||||
}},
|
||||
{"ay",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
for (const auto& b : v.get<std::vector<uint8_t>>()) {
|
||||
os << std::hex << std::setw(2) << std::setfill('0')
|
||||
<< static_cast<int>(b) << " ";
|
||||
}
|
||||
if (v.get<std::vector<uint8_t>>().empty())
|
||||
os << "\t" << "\"\"" << std::endl;
|
||||
else
|
||||
os << std::endl;
|
||||
}},
|
||||
{"aay",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
for (const auto& it :
|
||||
v.get<std::vector<std::vector<uint8_t>>>()) {
|
||||
for (const auto& b : it) {
|
||||
os << std::hex << std::setw(2) << std::setfill('0')
|
||||
<< static_cast<int>(b) << " ";
|
||||
}
|
||||
}
|
||||
if (v.get<std::vector<std::vector<uint8_t>>>().empty())
|
||||
os << "\t" << "\"\"" << std::endl;
|
||||
else
|
||||
os << std::endl;
|
||||
}},
|
||||
{"a{qv}",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& [key, value] :
|
||||
v.get<std::map<std::uint16_t, sdbus::Variant>>()) {
|
||||
os << "\t" << key << ": ";
|
||||
append_property(value, os);
|
||||
}
|
||||
}},
|
||||
{"a{sv}",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& [key, value] :
|
||||
v.get<std::map<std::string, sdbus::Variant>>()) {
|
||||
os << "\t" << key << ": ";
|
||||
append_property(value, os);
|
||||
}
|
||||
}},
|
||||
{"a(sa{sv})",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& tuple :
|
||||
v.get<std::vector<sdbus::Struct<
|
||||
std::string,
|
||||
std::map<std::string, sdbus::Variant>>>>()) {
|
||||
os << "\t" << std::get<0>(tuple) << ": ";
|
||||
for (const auto& [key, value] : std::get<1>(tuple)) {
|
||||
os << key << ": ";
|
||||
append_property(value, os);
|
||||
}
|
||||
}
|
||||
}},
|
||||
{"(qqy)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
const auto tuple =
|
||||
v.get<sdbus::Struct<std::uint16_t, std::uint16_t,
|
||||
std::uint8_t>>();
|
||||
os << "\t" << std::get<0>(tuple) << ": "
|
||||
<< std::get<1>(tuple) << ": " << std::get<2>(tuple);
|
||||
}},
|
||||
{"a(qqy)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& tuple :
|
||||
v.get<std::vector<
|
||||
sdbus::Struct<std::uint16_t, std::uint16_t,
|
||||
std::uint8_t>>>()) {
|
||||
os << "\t" << std::get<0>(tuple) << ": "
|
||||
<< std::get<1>(tuple) << ": " << std::get<2>(tuple)
|
||||
<< std::endl;
|
||||
}
|
||||
}},
|
||||
{"a(ayuay)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
try {
|
||||
for (const auto& tuple :
|
||||
v.get<std::vector<sdbus::Struct<
|
||||
std::vector<std::uint8_t>, std::uint32_t,
|
||||
std::vector<std::uint8_t>>>>()) {
|
||||
os << "\t";
|
||||
for (const auto& b : std::get<0>(tuple)) {
|
||||
os << std::hex << std::setw(2)
|
||||
<< std::setfill('0') << static_cast<int>(b)
|
||||
<< " ";
|
||||
}
|
||||
os << ", " << std::to_string(std::get<1>(tuple))
|
||||
<< ", ";
|
||||
for (const auto& b : std::get<2>(tuple)) {
|
||||
os << std::hex << std::setw(2)
|
||||
<< std::setfill('0') << static_cast<int>(b)
|
||||
<< " ";
|
||||
}
|
||||
os << std::endl;
|
||||
}
|
||||
} catch (const sdbus::Error& e) {
|
||||
os << "Error: " << e.what() << std::endl;
|
||||
os << "Type of value: " << v.peekValueType()
|
||||
<< std::endl;
|
||||
}
|
||||
}},
|
||||
{"a(ayuayu)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
try {
|
||||
for (const auto& tuple :
|
||||
v.get<std::vector<sdbus::Struct<
|
||||
std::vector<std::uint8_t>, std::uint32_t,
|
||||
std::vector<std::uint8_t>,
|
||||
std::uint32_t>>>()) {
|
||||
os << "\t";
|
||||
for (const auto& b : std::get<0>(tuple)) {
|
||||
os << std::hex << std::setw(2)
|
||||
<< std::setfill('0') << static_cast<int>(b)
|
||||
<< " ";
|
||||
}
|
||||
os << ", " << std::to_string(std::get<1>(tuple))
|
||||
<< ", ";
|
||||
for (const auto& b : std::get<2>(tuple)) {
|
||||
os << std::hex << std::setw(2)
|
||||
<< std::setfill('0') << static_cast<int>(b)
|
||||
<< " ";
|
||||
}
|
||||
os << ", " << std::to_string(std::get<3>(tuple))
|
||||
<< std::endl;
|
||||
}
|
||||
} catch (const sdbus::Error& e) {
|
||||
os << "Error: " << e.what() << std::endl;
|
||||
os << "Type of value: " << v.peekValueType()
|
||||
<< std::endl;
|
||||
}
|
||||
}},
|
||||
{"aa{sv}",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& arg_a_sv :
|
||||
v.get<std::vector<
|
||||
std::map<std::string, sdbus::Variant>>>()) {
|
||||
for (const auto& [key, value] : arg_a_sv) {
|
||||
os << "\t" << key << ": ";
|
||||
append_property(value, os);
|
||||
}
|
||||
}
|
||||
}},
|
||||
{"(tt)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
const auto arg_tt =
|
||||
v.get<sdbus::Struct<uint64_t, uint64_t>>();
|
||||
os << "\t" << std::get<0>(arg_tt) << ": "
|
||||
<< std::get<1>(arg_tt);
|
||||
}},
|
||||
{"(ttt)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
const auto arg_ttt = v.get<
|
||||
sdbus::Struct<uint64_t, uint64_t, uint64_t>>();
|
||||
os << "\t" << std::get<0>(arg_ttt) << ": "
|
||||
<< std::get<1>(arg_ttt) << ": "
|
||||
<< std::get<2>(arg_ttt);
|
||||
}},
|
||||
{"(tttt)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
const auto arg_tttt =
|
||||
v.get<sdbus::Struct<uint64_t, uint64_t, uint64_t,
|
||||
uint64_t>>();
|
||||
os << "\t" << std::get<0>(arg_tttt) << ": "
|
||||
<< std::get<1>(arg_tttt) << ": "
|
||||
<< std::get<2>(arg_tttt) << ": "
|
||||
<< std::get<3>(arg_tttt);
|
||||
}},
|
||||
{"(so)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
const auto arg_so = v.get<
|
||||
sdbus::Struct<std::string, sdbus::ObjectPath>>();
|
||||
os << "\t" << std::get<0>(arg_so) << ": "
|
||||
<< std::get<1>(arg_so);
|
||||
}},
|
||||
{"(st)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
const auto arg_st =
|
||||
v.get<sdbus::Struct<std::string, std::uint64_t>>();
|
||||
os << "\t" << std::get<0>(arg_st) << ": "
|
||||
<< std::get<1>(arg_st);
|
||||
}},
|
||||
{"(uo)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
const auto arg_uo = v.get<
|
||||
sdbus::Struct<std::uint32_t, sdbus::ObjectPath>>();
|
||||
os << "\t" << std::get<0>(arg_uo) << ": "
|
||||
<< std::get<1>(arg_uo);
|
||||
}},
|
||||
{"a(isb)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& arg_a_isb :
|
||||
v.get<std::vector<sdbus::Struct<
|
||||
std::int32_t, std::string, bool>>>()) {
|
||||
os << "\t" << std::get<0>(arg_a_isb) << ": "
|
||||
<< std::get<1>(arg_a_isb) << ": "
|
||||
<< (std::get<2>(arg_a_isb) ? "True" : "False");
|
||||
}
|
||||
}},
|
||||
{"(iiay)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
auto args =
|
||||
v.get<sdbus::Struct<std::int32_t, std::int32_t,
|
||||
std::vector<std::uint8_t>>>();
|
||||
os << "\t" << std::get<0>(args) << ": "
|
||||
<< std::get<1>(args) << ": ";
|
||||
for (const auto& b : std::get<2>(args)) {
|
||||
os << std::hex << std::setw(2) << std::setfill('0')
|
||||
<< static_cast<int>(b) << " ";
|
||||
}
|
||||
}},
|
||||
{"a(iiay)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& arg_a_iiay :
|
||||
v.get<std::vector<
|
||||
sdbus::Struct<std::int32_t, std::int32_t,
|
||||
std::vector<std::uint8_t>>>>()) {
|
||||
os << "\t" << std::get<0>(arg_a_iiay) << ": "
|
||||
<< std::get<1>(arg_a_iiay) << ": ";
|
||||
for (const auto& b : std::get<2>(arg_a_iiay)) {
|
||||
os << std::hex << std::setw(2) << std::setfill('0')
|
||||
<< static_cast<int>(b) << " ";
|
||||
}
|
||||
}
|
||||
}},
|
||||
{"(iiayqs)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
auto arg_iiayqs =
|
||||
v.get<sdbus::Struct<std::int32_t, std::int32_t,
|
||||
std::vector<std::uint8_t>,
|
||||
std::uint16_t, std::string>>();
|
||||
os << "\t" << std::get<0>(arg_iiayqs) << ", "
|
||||
<< std::get<1>(arg_iiayqs) << ", ";
|
||||
for (const auto& b : std::get<2>(arg_iiayqs)) {
|
||||
os << std::hex << std::setw(2) << std::setfill('0')
|
||||
<< static_cast<int>(b) << " ";
|
||||
}
|
||||
os << ", " << std::get<3>(arg_iiayqs) << ", "
|
||||
<< std::get<4>(arg_iiayqs);
|
||||
}},
|
||||
{"a(iiayqs)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& arg_a_iiayqs :
|
||||
v.get<std::vector<sdbus::Struct<
|
||||
std::int32_t, std::int32_t,
|
||||
std::vector<std::uint8_t>, std::uint16_t,
|
||||
std::string>>>()) {
|
||||
os << "\t" << std::get<0>(arg_a_iiayqs) << ", "
|
||||
<< std::get<1>(arg_a_iiayqs) << ", ";
|
||||
for (const auto& b : std::get<2>(arg_a_iiayqs)) {
|
||||
os << std::hex << std::setw(2) << std::setfill('0')
|
||||
<< static_cast<int>(b) << " ";
|
||||
}
|
||||
os << ", " << std::get<3>(arg_a_iiayqs) << ", "
|
||||
<< std::get<4>(arg_a_iiayqs);
|
||||
}
|
||||
}},
|
||||
{"a(so)",
|
||||
[](const sdbus::Variant& v, std::ostringstream& os) {
|
||||
os << std::endl;
|
||||
for (const auto& arg_so :
|
||||
v.get<std::vector<sdbus::Struct<
|
||||
std::string, sdbus::ObjectPath>>>()) {
|
||||
os << "\t" << std::get<0>(arg_so) << ": "
|
||||
<< std::get<1>(arg_so);
|
||||
}
|
||||
}}};
|
||||
} // namespace plugin_common_sdbus
|
||||
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
* Copyright 2024 Toyota Connected North America
|
||||
* Copyright (c) 2025 Joel Winarske
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#ifndef PLUGINS_COMMON_SDBUS_UTILS_UTILS_H_
|
||||
#define PLUGINS_COMMON_SDBUS_UTILS_UTILS_H_
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
#include <sdbus-c++/sdbus-c++.h>
|
||||
|
||||
namespace plugin_common_sdbus {
|
||||
class Utils {
|
||||
public:
|
||||
static void append_property(const sdbus::Variant& value,
|
||||
std::ostringstream& os);
|
||||
|
||||
static void append_properties(
|
||||
const std::map<sdbus::MemberName, sdbus::Variant>& props,
|
||||
std::ostringstream& os);
|
||||
|
||||
static void append_properties(
|
||||
const std::map<std::string, sdbus::Variant>& props,
|
||||
std::ostringstream& os);
|
||||
|
||||
static void print_changed_properties(
|
||||
const sdbus::InterfaceName& interfaceName,
|
||||
const std::map<sdbus::PropertyName, sdbus::Variant>& changedProperties,
|
||||
const std::vector<sdbus::PropertyName>& invalidatedProperties);
|
||||
|
||||
static std::vector<std::string> ListNames(sdbus::IConnection& connection);
|
||||
|
||||
static bool isServicePresent(const std::vector<std::string>& dbus_interfaces,
|
||||
const std::string_view& service);
|
||||
|
||||
private:
|
||||
static const std::unordered_map<
|
||||
std::string_view,
|
||||
std::function<void(const sdbus::Variant&, std::ostringstream&)>>
|
||||
type_map_;
|
||||
};
|
||||
} // namespace plugin_common_sdbus
|
||||
#endif // PLUGINS_COMMON_SDBUS_UTILS_UTILS_H_
|
||||
Reference in New Issue
Block a user