diff --git a/configstore/utils/Android.bp b/configstore/utils/Android.bp index aa420d19e0..2c8aad6b4b 100644 --- a/configstore/utils/Android.bp +++ b/configstore/utils/Android.bp @@ -14,14 +14,22 @@ // limitations under the License. // -cc_library_headers { +cc_library_shared { name: "android.hardware.configstore-utils", defaults: ["hidl_defaults"], + + srcs: [ "ConfigStoreUtils.cpp" ], + export_include_dirs: ["include"], + shared_libs: [ + "android.hardware.configstore@1.0", + "libbase", "libhidlbase" ], export_shared_lib_headers: [ + "android.hardware.configstore@1.0", + "libbase", "libhidlbase" ], } diff --git a/configstore/utils/ConfigStoreUtils.cpp b/configstore/utils/ConfigStoreUtils.cpp new file mode 100644 index 0000000000..5a1fb42e27 --- /dev/null +++ b/configstore/utils/ConfigStoreUtils.cpp @@ -0,0 +1,40 @@ +// +// Copyright (C) 2017 The Android Open Source Project +// +// 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. +// + +#define LOG_TAG "ConfigStore" + +#include +#include + +namespace android { +namespace hardware { +namespace details { + +bool wouldLogInfo() { + return WOULD_LOG(INFO); +} + +void logAlwaysInfo(const std::string& message) { + LOG(INFO) << message; +} + +void logAlwaysError(const std::string& message) { + LOG(ERROR) << message; +} + +} // namespace details +} // namespace hardware +} // namespace android diff --git a/configstore/utils/include/configstore/Utils.h b/configstore/utils/include/configstore/Utils.h index 98ccae904f..b054534194 100644 --- a/configstore/utils/include/configstore/Utils.h +++ b/configstore/utils/include/configstore/Utils.h @@ -17,20 +17,31 @@ #ifndef ANDROID_HARDWARE_CONFIGSTORE_UTILS_H #define ANDROID_HARDWARE_CONFIGSTORE_UTILS_H +#include #include -#include + +#include namespace android { namespace hardware { + +namespace details { +// Templated classes can use the below method +// to avoid creating dependencies on liblog. +bool wouldLogInfo(); +void logAlwaysInfo(const std::string& message); +void logAlwaysError(const std::string& message); +} // namespace details + namespace configstore { +using namespace android::hardware::configstore::V1_0; // arguments V: type for the value (i.e., OptionalXXX) // I: interface class name // func: member function pointer -using namespace V1_0; - template (I::* func) (std::function)> decltype(V::value) get(const decltype(V::value) &defValue) { + using namespace android::hardware::details; auto getHelper = []()->V { V ret; sp configs = I::getService(); @@ -39,15 +50,39 @@ decltype(V::value) get(const decltype(V::value) &defValue) { // fallback to the default value ret.specified = false; } else { - (*configs.*func)([&ret](V v) { - ret = v; - }); + auto status = (*configs.*func)([&ret](V v) { ret = v; }); + if (!status.isOk()) { + std::ostringstream oss; + oss << "HIDL call failed for retrieving a config item from " + "configstore : " + << status.description().c_str(); + logAlwaysError(oss.str()); + ret.specified = false; + } } return ret; }; static V cachedValue = getHelper(); + if (wouldLogInfo()) { + std::string iname = __PRETTY_FUNCTION__; + // func name starts with "func = " in __PRETTY_FUNCTION__ + auto pos = iname.find("func = "); + if (pos != std::string::npos) { + iname = iname.substr(pos + sizeof("func = ")); + iname.pop_back(); // remove trailing ']' + } else { + iname += " (unknown)"; + } + + std::ostringstream oss; + oss << iname << " retrieved: " + << (cachedValue.specified ? cachedValue.value : defValue) + << (cachedValue.specified ? "" : " (default)"); + logAlwaysInfo(oss.str()); + } + return cachedValue.specified ? cachedValue.value : defValue; }