Config Singleton

CHANGELOG.md

@@ -22,6 +22,7 @@
    * ADDED: support for `:forward` and `:backward` for `motor_vehicle`, `vehicle`, `foot` and `bicycle` tag prefixes [#4204](https://github.com/valhalla/valhalla/pull/4204)
    * ADDED: add `valhalla_build_landmarks` to parse POIs from osm pbfs and store them as landmarks in the landmark sqlite database [#4201](https://github.com/valhalla/valhalla/pull/4201)
    * ADDED: add primary key in the landmark sqlite database and a method to retrieve landmarks via their primary keys [#4224](https://github.com/valhalla/valhalla/pull/4224)
+   * CHANGED: the boost property tree config is now read in to a singleton that doesn't need to be passed down anymore [#4220](https://github.com/valhalla/valhalla/pull/4220)
    * ADDED: update graph tile to allow adding landmarks to edge info, and refactor edgeinfo.cc [#4233](https://github.com/valhalla/valhalla/pull/4233)
 
 ## Release Date: 2023-05-11 Valhalla 3.4.0

src/CMakeLists.txt

@@ -186,6 +186,7 @@ set(valhalla_hdrs
     ${VALHALLA_SOURCE_DIR}/valhalla/worker.h
     ${VALHALLA_SOURCE_DIR}/valhalla/filesystem.h
     ${VALHALLA_SOURCE_DIR}/valhalla/proto_conversions.h
+    ${VALHALLA_SOURCE_DIR}/valhalla/configuration.h
     )
 
 set(valhalla_src

src/argparse_utils.h

@@ -3,6 +3,7 @@
 
 #include <valhalla/baldr/rapidjson_utils.h>
 #include <valhalla/config.h>
+#include <valhalla/configuration.h>
 #include <valhalla/filesystem.h>
 #include <valhalla/midgard/logging.h>
 #include <valhalla/midgard/util.h>
@@ -26,7 +27,6 @@
 bool parse_common_args(const std::string& program,
                        const cxxopts::Options& opts,
                        const cxxopts::ParseResult& result,
-                       boost::property_tree::ptree& pt,
                        const std::string& log,
                        const bool use_threads = false) {
   if (result.count("help")) {
@@ -40,19 +40,18 @@
   }
 
   // Read the config file
+  boost::property_tree::ptree conf;
   if (result.count("inline-config")) {
-    std::stringstream ss;
-    ss << result["inline-config"].as<std::string>();
-    rapidjson::read_json(ss, pt);
+    conf = valhalla::config(result["inline-config"].as<std::string>());
   } else if (result.count("config") &&
              filesystem::is_regular_file(result["config"].as<std::string>())) {
-    rapidjson::read_json(result["config"].as<std::string>(), pt);
+    conf = valhalla::config(result["config"].as<std::string>());
   } else {
     throw cxxopts::OptionException("Configuration is required\n\n" + opts.help() + "\n\n");
   }
 
   // configure logging
-  auto logging_subtree = pt.get_child_optional(log);
+  auto logging_subtree = conf.get_child_optional(log);
   if (logging_subtree) {
     auto logging_config =
         valhalla::midgard::ToMap<const boost::property_tree::ptree&,
@@ -64,9 +63,9 @@
     // override concurrency config if specified as arg
     auto num_threads = std::max(1U, result.count("concurrency")
                                         ? result["concurrency"].as<uint32_t>()
-                                        : pt.get<uint32_t>("mjolnir.concurrency",
-                                                           std::thread::hardware_concurrency()));
-    pt.put<uint32_t>("mjolnir.concurrency", num_threads);
+                                        : conf.get<uint32_t>("mjolnir.concurrency",
+                                                             std::thread::hardware_concurrency()));
+    conf.put<uint32_t>("mjolnir.concurrency", num_threads);
 
     LOG_INFO("Running " + std::string(program) + " with " + std::to_string(num_threads) +
              " thread(s).");

src/mjolnir/valhalla_add_elevation.cc

@@ -65,7 +65,6 @@
 int main(int argc, char** argv) {
   const auto program = filesystem::path(__FILE__).stem().string();
   // args
-  boost::property_tree::ptree config;
   std::vector<std::string> tiles;
 
   try {
@@ -88,7 +87,7 @@
     // clang-format on
 
     const auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, config, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
 
     if (!result.count("tiles")) {
@@ -112,12 +111,13 @@
   }
 
   // pass the deduplicated tiles
-  auto tile_ids = get_tile_ids(config, std::unordered_set<std::string>(tiles.begin(), tiles.end()));
+  auto tile_ids =
+      get_tile_ids(valhalla::config(), std::unordered_set<std::string>(tiles.begin(), tiles.end()));
   if (tile_ids.empty()) {
     std::cerr << "Failed to load tiles\n\n";
     return EXIT_FAILURE;
   }
 
-  ElevationBuilder::Build(config, tile_ids);
+  ElevationBuilder::Build(valhalla::config(), tile_ids);
   return EXIT_SUCCESS;
 }

src/mjolnir/valhalla_add_predicted_traffic.cc

@@ -240,7 +240,6 @@ void update_tiles(
 int main(int argc, char** argv) {
   const auto program = filesystem::path(__FILE__).stem().string();
   // args
-  boost::property_tree::ptree config;
   filesystem::path traffic_tile_dir;
   bool summary = false;
 
@@ -264,7 +263,7 @@ int main(int argc, char** argv) {
     options.parse_positional({"traffic-tile-dir"});
     options.positional_help("Traffic tile dir");
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, config, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
 
     if (!result.count("traffic-tile-dir")) {
@@ -281,6 +280,8 @@ int main(int argc, char** argv) {
     return EXIT_FAILURE;
   }
 
+  auto config = valhalla::config();
+
   // configure logging
   auto logging_subtree = config.get_child_optional("mjolnir.logging");
   if (logging_subtree) {

src/mjolnir/valhalla_assign_speeds.cc

@@ -78,8 +78,6 @@
 
 int main(int argc, char** argv) {
   const auto program = filesystem::path(__FILE__).stem().string();
-  // args
-  bpt::ptree config;
 
   try {
     // clang-format off
@@ -97,7 +95,7 @@
     // clang-format on
 
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, config, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
   } catch (cxxopts::OptionException& e) {
     std::cerr << e.what() << std::endl;
@@ -108,6 +106,8 @@
     return EXIT_FAILURE;
   }
 
+  auto config = valhalla::config();
+
   // configure logging
   config.get_child("mjolnir").erase("tile_extract");
   config.get_child("mjolnir").erase("tile_url");

src/mjolnir/valhalla_benchmark_admins.cc

@@ -201,7 +201,6 @@
   const auto program = filesystem::path(__FILE__).stem().string();
   // args
   std::vector<std::string> input_files;
-  boost::property_tree::ptree config;
 
   try {
     // clang-format off
@@ -218,7 +217,7 @@
     // clang-format on
 
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, config, "mjolnir.logging"))
+    if (!parse_common_args(program, options, result, "mjolnir.logging"))
       return EXIT_SUCCESS;
 
     if (result.count("version")) {
@@ -234,6 +233,8 @@
     return EXIT_FAILURE;
   }
 
+  auto config = valhalla::config();
+
   // Configure logging
   auto logging_subtree = config.get_child_optional("mjolnir.logging");
   if (logging_subtree) {

src/mjolnir/valhalla_build_admins.cc

@@ -14,7 +14,6 @@
   const auto program = filesystem::path(__FILE__).stem().string();
   // args
   std::vector<std::string> input_files;
-  boost::property_tree::ptree pt;
 
   try {
     // clang-format off
@@ -37,7 +36,7 @@
     options.parse_positional({"input_files"});
     options.positional_help("OSM PBF file(s)");
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging"))
+    if (!parse_common_args(program, options, result, "mjolnir.logging"))
       return EXIT_SUCCESS;
 
     // input files are positional
@@ -54,16 +53,16 @@
   }
 
   // configure logging
-  auto logging_subtree = pt.get_child_optional("mjolnir.logging");
+  auto logging_subtree = valhalla::config().get_child_optional("mjolnir.logging");
   if (logging_subtree) {
     auto logging_config =
         valhalla::midgard::ToMap<const boost::property_tree::ptree&,
                                  std::unordered_map<std::string, std::string>>(logging_subtree.get());
     valhalla::midgard::logging::Configure(logging_config);
   }
 
-  if (!valhalla::mjolnir::BuildAdminFromPBF(pt.get_child("mjolnir"), input_files)) {
+  if (!valhalla::mjolnir::BuildAdminFromPBF(valhalla::config().get_child("mjolnir"), input_files)) {
     return EXIT_FAILURE;
   };
 
   return EXIT_SUCCESS;

src/mjolnir/valhalla_build_connectivity.cc

@@ -46,8 +46,6 @@
 // Main application to create a ppm image file of connectivity.
 int main(int argc, char** argv) {
   const auto program = filesystem::path(__FILE__).stem().string();
-  // args
-  boost::property_tree::ptree pt;
   try {
     // clang-format off
     cxxopts::Options options(
@@ -64,7 +62,7 @@
     // clang-format on
 
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging"))
+    if (!parse_common_args(program, options, result, "mjolnir.logging"))
       return EXIT_SUCCESS;
   } catch (cxxopts::OptionException& e) {
     std::cerr << e.what() << std::endl;
@@ -76,7 +74,7 @@
   }
 
   // Get something we can use to fetch tiles
-  valhalla::baldr::connectivity_map_t connectivity_map(pt.get_child("mjolnir"));
+  valhalla::baldr::connectivity_map_t connectivity_map(valhalla::config().get_child("mjolnir"));
 
   uint32_t transit_level = TileHierarchy::levels().back().level + 1;
   for (uint32_t level = 0; level <= transit_level; level++) {

src/mjolnir/valhalla_build_landmarks.cc

@@ -10,7 +10,6 @@
   const auto program = filesystem::path(__FILE__).stem().string();
   // args
   std::vector<std::string> input_files;
-  boost::property_tree::ptree pt;
 
   try {
     // clang-format off
@@ -32,7 +31,7 @@
     options.parse_positional({"input_files"});
     options.positional_help("OSM PBF file(s)");
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging"))
+    if (!parse_common_args(program, options, result, "mjolnir.logging"))
       return EXIT_SUCCESS;
 
     // input files are positional
@@ -49,15 +48,16 @@
   }
 
   // configure logging
-  auto logging_subtree = pt.get_child_optional("mjolnir.logging");
+  auto logging_subtree = valhalla::config().get_child_optional("mjolnir.logging");
   if (logging_subtree) {
     auto logging_config =
         valhalla::midgard::ToMap<const boost::property_tree::ptree&,
                                  std::unordered_map<std::string, std::string>>(logging_subtree.get());
     valhalla::midgard::logging::Configure(logging_config);
   }
 
-  if (!valhalla::mjolnir::BuildLandmarkFromPBF(pt.get_child("mjolnir"), input_files)) {
+  if (!valhalla::mjolnir::BuildLandmarkFromPBF(valhalla::config().get_child("mjolnir"),
+                                               input_files)) {
     return EXIT_FAILURE;
   };
 

src/mjolnir/valhalla_build_statistics.cc

@@ -572,8 +572,6 @@
 
 int main(int argc, char** argv) {
   const auto program = filesystem::path(__FILE__).stem().string();
-  // args
-  boost::property_tree::ptree pt;
 
   try {
     // clang-format off
@@ -591,7 +589,7 @@
     // clang-format on
 
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
   } catch (cxxopts::OptionException& e) {
     std::cerr << e.what() << std::endl;
@@ -602,7 +600,7 @@
     return EXIT_FAILURE;
   }
 
-  BuildStatistics(pt);
+  BuildStatistics(valhalla::config());
 
   return EXIT_SUCCESS;
 }

src/mjolnir/valhalla_build_tiles.cc

@@ -31,7 +31,6 @@ int main(int argc, char** argv) {
   std::vector<std::string> input_files;
   BuildStage start_stage = BuildStage::kInitialize;
   BuildStage end_stage = BuildStage::kCleanup;
-  boost::property_tree::ptree pt;
 
   try {
 
@@ -58,7 +57,7 @@ int main(int argc, char** argv) {
     options.parse_positional({"input_files"});
     options.positional_help("OSM PBF file(s)");
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
 
     // Convert stage strings to BuildStage
@@ -99,7 +98,7 @@ int main(int argc, char** argv) {
   }
 
   // Build some tiles!
-  if (build_tile_set(pt, input_files, start_stage, end_stage)) {
+  if (build_tile_set(valhalla::config(), input_files, start_stage, end_stage)) {
     return EXIT_SUCCESS;
   } else {
     return EXIT_FAILURE;

src/mjolnir/valhalla_convert_transit.cc

@@ -35,9 +35,11 @@
     // clang-format on
 
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
 
+    pt = valhalla::config();
+
     if (result.count("target_directory")) {
       pt.get_child("mjolnir").erase("transit_dir");
       pt.add("mjolnir.transit_dir", result["target_directory"].as<std::string>());

src/mjolnir/valhalla_ingest_transit.cc

@@ -8,8 +8,6 @@
 
 int main(int argc, char** argv) {
   const auto program = filesystem::path(__FILE__).stem().string();
-  // args
-  boost::property_tree::ptree pt;
 
   try {
     // clang-format off
@@ -27,7 +25,7 @@
     // clang-format on
 
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
   } catch (cxxopts::OptionException& e) {
     std::cerr << e.what() << std::endl;
@@ -38,6 +36,8 @@
     return EXIT_FAILURE;
   }
 
+  const auto& pt = valhalla::config();
+
   // spawn threads to download all the tiles returning a list of
   // tiles that ended up having dangling stop pairs
   auto dangling_tiles = valhalla::mjolnir::ingest_transit(pt);

src/mjolnir/valhalla_query_transit.cc

@@ -365,7 +365,6 @@
 int main(int argc, char* argv[]) {
   const auto program = filesystem::path(__FILE__).stem().string();
   // args
-  boost::property_tree::ptree pt;
   double o_lng, o_lat, d_lng, d_lat;
   std::string o_onestop_id, d_onestop_id, time;
   int tripid;
@@ -392,7 +391,7 @@
     // clang-format on
 
     auto result = options.parse(argc, argv);
-    if (!parse_common_args(program, options, result, pt, "mjolnir.logging", true))
+    if (!parse_common_args(program, options, result, "mjolnir.logging", true))
       return EXIT_SUCCESS;
 
     for (const auto& arg : std::vector<std::string>{"o_onestop_id", "o_lat", "o_lng"}) {
@@ -413,7 +412,7 @@
   LOG_INFO("Read config");
 
   // Bail if no transit dir
-  auto transit_dir = pt.get_optional<std::string>("mjolnir.transit_dir");
+  auto transit_dir = valhalla::config().get_optional<std::string>("mjolnir.transit_dir");
   if (!transit_dir || !filesystem::exists(*transit_dir) || !filesystem::is_directory(*transit_dir)) {
     LOG_INFO("Transit directory not found.");
     return 0;