Compare commits
16 Commits
ad12ee1ad8
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 434521a435 | |||
| 8bbba2e236 | |||
| b7e88b36ce | |||
|
|
c45dceaf0e | ||
|
|
9af89bd180 | ||
| afba0fa335 | |||
|
|
2cfde5a685 | ||
|
|
776206c9bb | ||
|
|
c2673a0345 | ||
|
|
e4fd86a6d4 | ||
|
|
4e133de5b2 | ||
| 51c6fb4bba | |||
|
|
3f34efd244 | ||
|
|
ecca565f3f | ||
|
|
4fd0550de3 | ||
| 49d1b71565 |
@@ -68,7 +68,6 @@ if (ASIO_LIBRARY)
|
|||||||
|
|
||||||
set(ADC_NETWORK_HEADERS ${ADC_NETWORK_HEADERS}
|
set(ADC_NETWORK_HEADERS ${ADC_NETWORK_HEADERS}
|
||||||
net/asio/adc_netservice_asio.h
|
net/asio/adc_netservice_asio.h
|
||||||
net/asio/adc_netsession_asio.h
|
|
||||||
net/asio/adc_device_netserver_asio.h
|
net/asio/adc_device_netserver_asio.h
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -168,12 +167,17 @@ if (BUILD_TESTS)
|
|||||||
set(DEVATTR_TEST_APP adc_devattr_test)
|
set(DEVATTR_TEST_APP adc_devattr_test)
|
||||||
add_executable(${DEVATTR_TEST_APP} tests/adc_devattr_test.cpp)
|
add_executable(${DEVATTR_TEST_APP} tests/adc_devattr_test.cpp)
|
||||||
|
|
||||||
|
set(DEV_TEST_APP adc_dev_test)
|
||||||
|
add_executable(${DEV_TEST_APP} tests/adc_dev_test.cpp)
|
||||||
|
|
||||||
set(NETMSG_TEST_APP adc_netmsg_test)
|
set(NETMSG_TEST_APP adc_netmsg_test)
|
||||||
add_executable(${NETMSG_TEST_APP} tests/adc_netmsg_test.cpp)
|
add_executable(${NETMSG_TEST_APP} tests/adc_netmsg_test.cpp)
|
||||||
|
|
||||||
set(NETSERVICE_TEST_APP adc_netservice_test)
|
set(NETSERVICE_TEST_APP adc_netservice_test)
|
||||||
add_executable(${NETSERVICE_TEST_APP} tests/adc_netservice_test.cpp)
|
add_executable(${NETSERVICE_TEST_APP} tests/adc_netservice_test.cpp)
|
||||||
target_link_libraries(${NETSERVICE_TEST_APP} OpenSSL::SSL OpenSSL::Crypto)
|
if (OPENSSL_LIBRARY)
|
||||||
|
target_link_libraries(${NETSERVICE_TEST_APP} OpenSSL::SSL OpenSSL::Crypto)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (ASIO_LIBRARY)
|
if (ASIO_LIBRARY)
|
||||||
find_package(cxxopts CONFIG)
|
find_package(cxxopts CONFIG)
|
||||||
|
|||||||
@@ -84,37 +84,43 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <traits::formattable... ArgTs>
|
template <traits::formattable... ArgTs>
|
||||||
void logCritical(std::format_string<ArgTs...> fmt, ArgTs&&... args)
|
void logMessage(spdlog::level::level_enum level, spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
|
||||||
|
{
|
||||||
|
_loggerSPtr->log(level, fmt, std::forward<ArgTs>(args)...);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <traits::formattable... ArgTs>
|
||||||
|
void logCritical(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
|
||||||
{
|
{
|
||||||
_loggerSPtr->log(spdlog::level::critical, fmt, std::forward<ArgTs>(args)...);
|
_loggerSPtr->log(spdlog::level::critical, fmt, std::forward<ArgTs>(args)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::formattable... ArgTs>
|
template <typename... ArgTs>
|
||||||
void logError(std::format_string<ArgTs...> fmt, ArgTs&&... args)
|
void logError(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
|
||||||
{
|
{
|
||||||
_loggerSPtr->log(spdlog::level::err, fmt, std::forward<ArgTs>(args)...);
|
_loggerSPtr->log(spdlog::level::err, fmt, std::forward<ArgTs>(args)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::formattable... ArgTs>
|
template <traits::formattable... ArgTs>
|
||||||
void logWarn(std::format_string<ArgTs...> fmt, ArgTs&&... args)
|
void logWarn(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
|
||||||
{
|
{
|
||||||
_loggerSPtr->log(spdlog::level::warn, fmt, std::forward<ArgTs>(args)...);
|
_loggerSPtr->log(spdlog::level::warn, fmt, std::forward<ArgTs>(args)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::formattable... ArgTs>
|
template <traits::formattable... ArgTs>
|
||||||
void logInfo(std::format_string<ArgTs...> fmt, ArgTs&&... args)
|
void logInfo(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
|
||||||
{
|
{
|
||||||
_loggerSPtr->log(spdlog::level::info, fmt, std::forward<ArgTs>(args)...);
|
_loggerSPtr->log(spdlog::level::info, fmt, std::forward<ArgTs>(args)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::formattable... ArgTs>
|
template <traits::formattable... ArgTs>
|
||||||
void logDebug(std::format_string<ArgTs...> fmt, ArgTs&&... args)
|
void logDebug(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
|
||||||
{
|
{
|
||||||
_loggerSPtr->log(spdlog::level::debug, fmt, std::forward<ArgTs>(args)...);
|
_loggerSPtr->log(spdlog::level::debug, fmt, std::forward<ArgTs>(args)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::formattable... ArgTs>
|
template <traits::formattable... ArgTs>
|
||||||
void logTrace(std::format_string<ArgTs...> fmt, ArgTs&&... args)
|
void logTrace(spdlog::format_string_t<ArgTs...> fmt, ArgTs&&... args)
|
||||||
{
|
{
|
||||||
_loggerSPtr->log(spdlog::level::trace, fmt, std::forward<ArgTs>(args)...);
|
_loggerSPtr->log(spdlog::level::trace, fmt, std::forward<ArgTs>(args)...);
|
||||||
}
|
}
|
||||||
@@ -133,7 +139,7 @@ protected:
|
|||||||
|
|
||||||
ptrn += " [";
|
ptrn += " [";
|
||||||
std::ranges::copy(mark, std::back_inserter(ptrn));
|
std::ranges::copy(mark, std::back_inserter(ptrn));
|
||||||
ptrn += "] ";
|
ptrn += "]";
|
||||||
|
|
||||||
std::ranges::copy(_currentLogPattern | std::views::drop(pos), std::back_inserter(ptrn));
|
std::ranges::copy(_currentLogPattern | std::views::drop(pos), std::back_inserter(ptrn));
|
||||||
|
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ public:
|
|||||||
template <typename... CtorArgTs>
|
template <typename... CtorArgTs>
|
||||||
AdcGenericDevice& addAttribute(CtorArgTs&&... ctor_args)
|
AdcGenericDevice& addAttribute(CtorArgTs&&... ctor_args)
|
||||||
{
|
{
|
||||||
return addAttribute({std::forward<CtorArgTs>(ctor_args)...});
|
return addAttribute(AttributeT(std::forward<CtorArgTs>(ctor_args)...));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -202,9 +202,22 @@ protected:
|
|||||||
template <typename VT>
|
template <typename VT>
|
||||||
inline static std::unordered_map<const AdcDeviceAttribute*, std::function<void(const VT&)>> _setterFunc{};
|
inline static std::unordered_map<const AdcDeviceAttribute*, std::function<void(const VT&)>> _setterFunc{};
|
||||||
|
|
||||||
std::function<SerializedT()> _serializerFunc;
|
// from user to inner type converter
|
||||||
|
template <typename UT>
|
||||||
|
inline static std::unordered_map<const AdcDeviceAttribute*,
|
||||||
|
std::function<void(const UT&, const AdcDeviceAttribute*)>>
|
||||||
|
_convFuncTo{};
|
||||||
|
|
||||||
std::function<void(const SerializedT&)> _deserializerFunc;
|
// from innner to user type converter
|
||||||
|
template <typename UT>
|
||||||
|
inline static std::unordered_map<const AdcDeviceAttribute*, std::function<UT(const AdcDeviceAttribute*)>>
|
||||||
|
_convFuncFrom{};
|
||||||
|
|
||||||
|
// std::function<SerializedT()> _serializerFunc;
|
||||||
|
std::function<SerializedT(const AdcDeviceAttribute*)> _serializerFunc;
|
||||||
|
|
||||||
|
// std::function<void(const SerializedT&)> _deserializerFunc;
|
||||||
|
std::function<void(const SerializedT&, const AdcDeviceAttribute*)> _deserializerFunc;
|
||||||
|
|
||||||
// static inline std::vector<std::function<void(AdcDeviceAttribute*)>> _clearFunc{};
|
// static inline std::vector<std::function<void(AdcDeviceAttribute*)>> _clearFunc{};
|
||||||
std::vector<std::function<void(AdcDeviceAttribute*)>> _clearFunc{};
|
std::vector<std::function<void(AdcDeviceAttribute*)>> _clearFunc{};
|
||||||
@@ -254,34 +267,50 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
if constexpr (!std::is_null_pointer_v<GT> && !std::is_null_pointer_v<SRT>) {
|
if constexpr (!std::is_null_pointer_v<GT> && !std::is_null_pointer_v<SRT>) {
|
||||||
auto& getter_func = _getterFunc<ValueT>[this];
|
// auto& getter_func = _getterFunc<ValueT>[this];
|
||||||
_serializerFunc = [getter_func, wrapper = traits::adc_pf_wrapper(std::forward<SRT>(serializer)), this]() {
|
// _serializerFunc = [getter_func, wrapper = traits::adc_pf_wrapper(std::forward<SRT>(serializer)), this]()
|
||||||
auto& serializer = std::get<0>(wrapper);
|
// {
|
||||||
|
_serializerFunc =
|
||||||
|
[wrapper = traits::adc_pf_wrapper(std::forward<SRT>(serializer))](const AdcDeviceAttribute* inst) {
|
||||||
|
auto& serializer = std::get<0>(wrapper);
|
||||||
|
|
||||||
// auto val = _getterFunc<ValueT>[this]();
|
// auto val = _getterFunc<ValueT>[this]();
|
||||||
auto val = getter_func();
|
auto val = _getterFunc<ValueT>[inst]();
|
||||||
|
// auto val = getter_func();
|
||||||
|
|
||||||
return serializer(val);
|
return serializer(val);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if constexpr (!std::is_null_pointer_v<ST> && !std::is_null_pointer_v<DSRT>) {
|
if constexpr (!std::is_null_pointer_v<ST> && !std::is_null_pointer_v<DSRT>) {
|
||||||
auto& setter_func = _setterFunc<ValueT>[this];
|
// auto& setter_func = _setterFunc<ValueT>[this];
|
||||||
_deserializerFunc = [setter_func, wrapper = traits::adc_pf_wrapper(std::forward<DSRT>(deserializer)),
|
// _deserializerFunc = [setter_func, wrapper = traits::adc_pf_wrapper(std::forward<DSRT>(deserializer)),
|
||||||
this](const SerializedT& sval) {
|
// this](const SerializedT& sval) {
|
||||||
|
_deserializerFunc = [wrapper = traits::adc_pf_wrapper(std::forward<DSRT>(deserializer))](
|
||||||
|
const SerializedT& sval, const AdcDeviceAttribute* inst) {
|
||||||
auto& deserializer = std::get<0>(wrapper);
|
auto& deserializer = std::get<0>(wrapper);
|
||||||
|
|
||||||
ValueT val = deserializer(sval);
|
ValueT val = deserializer(sval);
|
||||||
|
|
||||||
// _setterFunc<ValueT>[this](val);
|
// _setterFunc<ValueT>[this](val);
|
||||||
setter_func(val);
|
_setterFunc<ValueT>[inst](val);
|
||||||
|
// setter_func(val);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_convFuncTo<ValueT>[this] = [](const ValueT& v, const AdcDeviceAttribute* inst) {
|
||||||
|
_setterFunc<ValueT>[inst](v);
|
||||||
|
};
|
||||||
|
|
||||||
|
_convFuncFrom<ValueT>[this] = [](const AdcDeviceAttribute* inst) { return _getterFunc<ValueT>[inst](); };
|
||||||
|
|
||||||
_clearFunc.emplace_back([](AdcDeviceAttribute* inst) {
|
_clearFunc.emplace_back([](AdcDeviceAttribute* inst) {
|
||||||
_getterFunc<ValueT>.erase(inst);
|
_getterFunc<ValueT>.erase(inst);
|
||||||
_setterFunc<ValueT>.erase(inst);
|
_setterFunc<ValueT>.erase(inst);
|
||||||
|
|
||||||
|
_convFuncFrom<ValueT>.erase(inst);
|
||||||
|
_convFuncTo<ValueT>.erase(inst);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@@ -289,12 +318,18 @@ public:
|
|||||||
_copyFunc.emplace_back([](const AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
_copyFunc.emplace_back([](const AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
||||||
_getterFunc<ValueT>.emplace(to, _getterFunc<ValueT>[from]);
|
_getterFunc<ValueT>.emplace(to, _getterFunc<ValueT>[from]);
|
||||||
_setterFunc<ValueT>.emplace(to, _setterFunc<ValueT>[from]);
|
_setterFunc<ValueT>.emplace(to, _setterFunc<ValueT>[from]);
|
||||||
|
|
||||||
|
_convFuncFrom<ValueT>.emplace(to, _convFuncFrom<ValueT>[from]);
|
||||||
|
_convFuncTo<ValueT>.emplace(to, _convFuncTo<ValueT>[from]);
|
||||||
});
|
});
|
||||||
|
|
||||||
// move instance function
|
// move instance function
|
||||||
_moveFunc.emplace_back([](AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
_moveFunc.emplace_back([](AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
||||||
_getterFunc<ValueT>.emplace(to, std::move(_getterFunc<ValueT>[from]));
|
_getterFunc<ValueT>.emplace(to, std::move(_getterFunc<ValueT>[from]));
|
||||||
_setterFunc<ValueT>.emplace(to, std::move(_setterFunc<ValueT>[from]));
|
_setterFunc<ValueT>.emplace(to, std::move(_setterFunc<ValueT>[from]));
|
||||||
|
|
||||||
|
_convFuncFrom<ValueT>.emplace(to, std::move(_convFuncFrom<ValueT>[from]));
|
||||||
|
_convFuncTo<ValueT>.emplace(to, std::move(_convFuncTo<ValueT>[from]));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -409,9 +444,13 @@ public:
|
|||||||
fn(&other, this);
|
fn(&other, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
_copyFunc = std::move(other._copyFunc);
|
// _copyFunc = std::move(other._copyFunc);
|
||||||
_moveFunc = std::move(other._moveFunc);
|
// _moveFunc = std::move(other._moveFunc);
|
||||||
_clearFunc = std::move(other._clearFunc);
|
// _clearFunc = std::move(other._clearFunc);
|
||||||
|
|
||||||
|
_copyFunc = other._copyFunc;
|
||||||
|
_moveFunc = other._moveFunc;
|
||||||
|
_clearFunc = other._clearFunc;
|
||||||
|
|
||||||
_ident = std::move(other._ident);
|
_ident = std::move(other._ident);
|
||||||
_accessType = std::move(other._accessType);
|
_accessType = std::move(other._accessType);
|
||||||
@@ -457,54 +496,86 @@ public:
|
|||||||
"Deduced attribute internal type must not be std::nullptr_t!!!");
|
"Deduced attribute internal type must not be std::nullptr_t!!!");
|
||||||
static_assert(!std::is_null_pointer_v<user_t>, "Deduced user-defined type must not be std::nullptr_t!!!");
|
static_assert(!std::is_null_pointer_v<user_t>, "Deduced user-defined type must not be std::nullptr_t!!!");
|
||||||
|
|
||||||
|
// return *this;
|
||||||
try {
|
try {
|
||||||
if (_accessType != AdcDeviceAttribute::WriteOnly) {
|
if (_accessType != AdcDeviceAttribute::WriteOnly) {
|
||||||
auto& getter = _getterFunc<value_t>.at(this); // throw out_of_range if value_t is invalid
|
// auto& getter = _getterFunc<value_t>.at(this); // throw out_of_range if value_t is invalid
|
||||||
|
|
||||||
_getterFunc<user_t>[this] =
|
_convFuncFrom<user_t>[this] = [wrapper = traits::adc_pf_wrapper(std::forward<FromFuncT>(
|
||||||
[getter, wrapper = traits::adc_pf_wrapper(std::forward<FromFuncT>(func_from_internal)), this]() {
|
func_from_internal))](const AdcDeviceAttribute* inst) {
|
||||||
// auto val = _getterFunc<value_t>.at(this)(); // throw out_of_range if value_t is invalid
|
auto val = _getterFunc<value_t>[inst]();
|
||||||
auto val = getter();
|
return std::get<0>(wrapper)(val); // convert from internal type
|
||||||
return std::get<0>(wrapper)(val); // convert from internal type
|
};
|
||||||
};
|
// _getterFunc<user_t>.try_emplace(
|
||||||
|
// this, [getter = _getterFunc<value_t>.at(this),
|
||||||
|
// wrapper = traits::adc_pf_wrapper(std::forward<FromFuncT>(func_from_internal))]() {
|
||||||
|
// auto val = getter();
|
||||||
|
// return std::get<0>(wrapper)(val); // convert from internal type
|
||||||
|
// });
|
||||||
|
// _getterFunc<user_t>[this] =
|
||||||
|
// [getter = _getterFunc<value_t>.at(this),
|
||||||
|
// wrapper = traits::adc_pf_wrapper(std::forward<FromFuncT>(func_from_internal))]() {
|
||||||
|
// auto val = getter();
|
||||||
|
// return std::get<0>(wrapper)(val); // convert from internal type
|
||||||
|
// };
|
||||||
|
|
||||||
|
// _getterFunc<user_t>[this] =
|
||||||
|
// [getter, wrapper = traits::adc_pf_wrapper(std::forward<FromFuncT>(func_from_internal)), this]() {
|
||||||
|
// // auto val = _getterFunc<value_t>.at(this)(); // throw out_of_range if value_t is invalid
|
||||||
|
// auto val = getter();
|
||||||
|
// return std::get<0>(wrapper)(val); // convert from internal type
|
||||||
|
// };
|
||||||
} // ignore "from_internal" conversional function for write-only attribute
|
} // ignore "from_internal" conversional function for write-only attribute
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (_accessType != AdcDeviceAttribute::ReadOnly) {
|
if (_accessType != AdcDeviceAttribute::ReadOnly) {
|
||||||
auto& setter = _setterFunc<value_t>.at(this); // throw out_of_range if value_t is invalid
|
_convFuncTo<user_t>[this] = [wrapper = traits::adc_pf_wrapper(std::forward<ToFuncT>(func_to_internal))](
|
||||||
|
const user_t& val, const AdcDeviceAttribute* inst) {
|
||||||
_setterFunc<user_t>[this] = [setter,
|
|
||||||
wrapper = traits::adc_pf_wrapper(std::forward<ToFuncT>(func_to_internal)),
|
|
||||||
this](const user_t& val) {
|
|
||||||
value_t value = std::get<0>(wrapper)(val); // convert to internal type
|
value_t value = std::get<0>(wrapper)(val); // convert to internal type
|
||||||
|
_setterFunc<value_t>[inst](value);
|
||||||
// throw out_of_range if value_t is invalid
|
|
||||||
// _setterFunc<value_t>.at(this)(value);
|
|
||||||
setter(value);
|
|
||||||
};
|
};
|
||||||
|
// auto& setter = _setterFunc<value_t>.at(this); // throw out_of_range if value_t is invalid
|
||||||
|
|
||||||
|
// _setterFunc<user_t>[this] = [setter,
|
||||||
|
// wrapper =
|
||||||
|
// traits::adc_pf_wrapper(std::forward<ToFuncT>(func_to_internal)),
|
||||||
|
// this](const user_t& val) {
|
||||||
|
// value_t value = std::get<0>(wrapper)(val); // convert to internal type
|
||||||
|
|
||||||
|
// // throw out_of_range if value_t is invalid
|
||||||
|
// // _setterFunc<value_t>.at(this)(value);
|
||||||
|
// setter(value);
|
||||||
|
// };
|
||||||
} // ignore "to_internal" conversional function for read-only attribute
|
} // ignore "to_internal" conversional function for read-only attribute
|
||||||
} catch (const std::out_of_range&) {
|
} catch (const std::out_of_range&) {
|
||||||
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_INTERNAL_TYPE_MISMATCH);
|
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_INTERNAL_TYPE_MISMATCH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// return *this;
|
||||||
_clearFunc.emplace_back([](AdcDeviceAttribute* inst) {
|
_clearFunc.emplace_back([](AdcDeviceAttribute* inst) {
|
||||||
_getterFunc<user_t>.erase(inst);
|
// _getterFunc<user_t>.erase(inst);
|
||||||
_setterFunc<user_t>.erase(inst);
|
// _setterFunc<user_t>.erase(inst);
|
||||||
|
_convFuncFrom<user_t>.erase(inst);
|
||||||
|
_convFuncTo<user_t>.erase(inst);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// copy instance functions
|
// copy instance functions
|
||||||
_copyFunc.emplace_back([](const AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
_copyFunc.emplace_back([](const AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
||||||
_getterFunc<user_t>.emplace(to, _getterFunc<user_t>[from]);
|
// _getterFunc<user_t>.emplace(to, _getterFunc<user_t>[from]);
|
||||||
_setterFunc<user_t>.emplace(to, _setterFunc<user_t>[from]);
|
// _setterFunc<user_t>.emplace(to, _setterFunc<user_t>[from]);
|
||||||
|
_convFuncFrom<user_t>.emplace(to, _convFuncFrom<user_t>[from]);
|
||||||
|
_convFuncTo<user_t>.emplace(to, _convFuncTo<user_t>[from]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// move instance functions
|
// move instance functions
|
||||||
_moveFunc.emplace_back([](AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
_moveFunc.emplace_back([](AdcDeviceAttribute* from, AdcDeviceAttribute* to) {
|
||||||
_getterFunc<user_t>.emplace(to, std::move(_getterFunc<user_t>[from]));
|
// _getterFunc<user_t>.emplace(to, std::move(_getterFunc<user_t>[from]));
|
||||||
_setterFunc<user_t>.emplace(to, std::move(_setterFunc<user_t>[from]));
|
// _setterFunc<user_t>.emplace(to, std::move(_setterFunc<user_t>[from]));
|
||||||
|
_convFuncFrom<user_t>.emplace(to, std::move(_convFuncFrom<user_t>[from]));
|
||||||
|
_convFuncTo<user_t>.emplace(to, std::move(_convFuncTo<user_t>[from]));
|
||||||
});
|
});
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
@@ -520,7 +591,8 @@ public:
|
|||||||
using val_t = std::decay_t<UT>;
|
using val_t = std::decay_t<UT>;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return _getterFunc<val_t>.at(this)();
|
// return _getterFunc<val_t>.at(this)();
|
||||||
|
return _convFuncFrom<val_t>.at(this)(this);
|
||||||
} catch (const std::out_of_range&) {
|
} catch (const std::out_of_range&) {
|
||||||
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_NO_CONV_FUNC);
|
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_NO_CONV_FUNC);
|
||||||
}
|
}
|
||||||
@@ -537,7 +609,8 @@ public:
|
|||||||
using val_t = std::decay_t<UT>;
|
using val_t = std::decay_t<UT>;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
_setterFunc<val_t>.at(this)(std::forward<UT>(val));
|
// _setterFunc<val_t>.at(this)(std::forward<UT>(val));
|
||||||
|
_convFuncTo<val_t>.at(this)(std::forward<UT>(val), this);
|
||||||
} catch (const std::out_of_range&) {
|
} catch (const std::out_of_range&) {
|
||||||
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_NO_CONV_FUNC);
|
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_NO_CONV_FUNC);
|
||||||
}
|
}
|
||||||
@@ -574,9 +647,13 @@ public:
|
|||||||
fn(&other, this);
|
fn(&other, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
_copyFunc = std::move(other._copyFunc);
|
// _copyFunc = std::move(other._copyFunc);
|
||||||
_moveFunc = std::move(other._moveFunc);
|
// _moveFunc = std::move(other._moveFunc);
|
||||||
_clearFunc = std::move(other._clearFunc);
|
// _clearFunc = std::move(other._clearFunc);
|
||||||
|
|
||||||
|
_copyFunc = other._copyFunc;
|
||||||
|
_moveFunc = other._moveFunc;
|
||||||
|
_clearFunc = other._clearFunc;
|
||||||
|
|
||||||
_ident = std::move(other._ident);
|
_ident = std::move(other._ident);
|
||||||
_accessType = std::move(other._accessType);
|
_accessType = std::move(other._accessType);
|
||||||
@@ -593,7 +670,8 @@ public:
|
|||||||
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_WRITE_ONLY);
|
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_WRITE_ONLY);
|
||||||
}
|
}
|
||||||
|
|
||||||
return _serializerFunc();
|
// return _serializerFunc();
|
||||||
|
return _serializerFunc(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename ST>
|
template <typename ST>
|
||||||
@@ -616,7 +694,8 @@ public:
|
|||||||
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_READ_ONLY);
|
throw std::system_error(AdcDeviceAttributeErrorCode::ERROR_READ_ONLY);
|
||||||
}
|
}
|
||||||
|
|
||||||
_deserializerFunc(sval);
|
// _deserializerFunc(sval);
|
||||||
|
_deserializerFunc(sval, this);
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
@@ -628,7 +707,8 @@ public:
|
|||||||
using s_t = std::decay_t<ST>;
|
using s_t = std::decay_t<ST>;
|
||||||
|
|
||||||
if constexpr (traits::adc_input_char_range<s_t> && traits::adc_input_char_range<serialized_t>) {
|
if constexpr (traits::adc_input_char_range<s_t> && traits::adc_input_char_range<serialized_t>) {
|
||||||
_deserializerFunc(serialized_t(sval.begin(), sval.end()));
|
// _deserializerFunc(serialized_t(sval.begin(), sval.end()));
|
||||||
|
_deserializerFunc(serialized_t(sval.begin(), sval.end()), this);
|
||||||
} else {
|
} else {
|
||||||
static_assert(false, "INVALID USER SERIALIZATION TYPE!");
|
static_assert(false, "INVALID USER SERIALIZATION TYPE!");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,7 +112,6 @@ public:
|
|||||||
|
|
||||||
typedef std::vector<char> message_t;
|
typedef std::vector<char> message_t;
|
||||||
|
|
||||||
// Session(const netsession_ident_t& id, netservice_t srv, AdcDeviceNetServer* srv_ptr)
|
|
||||||
Session(const netsession_ident_t& id, netservice_t srv, netsession_ctx_t ctx)
|
Session(const netsession_ident_t& id, netservice_t srv, netsession_ctx_t ctx)
|
||||||
: _ident(id),
|
: _ident(id),
|
||||||
_netService(std::move(srv)),
|
_netService(std::move(srv)),
|
||||||
@@ -151,8 +150,77 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// general-purpose server communication methods
|
||||||
|
|
||||||
|
// blocking
|
||||||
|
template <traits::adc_range_of_output_char_range R, typename... ArgTs>
|
||||||
|
R serverCall(ServerResponseType& rtype, std::string_view key, ArgTs&&... args)
|
||||||
|
{
|
||||||
|
typename netservice_t::send_msg_t bytes;
|
||||||
|
|
||||||
|
AdcDeviceProtoMessage msg(bytes);
|
||||||
|
msg.setKeyValue(key, std::forward<ArgTs>(args)...);
|
||||||
|
|
||||||
|
return getFromServer<R>(key, bytes, rtype);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename... ArgTs>
|
||||||
|
default_server_resp_t serverCall(ServerResponseType& rtype, std::string_view key, ArgTs&&... args)
|
||||||
|
{
|
||||||
|
return serverCall<default_server_resp_t>(rtype, key, std::forward<ArgTs>(args)...);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// asynchronous
|
||||||
|
template <std::convertible_to<async_callback_func_t> CallbackT, typename... ArgTs>
|
||||||
|
auto asyncServerCall(std::string_view key, CallbackT&& callback_func, ArgTs&&... args)
|
||||||
|
{
|
||||||
|
auto bytes = std::shared_ptr<typename netservice_t::send_msg_t>();
|
||||||
|
|
||||||
|
AdcDeviceProtoMessage msg(*bytes);
|
||||||
|
msg.setKeyValue(key, std::forward<ArgTs>(args)...);
|
||||||
|
|
||||||
|
asyncSendRecv(*bytes, [bytes, key, wrapper = traits::adc_pf_wrapper(std::forward<CallbackT>(callback_func)),
|
||||||
|
this](auto err, auto rmsg) mutable {
|
||||||
|
if (err) {
|
||||||
|
_clientPtr->logError("An error occured while receiving server respond: {}",
|
||||||
|
netservice_t::formattableError(err));
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
ServerResponseType type;
|
||||||
|
auto attrs = checkServerCall<default_server_resp_t>(key, rmsg, type);
|
||||||
|
|
||||||
|
std::forward<CallbackT>(std::get<0>(wrapper))(type, attrs);
|
||||||
|
|
||||||
|
} catch (const std::system_error& err) {
|
||||||
|
_clientPtr->logError("An error occured while getting server respond: {}", err.what());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// ADC device helper methods (blocking)
|
// ADC device helper methods (blocking)
|
||||||
|
|
||||||
|
// send client HELLO-message
|
||||||
|
template <traits::adc_range_of_output_char_range R,
|
||||||
|
traits::adc_input_char_range SenderNameT,
|
||||||
|
typename... ParamTs>
|
||||||
|
R clientHello(ServerResponseType& rtype, SenderNameT&& name, ParamTs&&... params)
|
||||||
|
{
|
||||||
|
// expected respond: ACK HELLO ...
|
||||||
|
// return HELLO ... (or error description 'code category what')
|
||||||
|
return serverCall<R>(rtype, constants::ADC_DEVICE_NETPROTO_KEY_HELLO, std::forward<SenderNameT>(name),
|
||||||
|
std::forward<ParamTs>(params)...);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <traits::adc_input_char_range SenderNameT, typename... ParamTs>
|
||||||
|
default_server_resp_t clientHello(ServerResponseType& rtype, SenderNameT&& name, ParamTs&&... params)
|
||||||
|
{
|
||||||
|
return clientHello<default_server_resp_t>(rtype, std::forward<SenderNameT>(name),
|
||||||
|
std::forward<ParamTs>(params)...);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// get names of devices
|
// get names of devices
|
||||||
template <traits::adc_range_of_output_char_range R>
|
template <traits::adc_range_of_output_char_range R>
|
||||||
@@ -160,7 +228,7 @@ public:
|
|||||||
{
|
{
|
||||||
// expected respond: ACK NAMES DEV1 DEV2 ...
|
// expected respond: ACK NAMES DEV1 DEV2 ...
|
||||||
// return DEV1 DEV2 ... (or error description 'code category what')
|
// return DEV1 DEV2 ... (or error description 'code category what')
|
||||||
return deviceFuncHelper<R>(constants::ADC_DEVICE_NETPROTO_KEY_NAMES, rtype);
|
return serverCall<R>(rtype, constants::ADC_DEVICE_NETPROTO_KEY_NAMES);
|
||||||
}
|
}
|
||||||
|
|
||||||
default_server_resp_t deviceNames(ServerResponseType& rtype)
|
default_server_resp_t deviceNames(ServerResponseType& rtype)
|
||||||
@@ -170,51 +238,49 @@ public:
|
|||||||
|
|
||||||
// bind device to the client
|
// bind device to the client
|
||||||
template <traits::adc_range_of_output_char_range R, traits::adc_input_char_range DevNameT>
|
template <traits::adc_range_of_output_char_range R, traits::adc_input_char_range DevNameT>
|
||||||
R bindDevice(DevNameT&& dev_name, ServerResponseType& rtype)
|
R bindDevice(ServerResponseType& rtype, DevNameT&& dev_name)
|
||||||
{
|
{
|
||||||
// expected respond: ACK DEVICE DEV_NAME
|
// expected respond: ACK DEVICE DEV_NAME
|
||||||
// return DEV_NAME (or error description 'code category what')
|
// return DEV_NAME (or error description 'code category what')
|
||||||
return deviceFuncHelper<R>(constants::ADC_DEVICE_NETPROTO_KEY_DEVICE, rtype,
|
return serverCall<R>(rtype, constants::ADC_DEVICE_NETPROTO_KEY_DEVICE, std::forward<DevNameT>(dev_name));
|
||||||
std::forward<DevNameT>(dev_name));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::adc_input_char_range DevNameT>
|
template <traits::adc_input_char_range DevNameT>
|
||||||
default_server_resp_t bindDevice(DevNameT&& dev_name, ServerResponseType& rtype)
|
default_server_resp_t bindDevice(ServerResponseType& rtype, DevNameT&& dev_name)
|
||||||
{
|
{
|
||||||
return bindDevice<default_server_resp_t>(std::forward<DevNameT>(dev_name), rtype);
|
return bindDevice<default_server_resp_t>(rtype, std::forward<DevNameT>(dev_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// execute a command
|
// execute a command
|
||||||
template <traits::adc_range_of_output_char_range R, traits::adc_input_char_range CmdNameT>
|
template <traits::adc_range_of_output_char_range R, traits::adc_input_char_range CmdNameT>
|
||||||
R exec(CmdNameT&& cmd_name, ServerResponseType& rtype)
|
R exec(ServerResponseType& rtype, CmdNameT&& cmd_name)
|
||||||
{
|
{
|
||||||
// expected respond: ACK CMD CMD_NAME
|
// expected respond: ACK CMD CMD_NAME
|
||||||
// return CMD_NAME ... (or error description 'code category what')
|
// return CMD_NAME ... (or error description 'code category what')
|
||||||
return deviceFuncHelper<R>(constants::ADC_DEVICE_NETPROTO_KEY_CMD, rtype, std::forward<CmdNameT>(cmd_name));
|
return serverCall<R>(rtype, constants::ADC_DEVICE_NETPROTO_KEY_CMD, std::forward<CmdNameT>(cmd_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::adc_input_char_range CmdNameT>
|
template <traits::adc_input_char_range CmdNameT>
|
||||||
default_server_resp_t exec(CmdNameT&& cmd_name, ServerResponseType& rtype)
|
default_server_resp_t exec(ServerResponseType& rtype, CmdNameT&& cmd_name)
|
||||||
{
|
{
|
||||||
return exec<default_server_resp_t>(std::forward<CmdNameT>(cmd_name), rtype);
|
return exec<default_server_resp_t>(rtype, std::forward<CmdNameT>(cmd_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// get an attribute value
|
// get an attribute value
|
||||||
template <traits::adc_range_of_output_char_range R, traits::adc_input_char_range AttrNameT>
|
template <traits::adc_range_of_output_char_range R, traits::adc_input_char_range AttrNameT>
|
||||||
R getAttr(AttrNameT&& attr_name, ServerResponseType& rtype)
|
R getAttr(ServerResponseType& rtype, AttrNameT&& attr_name)
|
||||||
{
|
{
|
||||||
// expected respond: ACK GET ATTR_NAME ATTR_VALUE
|
// expected respond: ACK GET ATTR_NAME ATTR_VALUE
|
||||||
// return ATTR_NAME ATTR_VALUE (or error description 'code category what')
|
// return ATTR_NAME ATTR_VALUE (or error description 'code category what')
|
||||||
return deviceFuncHelper<R>(constants::ADC_DEVICE_NETPROTO_KEY_GET, rtype,
|
return serverCall<R>(rtype, constants::ADC_DEVICE_NETPROTO_KEY_GET, std::forward<AttrNameT>(attr_name));
|
||||||
std::forward<AttrNameT>(attr_name));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::adc_input_char_range AttrNameT>
|
template <traits::adc_input_char_range AttrNameT>
|
||||||
default_server_resp_t getAttr(AttrNameT&& attr_name, ServerResponseType& rtype)
|
default_server_resp_t getAttr(ServerResponseType& rtype, AttrNameT&& attr_name)
|
||||||
{
|
{
|
||||||
return getAttr<default_server_resp_t>(std::forward<AttrNameT>(attr_name), rtype);
|
return getAttr<default_server_resp_t>(rtype, std::forward<AttrNameT>(attr_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -227,8 +293,8 @@ public:
|
|||||||
{
|
{
|
||||||
// expected respond: ACK SET ATTR_NAME ATTR_VALUE
|
// expected respond: ACK SET ATTR_NAME ATTR_VALUE
|
||||||
// return ATTR_NAME ATTR_VALUE (or error description 'code category what')
|
// return ATTR_NAME ATTR_VALUE (or error description 'code category what')
|
||||||
return deviceFuncHelper<R>(constants::ADC_DEVICE_NETPROTO_KEY_SET, rtype, std::forward<ValueT>(value),
|
return serverCall<R>(constants::ADC_DEVICE_NETPROTO_KEY_SET, rtype, std::forward<AttrNameT>(attr_name),
|
||||||
std::forward<ValueTs>(values)...);
|
std::forward<ValueT>(value), std::forward<ValueTs>(values)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::adc_input_char_range AttrNameT, typename ValueT, typename... ValueTs>
|
template <traits::adc_input_char_range AttrNameT, typename ValueT, typename... ValueTs>
|
||||||
@@ -243,32 +309,40 @@ public:
|
|||||||
|
|
||||||
// ADC device helper methods (asynchronous)
|
// ADC device helper methods (asynchronous)
|
||||||
|
|
||||||
|
template <std::convertible_to<async_callback_func_t> CallbackT,
|
||||||
|
traits::adc_input_char_range SenderNameT,
|
||||||
|
typename... ParamTs>
|
||||||
|
auto asyncClientHello(CallbackT&& callback_func, SenderNameT&& name, ParamTs&&... params)
|
||||||
|
{
|
||||||
|
return asyncServerCall(constants::ADC_DEVICE_NETPROTO_KEY_HELLO, std::forward<CallbackT>(callback_func),
|
||||||
|
std::forward<SenderNameT>(name), std::forward<ParamTs>(params)...);
|
||||||
|
}
|
||||||
|
|
||||||
template <std::convertible_to<async_callback_func_t> CallbackT>
|
template <std::convertible_to<async_callback_func_t> CallbackT>
|
||||||
auto asyncDeviceNames(CallbackT&& callback_func)
|
auto asyncDeviceNames(CallbackT&& callback_func)
|
||||||
{
|
{
|
||||||
return asyncDeviceFuncHelper(constants::ADC_DEVICE_NETPROTO_KEY_NAMES,
|
return asyncServerCall(constants::ADC_DEVICE_NETPROTO_KEY_NAMES, std::forward<CallbackT>(callback_func));
|
||||||
std::forward<CallbackT>(callback_func));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <std::convertible_to<async_callback_func_t> CallbackT, traits::adc_input_char_range DevNameT>
|
template <std::convertible_to<async_callback_func_t> CallbackT, traits::adc_input_char_range DevNameT>
|
||||||
auto asyncBindDevice(CallbackT&& callback_func, DevNameT&& dev_name)
|
auto asyncBindDevice(CallbackT&& callback_func, DevNameT&& dev_name)
|
||||||
{
|
{
|
||||||
return asyncDeviceFuncHelper(constants::ADC_DEVICE_NETPROTO_KEY_DEVICE,
|
return asyncServerCall(constants::ADC_DEVICE_NETPROTO_KEY_DEVICE, std::forward<CallbackT>(callback_func),
|
||||||
std::forward<CallbackT>(callback_func), std::forward<DevNameT>(dev_name));
|
std::forward<DevNameT>(dev_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <std::convertible_to<async_callback_func_t> CallbackT, traits::adc_input_char_range CmdNameT>
|
template <std::convertible_to<async_callback_func_t> CallbackT, traits::adc_input_char_range CmdNameT>
|
||||||
auto asyncExec(CallbackT&& callback_func, CmdNameT&& cmd_name)
|
auto asyncExec(CallbackT&& callback_func, CmdNameT&& cmd_name)
|
||||||
{
|
{
|
||||||
return asyncDeviceFuncHelper(constants::ADC_DEVICE_NETPROTO_KEY_CMD, std::forward<CallbackT>(callback_func),
|
return asyncServerCall(constants::ADC_DEVICE_NETPROTO_KEY_CMD, std::forward<CallbackT>(callback_func),
|
||||||
std::forward<CmdNameT>(cmd_name));
|
std::forward<CmdNameT>(cmd_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <std::convertible_to<async_callback_func_t> CallbackT, traits::adc_input_char_range AttrNameT>
|
template <std::convertible_to<async_callback_func_t> CallbackT, traits::adc_input_char_range AttrNameT>
|
||||||
auto asyncGetAttr(CallbackT&& callback_func, AttrNameT&& attr_name)
|
auto asyncGetAttr(CallbackT&& callback_func, AttrNameT&& attr_name)
|
||||||
{
|
{
|
||||||
return asyncDeviceFuncHelper(constants::ADC_DEVICE_NETPROTO_KEY_GET, std::forward<CallbackT>(callback_func),
|
return asyncServerCall(constants::ADC_DEVICE_NETPROTO_KEY_GET, std::forward<CallbackT>(callback_func),
|
||||||
std::forward<AttrNameT>(attr_name));
|
std::forward<AttrNameT>(attr_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <std::convertible_to<async_callback_func_t> CallbackT,
|
template <std::convertible_to<async_callback_func_t> CallbackT,
|
||||||
@@ -277,9 +351,9 @@ public:
|
|||||||
typename... ValueTs>
|
typename... ValueTs>
|
||||||
auto asyncSetAttr(CallbackT&& callback_func, AttrNameT&& attr_name, ValueT&& value, ValueTs&&... values)
|
auto asyncSetAttr(CallbackT&& callback_func, AttrNameT&& attr_name, ValueT&& value, ValueTs&&... values)
|
||||||
{
|
{
|
||||||
return asyncDeviceFuncHelper(constants::ADC_DEVICE_NETPROTO_KEY_SET, std::forward<CallbackT>(callback_func),
|
return asyncServerCall(constants::ADC_DEVICE_NETPROTO_KEY_SET, std::forward<CallbackT>(callback_func),
|
||||||
std::forward<AttrNameT>(attr_name), std::forward<ValueT>(value),
|
std::forward<AttrNameT>(attr_name), std::forward<ValueT>(value),
|
||||||
std::forward<ValueTs>(values)...);
|
std::forward<ValueTs>(values)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
@@ -297,7 +371,7 @@ public:
|
|||||||
// helper methods
|
// helper methods
|
||||||
|
|
||||||
template <traits::adc_range_of_output_char_range R>
|
template <traits::adc_range_of_output_char_range R>
|
||||||
R checkServerRespond(std::string_view key, const auto& bytes, ServerResponseType& type) const
|
R checkServerCall(std::string_view key, const auto& bytes, ServerResponseType& type) const
|
||||||
{
|
{
|
||||||
AdcDeviceProtoMessage dev_msg(bytes);
|
AdcDeviceProtoMessage dev_msg(bytes);
|
||||||
|
|
||||||
@@ -321,47 +395,9 @@ public:
|
|||||||
{
|
{
|
||||||
auto rbytes = sendRecv(bytes);
|
auto rbytes = sendRecv(bytes);
|
||||||
|
|
||||||
return checkServerRespond<R>(key, rbytes, type);
|
return checkServerCall<R>(key, rbytes, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::adc_range_of_output_char_range R, typename... ArgTs>
|
|
||||||
R deviceFuncHelper(std::string_view key, ServerResponseType& rtype, ArgTs&&... args)
|
|
||||||
{
|
|
||||||
typename netservice_t::send_msg_t bytes;
|
|
||||||
|
|
||||||
AdcDeviceProtoMessage msg(bytes);
|
|
||||||
msg.setKeyValue(key, std::forward<ArgTs>(args)...);
|
|
||||||
|
|
||||||
return getFromServer<R>(key, bytes, rtype);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template <std::convertible_to<async_callback_func_t> CallbackT, typename... ArgTs>
|
|
||||||
auto asyncDeviceFuncHelper(std::string_view key, CallbackT&& callback_func, ArgTs&&... args)
|
|
||||||
{
|
|
||||||
auto bytes = std::shared_ptr<typename netservice_t::send_msg_t>();
|
|
||||||
|
|
||||||
AdcDeviceProtoMessage msg(*bytes);
|
|
||||||
msg.setKeyValue(key, std::forward<ArgTs>(args)...);
|
|
||||||
|
|
||||||
asyncSendRecv(*bytes, [bytes, key, wrapper = traits::adc_pf_wrapper(std::forward<CallbackT>(callback_func)),
|
|
||||||
this](auto err, auto rmsg) mutable {
|
|
||||||
if (err) {
|
|
||||||
_clientPtr->logError("An error occured while receiving server respond: {}",
|
|
||||||
netservice_t::formattableError(err));
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
ServerResponseType type;
|
|
||||||
auto attrs = checkServerRespond<default_server_resp_t>(key, rmsg, type);
|
|
||||||
|
|
||||||
std::forward<CallbackT>(std::get<0>(wrapper))(type, attrs);
|
|
||||||
|
|
||||||
} catch (const std::system_error& err) {
|
|
||||||
_clientPtr->logError("An error occured while getting server respond: {}", err.what());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
template <traits::adc_input_char_range SendMsgT>
|
template <traits::adc_input_char_range SendMsgT>
|
||||||
auto sendRecv(const SendMsgT& send_msg)
|
auto sendRecv(const SendMsgT& send_msg)
|
||||||
@@ -394,6 +430,8 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/* A HELPER CLASS TO IMPLEMENT AN SIMPLE QUEUE FOR DEVICE ATTRIBUTE GET/SET OPERATIONS AND COMMAND EXECUTION */
|
||||||
|
|
||||||
template <traits::adc_range_of_input_char_range ArgRangeT = std::vector<std::string>>
|
template <traits::adc_range_of_input_char_range ArgRangeT = std::vector<std::string>>
|
||||||
class AdcNetClientSendQueue
|
class AdcNetClientSendQueue
|
||||||
{
|
{
|
||||||
@@ -415,13 +453,13 @@ public:
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <traits::adc_input_char_range... ElemTs>
|
template <traits::adc_input_char_range... ArgTs>
|
||||||
AdcNetClientSendQueue& addToQueue(std::string key, ElemTs&&... elems)
|
AdcNetClientSendQueue& addToQueue(std::string key, ArgTs&&... elems)
|
||||||
{
|
{
|
||||||
if constexpr (sizeof...(ElemTs)) {
|
if constexpr (sizeof...(ArgTs)) {
|
||||||
_queue.push({key, ArgRangeT()});
|
_queue.push({key, ArgRangeT()});
|
||||||
|
|
||||||
addToQueueHelper(std::get<1>(_queue.back()), std::forward<ElemTs>(elems)...);
|
addToQueueHelper(std::get<1>(_queue.back()), std::forward<ArgTs>(elems)...);
|
||||||
}
|
}
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
@@ -463,17 +501,17 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
std::queue<queue_elem_t> _queue;
|
std::queue<queue_elem_t> _queue;
|
||||||
|
|
||||||
template <traits::adc_input_char_range ElemT, traits::adc_input_char_range... ElemTs>
|
template <traits::adc_input_char_range ArgT, traits::adc_input_char_range... ArgTs>
|
||||||
void addToQueueHelper(ArgRangeT& args, ElemT&& elem, ElemTs&&... elems)
|
void addToQueueHelper(ArgRangeT& args, ArgT&& elem, ArgTs&&... elems)
|
||||||
{
|
{
|
||||||
using el_t = std::ranges::range_value_t<ArgRangeT>;
|
using el_t = std::ranges::range_value_t<ArgRangeT>;
|
||||||
|
|
||||||
if constexpr (std::same_as<el_t, std::remove_cvref_t<ElemT>>) {
|
if constexpr (std::same_as<el_t, std::remove_cvref_t<ArgT>>) {
|
||||||
std::ranges::copy(std::ranges::single_view(elem), std::back_inserter(args));
|
std::ranges::copy(std::ranges::single_view(elem), std::back_inserter(args));
|
||||||
} else {
|
} else {
|
||||||
std::span<const char> sp;
|
std::span<const char> sp;
|
||||||
|
|
||||||
if constexpr (std::is_array_v<std::remove_cvref_t<ElemT>>) {
|
if constexpr (std::is_array_v<std::remove_cvref_t<ArgT>>) {
|
||||||
sp = std::string_view(elem);
|
sp = std::string_view(elem);
|
||||||
} else {
|
} else {
|
||||||
sp = std::span<const char>(elem);
|
sp = std::span<const char>(elem);
|
||||||
@@ -488,8 +526,8 @@ protected:
|
|||||||
std::back_inserter(args));
|
std::back_inserter(args));
|
||||||
}
|
}
|
||||||
|
|
||||||
if constexpr (sizeof...(ElemTs)) {
|
if constexpr (sizeof...(ArgTs)) {
|
||||||
addToQueue(args, std::forward<ElemTs>(elems)...);
|
addToQueue(args, std::forward<ArgTs>(elems)...);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -155,8 +155,8 @@ protected:
|
|||||||
CmdIdDeserialT&& cmd_id_deser_func = {})
|
CmdIdDeserialT&& cmd_id_deser_func = {})
|
||||||
: _id(id)
|
: _id(id)
|
||||||
{
|
{
|
||||||
_get_attr = [dev_ptr, wrapper = traits::adc_pf_wrapper(std::forward<AttrIdDeserialT>(attr_id_deser_func)),
|
_get_attr = [dev_ptr, wrapper = traits::adc_pf_wrapper(std::forward<AttrIdDeserialT>(attr_id_deser_func))](
|
||||||
this](const auto& attr_name) mutable {
|
const auto& attr_name) mutable {
|
||||||
auto attr_id = std::get<0>(wrapper)(attr_name);
|
auto attr_id = std::get<0>(wrapper)(attr_name);
|
||||||
auto& attr = (*dev_ptr)[attr_id];
|
auto& attr = (*dev_ptr)[attr_id];
|
||||||
// auto& attr = dev_ptr->operator[](attr_id);
|
// auto& attr = dev_ptr->operator[](attr_id);
|
||||||
@@ -344,7 +344,8 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (found) {
|
if (found) {
|
||||||
msg.ack(msg_t::DEVICE_KEY, attrs);
|
// msg.ack(msg_t::DEVICE_KEY, attrs);
|
||||||
|
msg.ack(constants::ADC_DEVICE_NETPROTO_KEY_DEVICE, attrs);
|
||||||
} else {
|
} else {
|
||||||
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_UNKNOWN_DEVICE_ID));
|
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_UNKNOWN_DEVICE_ID));
|
||||||
}
|
}
|
||||||
@@ -356,14 +357,17 @@ public:
|
|||||||
for (auto& [ptr, dev_wr] : _serverPtr->_devices) {
|
for (auto& [ptr, dev_wr] : _serverPtr->_devices) {
|
||||||
names.emplace_back(dev_wr.ident());
|
names.emplace_back(dev_wr.ident());
|
||||||
}
|
}
|
||||||
msg.ack(msg_t::NAMES_KEY, names);
|
// msg.ack(msg_t::NAMES_KEY, names);
|
||||||
|
msg.ack(constants::ADC_DEVICE_NETPROTO_KEY_NAMES, names);
|
||||||
} else if (msg.isHELLO()) {
|
} else if (msg.isHELLO()) {
|
||||||
msg.ack(msg_t::HELLO_KEY, _serverPtr->_serverIdent);
|
// msg.ack(msg_t::HELLO_KEY, _serverPtr->_serverIdent);
|
||||||
|
msg.ack(constants::ADC_DEVICE_NETPROTO_KEY_HELLO, _serverPtr->_serverIdent);
|
||||||
} else if (msg.isGET()) { // get attribute value
|
} else if (msg.isGET()) { // get attribute value
|
||||||
attrs = msg.template attrs<attr_vec_t>(0, 1);
|
attrs = msg.template attrs<attr_vec_t>(0, 1);
|
||||||
if (attrs.size()) {
|
if (attrs.size()) {
|
||||||
auto val = _bindDevice->getAttr(get_elem(0));
|
auto val = _bindDevice->getAttr(get_elem(0));
|
||||||
msg.ack(msg_t::GET_KEY, get_elem(0), val);
|
// msg.ack(msg_t::GET_KEY, get_elem(0), val);
|
||||||
|
msg.ack(constants::ADC_DEVICE_NETPROTO_KEY_GET, get_elem(0), val);
|
||||||
} else { // no attr name!
|
} else { // no attr name!
|
||||||
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_NO_PROTO_ATTRNAME));
|
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_NO_PROTO_ATTRNAME));
|
||||||
}
|
}
|
||||||
@@ -372,7 +376,8 @@ public:
|
|||||||
if (attrs.size() >= 2) {
|
if (attrs.size() >= 2) {
|
||||||
auto val = msg.template joinAttrs<serialized_t>(1);
|
auto val = msg.template joinAttrs<serialized_t>(1);
|
||||||
_bindDevice->setAttr(get_elem(0), val);
|
_bindDevice->setAttr(get_elem(0), val);
|
||||||
msg.ack(msg_t::SET_KEY, get_elem(0), val);
|
// msg.ack(msg_t::SET_KEY, get_elem(0), val);
|
||||||
|
msg.ack(constants::ADC_DEVICE_NETPROTO_KEY_SET, get_elem(0), val);
|
||||||
} else { // no attr name or its value!
|
} else { // no attr name or its value!
|
||||||
if (attrs.size() == 1) {
|
if (attrs.size() == 1) {
|
||||||
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_NO_PROTO_ATTRVALUE));
|
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_NO_PROTO_ATTRVALUE));
|
||||||
@@ -385,7 +390,8 @@ public:
|
|||||||
if (attrs.size()) {
|
if (attrs.size()) {
|
||||||
auto cmd_name = get_elem(0);
|
auto cmd_name = get_elem(0);
|
||||||
_bindDevice->exec(cmd_name);
|
_bindDevice->exec(cmd_name);
|
||||||
msg.ack(msg_t::CMD_KEY, cmd_name);
|
// msg.ack(msg_t::CMD_KEY, cmd_name);
|
||||||
|
msg.ack(constants::ADC_DEVICE_NETPROTO_KEY_CMD, cmd_name);
|
||||||
} else { // no cmd name!
|
} else { // no cmd name!
|
||||||
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_NO_PROTO_CMDNAME));
|
msg.err(std::make_error_code(AdcDeviceNetServerSessionError::ERROR_NO_PROTO_CMDNAME));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -304,6 +304,36 @@ public:
|
|||||||
return proto() == protoMarkWSS;
|
return proto() == protoMarkWSS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// add '\0' char (or replace special-meaning char/char-sequence) to construct UNIX abstract namespace
|
||||||
|
// endpoint path
|
||||||
|
template <typename T = std::nullptr_t>
|
||||||
|
AdcEndpoint& makeAbstract(const T& mark = nullptr)
|
||||||
|
requires(traits::adc_input_char_range<T> || std::same_as<std::remove_cv_t<T>, char> ||
|
||||||
|
std::is_null_pointer_v<std::remove_cv_t<T>>)
|
||||||
|
{
|
||||||
|
if (!(isLocalStream() || isLocalSeqpacket())) { // only local proto is valid!
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
if constexpr (std::is_null_pointer_v<T>) { // just insert '\0'
|
||||||
|
auto it = _endpoint.insert(std::string::const_iterator(_path.begin()), '\0');
|
||||||
|
_path = std::string_view(it, _endpoint.end());
|
||||||
|
} else if constexpr (std::same_as<std::remove_cv_t<T>, char>) { // replace a character (mark)
|
||||||
|
auto pos = std::distance(_endpoint.cbegin(), std::string::const_iterator(_path.begin()));
|
||||||
|
if (_endpoint[pos] == mark) {
|
||||||
|
_endpoint[pos] = '\0';
|
||||||
|
}
|
||||||
|
} else { // replace a character range (mark)
|
||||||
|
if (std::ranges::equal(_path | std::views::take(std::ranges::size(mark), mark))) {
|
||||||
|
auto pos = std::distance(_endpoint.cbegin(), std::string::const_iterator(_path.begin()));
|
||||||
|
_endpoint.replace(pos, std::ranges::size(mark), 1, '\0');
|
||||||
|
_path = std::string_view(_endpoint.begin() + pos, _endpoint.end());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::string _endpoint;
|
std::string _endpoint;
|
||||||
std::string_view _proto, _host, _path, _portView;
|
std::string_view _proto, _host, _path, _portView;
|
||||||
|
|||||||
@@ -55,7 +55,9 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
template <interfaces::adc_netsession_c SessionT, typename TokenT, typename... NetServiceCtorArgTs>
|
template <interfaces::adc_netsession_c SessionT,
|
||||||
|
std::invocable<typename SessionT::netservice_t::async_callback_err_t, SessionT> TokenT,
|
||||||
|
typename... NetServiceCtorArgTs>
|
||||||
void start(const SessionT::netservice_t::endpoint_t& endpoint,
|
void start(const SessionT::netservice_t::endpoint_t& endpoint,
|
||||||
SessionT::netsession_ident_t id,
|
SessionT::netsession_ident_t id,
|
||||||
SessionT::netsession_ctx_t sess_ctx,
|
SessionT::netsession_ctx_t sess_ctx,
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ concept adc_netproto_c = adc_range_of_view_char_range<R> && requires(T t, const
|
|||||||
namespace constants
|
namespace constants
|
||||||
{
|
{
|
||||||
|
|
||||||
|
static constexpr char ADC_DEFAULT_NETPROTO_STARTSEQ[] = "\v";
|
||||||
static constexpr char ADC_DEFAULT_NETPROTO_STOPSEQ[] = "\n";
|
static constexpr char ADC_DEFAULT_NETPROTO_STOPSEQ[] = "\n";
|
||||||
|
|
||||||
static constexpr char ADC_DEFAULT_NETPROTO_STARTMARK[] = "\n\t\r\v\r\t\n";
|
static constexpr char ADC_DEFAULT_NETPROTO_STARTMARK[] = "\n\t\r\v\r\t\n";
|
||||||
@@ -39,7 +40,10 @@ struct AdcStopSeqSessionProto {
|
|||||||
|
|
||||||
typedef std::string proto_ident_t;
|
typedef std::string proto_ident_t;
|
||||||
|
|
||||||
proto_ident_t ident() const { return "STOP SEQUENCE PROTO"; }
|
proto_ident_t ident() const
|
||||||
|
{
|
||||||
|
return "STOP SEQUENCE PROTO";
|
||||||
|
}
|
||||||
|
|
||||||
// template <traits::adc_input_char_range R>
|
// template <traits::adc_input_char_range R>
|
||||||
// auto search(const R& r)
|
// auto search(const R& r)
|
||||||
@@ -142,6 +146,105 @@ struct AdcStopSeqSessionProto {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
template <const char* STARTSEQ = constants::ADC_DEFAULT_NETPROTO_STARTSEQ,
|
||||||
|
const char* STOPSEQ = constants::ADC_DEFAULT_NETPROTO_STOPSEQ>
|
||||||
|
struct AdcStartStopSeqSessionProto {
|
||||||
|
static constexpr std::string_view START_SEQ{STARTSEQ};
|
||||||
|
static constexpr size_t START_SEQ_SIZE = START_SEQ.size();
|
||||||
|
static constexpr std::string_view STOP_SEQ{STOPSEQ};
|
||||||
|
static constexpr size_t STOP_SEQ_SIZE = STOP_SEQ.size();
|
||||||
|
|
||||||
|
static_assert(START_SEQ_SIZE, "START BYTE SEQUENCE MUST NOT BE AN EMPTY ONE!!!");
|
||||||
|
static_assert(STOP_SEQ_SIZE, "STOP BYTE SEQUENCE MUST NOT BE AN EMPTY ONE!!!");
|
||||||
|
|
||||||
|
typedef std::string proto_ident_t;
|
||||||
|
|
||||||
|
proto_ident_t ident() const
|
||||||
|
{
|
||||||
|
return "STOP SEQUENCE PROTO";
|
||||||
|
}
|
||||||
|
|
||||||
|
template <traits::adc_input_char_range R>
|
||||||
|
auto search(const R& r)
|
||||||
|
{
|
||||||
|
auto func = [&r](auto& result) {
|
||||||
|
if (std::ranges::size(r) < (START_SEQ_SIZE + STOP_SEQ_SIZE)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto found_start = std::ranges::search(r, START_SEQ);
|
||||||
|
if (found_start.empty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto found_stop = std::ranges::search(r, STOP_SEQ);
|
||||||
|
if (found_stop.empty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (found_start.begin() > found_stop.begin()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if constexpr (std::ranges::viewable_range<R>) {
|
||||||
|
result = std::span(found_start.begin(), found_stop.end());
|
||||||
|
} else {
|
||||||
|
std::ranges::copy(found_start.begin(), found_stop.end(), std::back_inserter(result));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if constexpr (std::ranges::viewable_range<R>) {
|
||||||
|
auto res = std::span(r.begin(), r.begin()); // empty std::span
|
||||||
|
func(res);
|
||||||
|
return res;
|
||||||
|
} else {
|
||||||
|
auto res = std::vector<char>();
|
||||||
|
func(res);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
template <traits::adc_input_char_range R>
|
||||||
|
auto toProto(const R& r)
|
||||||
|
{
|
||||||
|
// return 3-element array with the first element - a view of the start sequence, the second one - as a view of
|
||||||
|
// the input range and the third one - a view of the stop sequence
|
||||||
|
|
||||||
|
if constexpr (std::ranges::viewable_range<R>) {
|
||||||
|
auto res = std::array{std::span(std::span(START_SEQ.begin(), START_SEQ.end()), r.begin(), r.end()),
|
||||||
|
std::span(STOP_SEQ.begin(), STOP_SEQ.end())};
|
||||||
|
|
||||||
|
return res;
|
||||||
|
} else { // return a copy of input range with added to the fron start sequence and appended stop sequence
|
||||||
|
std::decay_t<decltype(r)> res;
|
||||||
|
std::ranges::copy(START_SEQ, std::back_inserter(res));
|
||||||
|
std::ranges::copy(r, std::back_inserter(res));
|
||||||
|
std::ranges::copy(STOP_SEQ, std::back_inserter(res));
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template <traits::adc_input_char_range R>
|
||||||
|
auto fromProto(const R& r)
|
||||||
|
{
|
||||||
|
size_t N = std::distance(r.begin(), r.end());
|
||||||
|
|
||||||
|
if (N < (START_SEQ_SIZE + STOP_SEQ_SIZE)) { // one must ensure for input range size correctness
|
||||||
|
return std::span(r.begin(), r.begin());
|
||||||
|
}
|
||||||
|
|
||||||
|
if constexpr (std::ranges::viewable_range<R>) {
|
||||||
|
return std::span(r.begin() + START_SEQ_SIZE, r.end() - STOP_SEQ_SIZE);
|
||||||
|
} else {
|
||||||
|
R res;
|
||||||
|
std::ranges::copy(r | std::views::drop(START_SEQ_SIZE) | std::views::take(N - STOP_SEQ_SIZE),
|
||||||
|
std::back_inserter(res));
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// session protocol for datagram-kind message (e.g. UDP, seqpacket)
|
// session protocol for datagram-kind message (e.g. UDP, seqpacket)
|
||||||
// The protocol does not contain any special characters, so to/fromProto methods
|
// The protocol does not contain any special characters, so to/fromProto methods
|
||||||
// return just a copy/one-element-array-of-vew/view of input byte
|
// return just a copy/one-element-array-of-vew/view of input byte
|
||||||
@@ -149,7 +252,10 @@ struct AdcStopSeqSessionProto {
|
|||||||
struct AdcDatagramSessionProto {
|
struct AdcDatagramSessionProto {
|
||||||
typedef std::string proto_ident_t;
|
typedef std::string proto_ident_t;
|
||||||
|
|
||||||
proto_ident_t ident() const { return "DATAGRAM PROTO"; }
|
proto_ident_t ident() const
|
||||||
|
{
|
||||||
|
return "DATAGRAM PROTO";
|
||||||
|
}
|
||||||
|
|
||||||
template <traits::adc_input_char_range R>
|
template <traits::adc_input_char_range R>
|
||||||
auto search(const R& r)
|
auto search(const R& r)
|
||||||
@@ -201,7 +307,10 @@ struct AdcBinaryBlobSessionProto {
|
|||||||
|
|
||||||
typedef std::string proto_ident_t;
|
typedef std::string proto_ident_t;
|
||||||
|
|
||||||
proto_ident_t ident() const { return "BINARY BLOB PROTO"; }
|
proto_ident_t ident() const
|
||||||
|
{
|
||||||
|
return "BINARY BLOB PROTO";
|
||||||
|
}
|
||||||
|
|
||||||
template <traits::adc_input_char_range R>
|
template <traits::adc_input_char_range R>
|
||||||
auto search(const R& r)
|
auto search(const R& r)
|
||||||
|
|||||||
@@ -196,6 +196,13 @@ public:
|
|||||||
_sessionSendTimeout.count());
|
_sessionSendTimeout.count());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void daemonize()
|
||||||
|
{
|
||||||
|
this->logInfo("Daemonize server process (server addr: {})", (void*)this);
|
||||||
|
|
||||||
|
base_t::daemonize();
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
asio::io_context& _ioContext;
|
asio::io_context& _ioContext;
|
||||||
|
|
||||||
@@ -204,13 +211,6 @@ protected:
|
|||||||
std::chrono::milliseconds _sessionRecvTimeout = std::chrono::hours(12);
|
std::chrono::milliseconds _sessionRecvTimeout = std::chrono::hours(12);
|
||||||
std::chrono::milliseconds _sessionSendTimeout = std::chrono::seconds(5);
|
std::chrono::milliseconds _sessionSendTimeout = std::chrono::seconds(5);
|
||||||
|
|
||||||
void daemonize()
|
|
||||||
{
|
|
||||||
this->logInfo("Daemonize server process (server addr: {})", (void*)this);
|
|
||||||
|
|
||||||
base_t::daemonize();
|
|
||||||
}
|
|
||||||
|
|
||||||
// demonizing ASIO-related methods
|
// demonizing ASIO-related methods
|
||||||
virtual void daemonizePrepare()
|
virtual void daemonizePrepare()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
#include <asio/basic_stream_socket.hpp>
|
#include <asio/basic_stream_socket.hpp>
|
||||||
#include <asio/bind_executor.hpp>
|
#include <asio/bind_executor.hpp>
|
||||||
#include <asio/compose.hpp>
|
#include <asio/compose.hpp>
|
||||||
|
#include <asio/connect.hpp>
|
||||||
#include <asio/deferred.hpp>
|
#include <asio/deferred.hpp>
|
||||||
#include <asio/ip/tcp.hpp>
|
#include <asio/ip/tcp.hpp>
|
||||||
#include <asio/ip/udp.hpp>
|
#include <asio/ip/udp.hpp>
|
||||||
@@ -124,6 +125,10 @@ public:
|
|||||||
static constexpr bool isTLS = false;
|
static constexpr bool isTLS = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef TRANSPORT_PROTOT transport_proto_t;
|
||||||
|
typedef SESSION_PROTOT session_proto_t;
|
||||||
|
typedef RMSGT receive_msg_t;
|
||||||
|
|
||||||
// typedefs to satisfy 'adc_netservice_c' concept
|
// typedefs to satisfy 'adc_netservice_c' concept
|
||||||
typedef std::string_view netservice_ident_t;
|
typedef std::string_view netservice_ident_t;
|
||||||
|
|
||||||
@@ -154,7 +159,8 @@ public:
|
|||||||
typedef std::function<int(const std::string& serial, const std::vector<unsigned char>& fingerprint, int depth)>
|
typedef std::function<int(const std::string& serial, const std::vector<unsigned char>& fingerprint, int depth)>
|
||||||
cert_comp_func_t;
|
cert_comp_func_t;
|
||||||
#else
|
#else
|
||||||
using session_level_socket_t = socket_t;
|
// using session_level_socket_t = socket_t;
|
||||||
|
using session_level_socket_t = std::nullptr_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@@ -793,6 +799,17 @@ public:
|
|||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
template <std::derived_from<AdcBaseNetServiceASIO> ST,
|
||||||
|
typename EptRangeT,
|
||||||
|
asio::completion_token_for<std::error_code, endpoint_t> CallbackT>
|
||||||
|
friend auto async_connect(ST& service, const EptRangeT& ept_range, CallbackT&& token)
|
||||||
|
requires std::ranges::range<EptRangeT> &&
|
||||||
|
std::same_as<std::ranges::range_value_t<EptRangeT>, AdcBaseNetServiceASIO::endpoint_t>
|
||||||
|
{
|
||||||
|
return asio::async_connect(service._socket, ept_range, token);
|
||||||
|
};
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
static constexpr netservice_ident_t _ident =
|
static constexpr netservice_ident_t _ident =
|
||||||
std::derived_from<socket_t, asio::basic_stream_socket<typename socket_t::protocol_type>>
|
std::derived_from<socket_t, asio::basic_stream_socket<typename socket_t::protocol_type>>
|
||||||
@@ -814,8 +831,8 @@ protected:
|
|||||||
|
|
||||||
asio::socket_base::shutdown_type _shutdownType = asio::socket_base::shutdown_both;
|
asio::socket_base::shutdown_type _shutdownType = asio::socket_base::shutdown_both;
|
||||||
|
|
||||||
#ifdef USE_OPENSSL_WITH_ASIO
|
|
||||||
session_level_socket_t _sessSocket;
|
session_level_socket_t _sessSocket;
|
||||||
|
#ifdef USE_OPENSSL_WITH_ASIO
|
||||||
std::conditional_t<isTLS, asio::ssl::context, std::nullptr_t> _tlsContext;
|
std::conditional_t<isTLS, asio::ssl::context, std::nullptr_t> _tlsContext;
|
||||||
asio::ssl::verify_mode _tlsPeerVerifyMode;
|
asio::ssl::verify_mode _tlsPeerVerifyMode;
|
||||||
cert_comp_func_t _tlsCertCompFunc;
|
cert_comp_func_t _tlsCertCompFunc;
|
||||||
@@ -931,7 +948,8 @@ protected:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* */
|
/* PARTIAL AdcBaseNetServiceASIO-CLASS SPECIALIZATIONS */
|
||||||
|
|
||||||
template <
|
template <
|
||||||
adc_asio_transport_proto_c TRANSPORT_PROTOT, // transport-level proto (e.g. asio::ip::tcp)
|
adc_asio_transport_proto_c TRANSPORT_PROTOT, // transport-level proto (e.g. asio::ip::tcp)
|
||||||
interfaces::adc_netsession_proto_c<std::string_view> SESSION_PROTOT, // session-level proto (see ../adc_netproto.h)
|
interfaces::adc_netsession_proto_c<std::string_view> SESSION_PROTOT, // session-level proto (see ../adc_netproto.h)
|
||||||
|
|||||||
@@ -1,198 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include "adc_netservice_asio.h"
|
|
||||||
|
|
||||||
namespace adc::impl
|
|
||||||
{
|
|
||||||
|
|
||||||
template <typename SessionContextT,
|
|
||||||
adc_asio_transport_proto_c TRANSPORT_PROTOT,
|
|
||||||
interfaces::adc_netsession_proto_c<std::string_view> SESSION_PROTOT,
|
|
||||||
traits::adc_output_char_range RMSGT = std::vector<char>>
|
|
||||||
class AdcGenericNetSessionASIO : public std::enable_shared_from_this<
|
|
||||||
AdcGenericNetSessionASIO<SessionContextT, TRANSPORT_PROTOT, SESSION_PROTOT, RMSGT>>
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
typedef std::string netsession_ident_t;
|
|
||||||
|
|
||||||
typedef SessionContextT netsession_ctx_t;
|
|
||||||
|
|
||||||
typedef AdcNetServiceASIOBase<TRANSPORT_PROTOT, SESSION_PROTOT, RMSGT> netservice_t;
|
|
||||||
typedef std::shared_ptr<netservice_t> netservice_sptr_t;
|
|
||||||
|
|
||||||
template <traits::adc_input_char_range R>
|
|
||||||
AdcGenericNetSessionASIO(const R& id, netservice_sptr_t netservice, netsession_ctx_t&& context)
|
|
||||||
: _ident(), _netservice(std::move(netservice)), _sessionContext(std::forward<netsession_ctx_t>(context))
|
|
||||||
{
|
|
||||||
if constexpr (std::is_array_v<R>) {
|
|
||||||
_ident = id;
|
|
||||||
} else {
|
|
||||||
_ident = std::string(id.begin(), id.end());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
AdcGenericNetSessionASIO(netservice_sptr_t netservice, netsession_ctx_t&& context)
|
|
||||||
: AdcGenericNetSessionASIO(
|
|
||||||
std::derived_from<TRANSPORT_PROTOT, asio::ip::tcp> ? "ASIO TCP SESSION"
|
|
||||||
: std::derived_from<TRANSPORT_PROTOT, asio::ip::udp> ? "ASIO UDP SESSION"
|
|
||||||
: std::derived_from<TRANSPORT_PROTOT, asio::local::seq_packet_protocol> ? "ASIO UNIX SEQPACKET SESSION"
|
|
||||||
: std::derived_from<TRANSPORT_PROTOT, asio::local::stream_protocol> ? "ASIO UNIX STREAM SESSION"
|
|
||||||
: std::derived_from<TRANSPORT_PROTOT, asio::local::datagram_protocol> ? "ASIO UNIX DATAGRAM SESSION"
|
|
||||||
: "ASIO UNKNOWN",
|
|
||||||
std::move(netservice),
|
|
||||||
std::forward<netsession_ctx_t>(context))
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
virtual ~AdcGenericNetSessionASIO()
|
|
||||||
{
|
|
||||||
stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
netsession_ident_t ident() const
|
|
||||||
{
|
|
||||||
return _ident;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
virtual void start() = 0;
|
|
||||||
|
|
||||||
virtual void stop()
|
|
||||||
{
|
|
||||||
_netservice->close();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template <traits::adc_time_duration_c TimeoutT>
|
|
||||||
AdcGenericNetSessionASIO& setDefaultTimeouts(const TimeoutT& send_timeout, const TimeoutT& recv_timeout)
|
|
||||||
{
|
|
||||||
_sendTimeout = send_timeout;
|
|
||||||
_recvTimeout = recv_timeout;
|
|
||||||
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
netsession_ident_t _ident;
|
|
||||||
|
|
||||||
netservice_sptr_t _netservice;
|
|
||||||
|
|
||||||
netsession_ctx_t _sessionContext;
|
|
||||||
|
|
||||||
std::chrono::duration<std::chrono::seconds::rep, std::chrono::seconds::period> _recvTimeout =
|
|
||||||
std::chrono::seconds::max();
|
|
||||||
|
|
||||||
std::chrono::duration<std::chrono::seconds::rep, std::chrono::seconds::period> _sendTimeout =
|
|
||||||
std::chrono::seconds(5);
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
class AdcGenericNetSessionASIO
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
typedef std::string netsession_ident_t;
|
|
||||||
|
|
||||||
template <traits::adc_input_char_range R,
|
|
||||||
adc_asio_transport_proto_c TRANSPORT_PROTOT,
|
|
||||||
interfaces::adc_netsession_proto_c<std::string_view> SESSION_PROTOT,
|
|
||||||
traits::adc_output_char_range RMSGT = std::vector<char>,
|
|
||||||
traits::adc_is_callable RECV_MSG_TOKENT>
|
|
||||||
AdcGenericNetSessionASIO(const R& id,
|
|
||||||
std::shared_ptr<AdcNetServiceASIOBase<TRANSPORT_PROTOT, SESSION_PROTOT, RMSGT>> netservice,
|
|
||||||
RECV_MSG_TOKENT&& recv_msg_token)
|
|
||||||
: _ident(id.begin(), id.end())
|
|
||||||
{
|
|
||||||
// check receive message completion token signature and deduce message type
|
|
||||||
if constexpr (!adc_asio_special_comp_token_c<RECV_MSG_TOKENT>) {
|
|
||||||
static_assert(traits::adc_func_traits<RECV_MSG_TOKENT>::arity == 2, "INVALID COMPLETION TOKEN SIGNATURE!");
|
|
||||||
static_assert(
|
|
||||||
std::is_same_v<std::remove_cvref_t<traits::adc_func_arg1_t<RECV_MSG_TOKENT>>, std::error_code>,
|
|
||||||
"INVALID COMPLETION TOKEN SIGNATURE!");
|
|
||||||
static_assert(traits::adc_output_char_range<
|
|
||||||
std::tuple_element_t<1, typename traits::adc_func_traits<RECV_MSG_TOKENT>::args_t>>,
|
|
||||||
"INVALID COMPLETION TOKEN SIGNATURE!");
|
|
||||||
}
|
|
||||||
|
|
||||||
using msg_t = std::conditional_t<
|
|
||||||
adc_asio_special_comp_token_c<RECV_MSG_TOKENT>, RMSGT,
|
|
||||||
std::remove_cvref_t<std::tuple_element_t<1, typename traits::adc_func_traits<RECV_MSG_TOKENT>::args_t>>>;
|
|
||||||
|
|
||||||
|
|
||||||
_startFunc = [netservice, wrapper = traits::adc_pf_wrapper(std::forward<RECV_MSG_TOKENT>(recv_msg_token)),
|
|
||||||
this]() {
|
|
||||||
//
|
|
||||||
netservice->asyncReceive(std::get<0>(wrapper), _recvTimeout);
|
|
||||||
};
|
|
||||||
|
|
||||||
_stopFunc = [netservice]() {
|
|
||||||
// stop
|
|
||||||
netservice->close();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
template <adc_asio_transport_proto_c TRANSPORT_PROTOT,
|
|
||||||
interfaces::adc_netsession_proto_c<std::string_view> SESSION_PROTOT,
|
|
||||||
traits::adc_output_char_range RMSGT = std::vector<char>,
|
|
||||||
traits::adc_is_callable RECV_MSG_TOKENT>
|
|
||||||
AdcGenericNetSessionASIO(std::shared_ptr<AdcNetServiceASIOBase<TRANSPORT_PROTOT, SESSION_PROTOT, RMSGT>> netservice,
|
|
||||||
RECV_MSG_TOKENT&& recv_msg_token)
|
|
||||||
: AdcGenericNetSessionASIO(std::derived_from<TRANSPORT_PROTOT, asio::ip::tcp> ? "TCP SESSION"
|
|
||||||
: std::derived_from<TRANSPORT_PROTOT, asio::ip::udp> ? "UDP SESSION"
|
|
||||||
: std::derived_from<TRANSPORT_PROTOT, asio::local::seq_packet_protocol>
|
|
||||||
? "UNIX SEQPACKET SESSION"
|
|
||||||
: std::derived_from<TRANSPORT_PROTOT, asio::local::stream_protocol> ? "UNIX STREAM
|
|
||||||
SESSION" : "UNKNOWN", std::move(netservice), std::forward<RECV_MSG_TOKENT>(recv_msg_token))
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
virtual ~AdcGenericNetSessionASIO()
|
|
||||||
{
|
|
||||||
stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
netsession_ident_t ident() const
|
|
||||||
{
|
|
||||||
return _ident;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void start()
|
|
||||||
{
|
|
||||||
_startFunc();
|
|
||||||
}
|
|
||||||
|
|
||||||
void stop()
|
|
||||||
{
|
|
||||||
_stopFunc();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template <traits::adc_time_duration_c TimeoutT>
|
|
||||||
AdcGenericNetSessionASIO& setDefaultTimeouts(const TimeoutT& send_timeout, const TimeoutT& recv_timeout)
|
|
||||||
{
|
|
||||||
_sendTimeout = send_timeout;
|
|
||||||
_recvTimeout = recv_timeout;
|
|
||||||
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
netsession_ident_t _ident;
|
|
||||||
|
|
||||||
std::function<void()> _startFunc;
|
|
||||||
std::function<void()> _stopFunc;
|
|
||||||
|
|
||||||
std::chrono::duration<std::chrono::seconds::rep, std::chrono::seconds::period> _recvTimeout =
|
|
||||||
std::chrono::seconds::max();
|
|
||||||
|
|
||||||
std::chrono::duration<std::chrono::seconds::rep, std::chrono::seconds::period> _sendTimeout =
|
|
||||||
std::chrono::seconds(5);
|
|
||||||
};
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
} // namespace adc::impl
|
|
||||||
@@ -162,13 +162,14 @@ int main(int argc, char* argv[])
|
|||||||
for (auto& ep : epnt) {
|
for (auto& ep : epnt) {
|
||||||
adc::AdcEndpoint epn(ep);
|
adc::AdcEndpoint epn(ep);
|
||||||
if (epn.isValid()) {
|
if (epn.isValid()) {
|
||||||
if (epn.isLocalSeqpacket() || epn.isLocalStream()) {
|
epn.makeAbstract('@');
|
||||||
if (epn.path()[0] == '@') { // replace '@' to '\0' (use of UNIX abstract namespace)
|
// if (epn.isLocalSeqpacket() || epn.isLocalStream()) {
|
||||||
auto it = std::ranges::find(ep, '@');
|
// if (epn.path()[0] == '@') { // replace '@' to '\0' (use of UNIX abstract namespace)
|
||||||
*it = '\0';
|
// auto it = std::ranges::find(ep, '@');
|
||||||
epn = adc::AdcEndpoint(ep);
|
// *it = '\0';
|
||||||
}
|
// epn = adc::AdcEndpoint(ep);
|
||||||
}
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
// std::cout << "try to start listenning at '" << ep << "' ...";
|
// std::cout << "try to start listenning at '" << ep << "' ...";
|
||||||
|
|
||||||
|
|||||||
176
tests/adc_dev_test.cpp
Normal file
176
tests/adc_dev_test.cpp
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
#include "../common/adc_traits.h"
|
||||||
|
#include "../device/adc_device.h"
|
||||||
|
#include "../device/adc_device_attribute.h"
|
||||||
|
#include "../device/adc_device_command.h"
|
||||||
|
|
||||||
|
using namespace adc;
|
||||||
|
|
||||||
|
typedef std::vector<char> serialized_t;
|
||||||
|
|
||||||
|
class DeviceWrapper
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
// using char_range_t = std::span<const char>;
|
||||||
|
using char_range_t = std::span<char>;
|
||||||
|
|
||||||
|
private:
|
||||||
|
serialized_t _id;
|
||||||
|
|
||||||
|
std::function<serialized_t(const serialized_t&)> _get_attr = [](auto) -> serialized_t {
|
||||||
|
throw std::invalid_argument("BAD _get_attr");
|
||||||
|
};
|
||||||
|
std::function<void(const serialized_t&, const serialized_t&)> _set_attr = [](auto, auto) {
|
||||||
|
throw std::invalid_argument("BAD _set_attr");
|
||||||
|
};
|
||||||
|
std::function<void(const serialized_t&)> _exec_cmd = [](auto) { throw std::invalid_argument("BAD _exec_cmd"); };
|
||||||
|
|
||||||
|
public:
|
||||||
|
DeviceWrapper() : _id()
|
||||||
|
{
|
||||||
|
// null device
|
||||||
|
std::string_view id{"NULL-DEVICE"};
|
||||||
|
std::ranges::copy(id, std::back_inserter(_id));
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename DeviceT,
|
||||||
|
typename AttrIdDeserialT = traits::adc_char_identity<typename DeviceT::attr_ident_t>,
|
||||||
|
typename CmdIdDeserialT = traits::adc_char_identity<typename DeviceT::cmd_ident_t>>
|
||||||
|
DeviceWrapper(DeviceT* dev_ptr,
|
||||||
|
const serialized_t& id,
|
||||||
|
AttrIdDeserialT&& attr_id_deser_func = {},
|
||||||
|
CmdIdDeserialT&& cmd_id_deser_func = {})
|
||||||
|
: _id(id)
|
||||||
|
{
|
||||||
|
_get_attr = [dev_ptr, wrapper = traits::adc_pf_wrapper(std::forward<AttrIdDeserialT>(attr_id_deser_func))](
|
||||||
|
const auto& attr_name) mutable {
|
||||||
|
auto attr_id = std::get<0>(wrapper)(attr_name);
|
||||||
|
auto& attr = (*dev_ptr)[attr_id];
|
||||||
|
// auto& attr = dev_ptr->operator[](attr_id);
|
||||||
|
auto val = attr.serialize();
|
||||||
|
return val;
|
||||||
|
};
|
||||||
|
|
||||||
|
_set_attr = [dev_ptr, wrapper = traits::adc_pf_wrapper(std::forward<AttrIdDeserialT>(attr_id_deser_func))](
|
||||||
|
const auto& attr_name, const auto& val) mutable {
|
||||||
|
auto attr_id = std::get<0>(wrapper)(attr_name);
|
||||||
|
(*dev_ptr)[attr_id].deserialize(val);
|
||||||
|
};
|
||||||
|
|
||||||
|
_exec_cmd = [dev_ptr, wrapper = traits::adc_pf_wrapper(std::forward<CmdIdDeserialT>(cmd_id_deser_func))](
|
||||||
|
const auto& cmd_name) mutable {
|
||||||
|
auto cmd_id = std::get<0>(wrapper)(cmd_name);
|
||||||
|
(*dev_ptr)(cmd_id);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
serialized_t ident() const
|
||||||
|
{
|
||||||
|
// return _get_id();
|
||||||
|
return _id;
|
||||||
|
}
|
||||||
|
|
||||||
|
serialized_t getAttr(const serialized_t& attr_name)
|
||||||
|
{
|
||||||
|
return _get_attr(attr_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
void setAttr(const serialized_t& attr_name, const serialized_t& val)
|
||||||
|
{
|
||||||
|
_set_attr(attr_name, val);
|
||||||
|
}
|
||||||
|
|
||||||
|
void exec(const serialized_t& cmd_name)
|
||||||
|
{
|
||||||
|
_exec_cmd(cmd_name);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
static std::vector<DeviceWrapper> devs;
|
||||||
|
|
||||||
|
|
||||||
|
auto getAttr(size_t dev_idx, const serialized_t& name)
|
||||||
|
{
|
||||||
|
DeviceWrapper& dev = devs[dev_idx];
|
||||||
|
|
||||||
|
return dev.getAttr(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
int main()
|
||||||
|
{
|
||||||
|
typedef AdcGenericDevice<std::string_view, AdcDeviceAttribute<std::string_view, serialized_t>, AdcDeviceCommand<>>
|
||||||
|
dev_t;
|
||||||
|
|
||||||
|
dev_t dev1("DEV1");
|
||||||
|
|
||||||
|
int attr1_val = 10;
|
||||||
|
// dev1.addAttribute(
|
||||||
|
// "ATTR1",
|
||||||
|
// [&attr1_val]() {
|
||||||
|
// std::cout << "ATTR1 getter\n";
|
||||||
|
// return attr1_val;
|
||||||
|
// },
|
||||||
|
// [&attr1_val](const int& v) {
|
||||||
|
// std::cout << "ATTR1 setter\n";
|
||||||
|
// attr1_val = v;
|
||||||
|
// });
|
||||||
|
// dev1.addAttribute(
|
||||||
|
// "ATTR2",
|
||||||
|
// [&attr1_val]() {
|
||||||
|
// std::cout << "ATTR2 getter\n";
|
||||||
|
// return attr1_val + 10;
|
||||||
|
// },
|
||||||
|
// [&attr1_val](const int& v) {
|
||||||
|
// std::cout << "ATTR2 setter\n";
|
||||||
|
// attr1_val = v;
|
||||||
|
// },
|
||||||
|
// utils::AdcDefaultValueConverter<>::serialize<dev_t::attribute_t::serialized_t, int>);
|
||||||
|
dev1.addAttribute(dev_t::attribute_t::makeArithAttr(
|
||||||
|
"ATTR1",
|
||||||
|
[&attr1_val]() {
|
||||||
|
std::cout << "ATTR1 getter\n";
|
||||||
|
return attr1_val;
|
||||||
|
},
|
||||||
|
[&attr1_val](const int& v) {
|
||||||
|
std::cout << "ATTR1 setter\n";
|
||||||
|
attr1_val = v;
|
||||||
|
}));
|
||||||
|
dev1.addAttribute(dev_t::attribute_t::makeArithAttr(
|
||||||
|
"ATTR2",
|
||||||
|
[&attr1_val]() {
|
||||||
|
std::cout << "ATTR2 getter\n";
|
||||||
|
return (long)attr1_val + 10;
|
||||||
|
},
|
||||||
|
[&attr1_val](const long& v) {
|
||||||
|
std::cout << "ATTR2 setter\n";
|
||||||
|
attr1_val = v;
|
||||||
|
},
|
||||||
|
utils::AdcDefaultValueConverter<>::serialize<dev_t::attribute_t::serialized_t, long>));
|
||||||
|
|
||||||
|
devs.push_back({&dev1, {'D', '1'}});
|
||||||
|
|
||||||
|
serialized_t sn1, sn2;
|
||||||
|
std::ranges::copy(std::string_view("ATTR1"), std::back_inserter(sn1));
|
||||||
|
std::ranges::copy(std::string_view("ATTR2"), std::back_inserter(sn2));
|
||||||
|
|
||||||
|
devs[0].setAttr(sn1, {'7', '7'});
|
||||||
|
auto r = getAttr(0, sn1);
|
||||||
|
|
||||||
|
std::string rs;
|
||||||
|
std::ranges::copy(r, std::back_inserter(rs));
|
||||||
|
|
||||||
|
std::cout << "ATTR1 = " << rs << "\n";
|
||||||
|
|
||||||
|
devs[0].setAttr(sn2, {'7', '7'});
|
||||||
|
r = getAttr(0, sn2);
|
||||||
|
|
||||||
|
rs.clear();
|
||||||
|
std::ranges::copy(r, std::back_inserter(rs));
|
||||||
|
|
||||||
|
std::cout << "ATTR2 = " << rs << "\n";
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user