hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2313: Add enum to value conversion function

Browse Source 
The helper function makes it easier to convert enum values at runtime to
their integer representation. Also changed the configuration processing
code to use the new function.
This commit is contained in:
Markus Mäkelä
2019-03-13 09:27:50 +02:00
parent 86520211b9
commit 6f8bfd7d11
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
server/core/config.cc
View File

@ -1688,30 +1688,22 @@ MXS_CONFIG_PARAMETER::get_duration(const std::string& key,
int64_t MXS_CONFIG_PARAMETER::get_enum(const std::string& key, const MXS_ENUM_VALUE* enum_mapping) const
{
string param_value = get_string(key);
char tmp_val[param_value.length() + 1];
strcpy(tmp_val, param_value.c_str());
int64_t rv = 0;
int rv = 0;
bool found = false;
char* endptr;
const char* delim = ", \t";
char* tok = strtok_r(tmp_val, delim, &endptr);
for (const auto& tok : mxs::strtok(get_string(key), ", \t"))
{
auto value = config_enum_to_value(tok, enum_mapping);
while (tok)
if (value == MXS_UNKNOWN_ENUM_VALUE)
{
for (int i = 0; enum_mapping[i].name; i++)
{
if (strcmp(enum_mapping[i].name, tok) == 0)
{
found = true;
rv |= enum_mapping[i].enum_value;
}
}
tok = strtok_r(NULL, delim, &endptr);
rv = MXS_UNKNOWN_ENUM_VALUE;
break;
}
return found ? rv : -1;
rv |= value;
}
return rv;
}
SERVICE* MXS_CONFIG_PARAMETER::get_service(const std::string& key) const
@ -5017,3 +5009,16 @@ bool config_is_valid_name(const char* zName, std::string* pReason)
return is_valid;
}
int64_t config_enum_to_value(const std::string& value, const MXS_ENUM_VALUE* values)
{
for (auto v = values; v->name; ++v)
{
if (value == v->name)
{
return v->enum_value;
}
}
return MXS_UNKNOWN_ENUM_VALUE;
}

13
server/core/internal/config.hh
View File

@ -255,3 +255,16 @@ std::string generate_config_string(const std::string& instance_name, const MXS_C
* @return True if the parameter can be modified at runtime
*/
bool config_can_modify_at_runtime(const char* name);
// Value returned for unknown enumeration values
constexpr int64_t MXS_UNKNOWN_ENUM_VALUE {-1};
/**
* Convert enum name to integer value
*
* @param key The enum name to convert
* @param values The list of enum values
*
* @return The enum value or MXS_UNKNOWN_ENUM_VALUE on unknown value
*/
int64_t config_enum_to_value(const std::string& key, const MXS_ENUM_VALUE* values);