From 3648f18a09ad47cd4b00b78c71f74ae2c5851c9f Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 15:05:23 -0500 Subject: [PATCH 1/3] Generate an include file with the defaults text as as a string --- src/lib/CMakeLists.txt | 22 ++++++++++++++++++++++ src/lib/config/ConfigurationState.cpp | 1 + 2 files changed, 23 insertions(+) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 90ed995df..1efa22f19 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -54,6 +54,28 @@ if(NOT old_config_proto_str STREQUAL config_proto_str) file(WRITE "${config_proto_file}" "${config_proto_str}") endif() +# generate static defaults +set(config_defaults_file ${CMAKE_CURRENT_BINARY_DIR}/config_defaults.h) +# Defaults cannot be a single string because the compiler complains about a string longer than 65k +set(config_defaults_str "const char * config_static_defaults[] = { ") +foreach (cfg_file_path ${Conf_Defaults}) + file(READ ${cfg_file_path} cfg_file_content) + string(REPLACE "\"" "\\\"" cfg_file_content_escaped ${cfg_file_content}) + string(REPLACE "\n" ";" cfg_lines ${cfg_file_content_escaped}) + foreach(line ${cfg_lines}) + string(APPEND config_defaults_str "\n \"${line}\",") + endforeach(line) +endforeach(cfg_file_path) +string(APPEND config_defaults_str "};") +set(old_defaults_str "") +if(EXISTS ${config_defaults_file}) + file(READ ${config_defaults_file} old_defaults_str) +endif() +if(NOT config_defaults_str STREQUAL old_defaults_str) + file(WRITE "${config_defaults_file}" "${config_defaults_str}") +endif() + + # copy defaults to output directory foreach (cfg_file_path ${Conf_Defaults}) get_filename_component(cfg_file_name ${cfg_file_path} NAME) diff --git a/src/lib/config/ConfigurationState.cpp b/src/lib/config/ConfigurationState.cpp index 06ec87f36..460379bba 100755 --- a/src/lib/config/ConfigurationState.cpp +++ b/src/lib/config/ConfigurationState.cpp @@ -38,6 +38,7 @@ #endif #include "lib/config_proto_files.h" +#include "lib/config_defaults.h" using namespace std; From a598188c146c40a40460da4eb9db23cb05cc8f4a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 15:21:43 -0500 Subject: [PATCH 2/3] Load defaults from program segment instead of files --- src/lib/config/ConfigurationState.cpp | 26 ++++++++++---------------- src/lib/config/ConfigurationState.h | 1 - src/lib/config/defaults/Executor.conf | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/src/lib/config/ConfigurationState.cpp b/src/lib/config/ConfigurationState.cpp index 460379bba..df1f97e64 100755 --- a/src/lib/config/ConfigurationState.cpp +++ b/src/lib/config/ConfigurationState.cpp @@ -78,12 +78,6 @@ ConfigurationState::~ConfigurationState(void) { } -std::string ConfigurationState::defaults_path() -{ - std::string appdir = os::get_install_path(); - return appdir + "/defaults/"; -} - std::string get_command_argument(const char* key) { std::vector cmd_line = os::get_command_line(); @@ -128,18 +122,18 @@ void ConfigurationState::initialize_defaults(IConfigLog& log) std::shared_ptr new_message(_prototype->New()); ErrorsOnlyLog elog(log); - load_message(defaults_path(), *new_message.get(), elog, *_deferred_queue.get()); + + std::string defaults; + for (const char* str : config_static_defaults) { + defaults += str; + defaults += "\n"; + } + + proto::io::ArrayInputStream input_stream(defaults.c_str(), (int)defaults.length()); + parse_stream("static_defaults.conf", input_stream, *new_message.get(), elog, *_deferred_queue.get()); _defaults = new_message; - // If defaults has an include process that now - // FEATURE: Unlike settings loaded from ~/sparkdata/ these includes - // take precedence over the settings in the file which includes them. - // While this seems backwards it is always the behavior you want - std::string include = get_include(*_defaults.get()); - if (!include.empty()) - { - load(include, "", log); - } + // do not process 'include' for static defaults _is_initialized = true; } diff --git a/src/lib/config/ConfigurationState.h b/src/lib/config/ConfigurationState.h index 99c978a41..440c16e14 100755 --- a/src/lib/config/ConfigurationState.h +++ b/src/lib/config/ConfigurationState.h @@ -81,7 +81,6 @@ namespace internal { void generate_all_config_proto(IConfigLog&); const proto::Message* try_get_value(const std::string& field_name, const proto::Message& message) const; - std::string defaults_path(); std::string settings_path(); bool _is_initialized; diff --git a/src/lib/config/defaults/Executor.conf b/src/lib/config/defaults/Executor.conf index 2fed6e7bc..7560d53bf 100644 --- a/src/lib/config/defaults/Executor.conf +++ b/src/lib/config/defaults/Executor.conf @@ -1,13 +1,13 @@ -ExecutorCfg -{ - value - { - # executor for latency sensitive code - executor { affinity: 0 yield_cpu: false } +# ExecutorCfg +# { +# value +# { +# # executor for latency sensitive code +# executor { affinity: 0 yield_cpu: false } - # normal executor - executor { affinity: -1 yield_cpu: true } - } -} +# # normal executor +# executor { affinity: -1 yield_cpu: true } +# } +# } From e3795f94986f430edb36da6a580ae6e538170251 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 30 Nov 2018 16:14:40 -0500 Subject: [PATCH 3/3] This file is obsolete and producing warnings --- src/lib/config/defaults/Executor.conf | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/lib/config/defaults/Executor.conf diff --git a/src/lib/config/defaults/Executor.conf b/src/lib/config/defaults/Executor.conf deleted file mode 100644 index 7560d53bf..000000000 --- a/src/lib/config/defaults/Executor.conf +++ /dev/null @@ -1,13 +0,0 @@ -# ExecutorCfg -# { -# value -# { -# # executor for latency sensitive code -# executor { affinity: 0 yield_cpu: false } - -# # normal executor -# executor { affinity: -1 yield_cpu: true } -# } -# } - -