RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

common/config: new get_val() variant

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-11-13 09:24:23 -06:00
parent da11800d30
commit 02e57753e5
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/config.cc
View File

@ -888,6 +888,13 @@ int md_config_t::get_val(const std::string &key, char **buf, int len) const
return _get_val(key, buf,len); return _get_val(key, buf,len);
} }
int md_config_t::get_val_as_string(const std::string &key,
std::string *val) const
{
Mutex::Locker l(lock);
return _get_val_as_string(key, val);
}
Option::value_t md_config_t::get_val_generic(const std::string &key) const Option::value_t md_config_t::get_val_generic(const std::string &key) const
{ {
Mutex::Locker l(lock); Mutex::Locker l(lock);
@ -915,7 +922,8 @@ Option::value_t md_config_t::_get_val_generic(const std::string &key) const
} }
} }
int md_config_t::_get_val(const std::string &key, std::string *value) const { int md_config_t::_get_val_as_string(const std::string &key,
std::string *value) const {
assert(lock.is_locked()); assert(lock.is_locked());
auto config_value = _get_val_generic(key); auto config_value = _get_val_generic(key);
@ -942,7 +950,7 @@ int md_config_t::_get_val(const std::string &key, char **buf, int len) const
return -EINVAL; return -EINVAL;
string val ; string val ;
if (_get_val(key, &val) == 0) { if (_get_val_as_string(key, &val) == 0) {
int l = val.length() + 1; int l = val.length() + 1;
if (len == -1) { if (len == -1) {
*buf = (char*)malloc(l); *buf = (char*)malloc(l);
@ -1216,7 +1224,7 @@ bool md_config_t::expand_meta(std::string &origval,
*oss << "expansion stack: " << std::endl; *oss << "expansion stack: " << std::endl;
for (const auto j : stack) { for (const auto j : stack) {
std::string val; std::string val;
_get_val(j->name, &val); _get_val_as_string(j->name, &val);
*oss << j->name << "=" << val << std::endl; *oss << j->name << "=" << val << std::endl;
} }
return false; return false;

3
src/common/config.h
View File

@ -159,6 +159,7 @@ public:
// Get a configuration value. // Get a configuration value.
// No metavariables will be returned (they will have already been expanded) // No metavariables will be returned (they will have already been expanded)
int get_val(const std::string &key, char **buf, int len) const; int get_val(const std::string &key, char **buf, int len) const;
int get_val_as_string(const std::string &key, std::string *val) const;
int _get_val(const std::string &key, char **buf, int len) const; int _get_val(const std::string &key, char **buf, int len) const;
Option::value_t get_val_generic(const std::string &key) const; Option::value_t get_val_generic(const std::string &key) const;
template<typename T> const T get_val(const std::string &key) const; template<typename T> const T get_val(const std::string &key) const;
@ -208,7 +209,7 @@ private:
void validate_schema(); void validate_schema();
void validate_default_settings(); void validate_default_settings();
int _get_val(const std::string &key, std::string *value) const; int _get_val_as_string(const std::string &key, std::string *value) const;
Option::value_t _get_val_generic(const std::string &key) const; Option::value_t _get_val_generic(const std::string &key) const;
void _show_config(std::ostream *out, Formatter *f); void _show_config(std::ostream *out, Formatter *f);