Create public facing libraries for extractor, contractor and datastore

New libraries libosrm_extract, libosrm_contract, libosrm_store
2016-01-07 19:19:55 +01:00
parent b36145e3c4
commit 439eb9da3d
68 changed files with 3266 additions and 3104 deletions
@@ -1,7 +1,10 @@
-#include "contractor/processing_chain.hpp"
-#include "contractor/contractor_options.hpp"
+#include "contractor/contractor.hpp"
+#include "contractor/contractor_config.hpp"
 #include "util/simple_logger.hpp"
+#include "util/version.hpp"

+#include <boost/filesystem.hpp>
+#include <boost/program_options.hpp>
 #include <boost/program_options/errors.hpp>

 #include <tbb/task_scheduler_init.h>
@@ -13,25 +16,131 @@

 using namespace osrm;

+enum class return_code : unsigned
+{
+    ok,
+    fail,
+    exit
+};
+
+return_code
+parseArguments(int argc, char *argv[], contractor::ContractorConfig &contractor_config)
+{
+    // declare a group of options that will be allowed only on command line
+    boost::program_options::options_description generic_options("Options");
+    generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message")(
+        "config,c",
+        boost::program_options::value<boost::filesystem::path>(&contractor_config.config_file_path)
+            ->default_value("contractor.ini"),
+        "Path to a configuration file.");
+
+    // declare a group of options that will be allowed both on command line and in config file
+    boost::program_options::options_description config_options("Configuration");
+    config_options.add_options()(
+        "profile,p",
+        boost::program_options::value<boost::filesystem::path>(&contractor_config.profile_path)
+            ->default_value("profile.lua"),
+        "Path to LUA routing profile")(
+        "threads,t",
+        boost::program_options::value<unsigned int>(&contractor_config.requested_num_threads)
+            ->default_value(tbb::task_scheduler_init::default_num_threads()),
+        "Number of threads to use")(
+        "core,k",
+        boost::program_options::value<double>(&contractor_config.core_factor)->default_value(1.0),
+        "Percentage of the graph (in vertices) to contract [0..1]")(
+        "segment-speed-file",
+        boost::program_options::value<std::string>(&contractor_config.segment_speed_lookup_path),
+        "Lookup file containing nodeA,nodeB,speed data to adjust edge weights")(
+        "level-cache,o", boost::program_options::value<bool>(&contractor_config.use_cached_priority)
+                             ->default_value(false),
+        "Use .level file to retain the contaction level for each node from the last run.");
+
+#ifdef DEBUG_GEOMETRY
+    config_options.add_options()(
+        "debug-geometry",
+        boost::program_options::value<std::string>(&contractor_config.debug_geometry_path),
+        "Write out edge-weight debugging geometry data in GeoJSON format to this file");
+#endif
+
+    // hidden options, will be allowed both on command line and in config file, but will not be
+    // shown to the user
+    boost::program_options::options_description hidden_options("Hidden options");
+    hidden_options.add_options()("input,i", boost::program_options::value<boost::filesystem::path>(
+                                                &contractor_config.osrm_input_path),
+                                 "Input file in .osm, .osm.bz2 or .osm.pbf format");
+
+    // positional option
+    boost::program_options::positional_options_description positional_options;
+    positional_options.add("input", 1);
+
+    // combine above options for parsing
+    boost::program_options::options_description cmdline_options;
+    cmdline_options.add(generic_options).add(config_options).add(hidden_options);
+
+    boost::program_options::options_description config_file_options;
+    config_file_options.add(config_options).add(hidden_options);
+
+    boost::program_options::options_description visible_options(
+        "Usage: " + boost::filesystem::basename(argv[0]) + " <input.osrm> [options]");
+    visible_options.add(generic_options).add(config_options);
+
+    // parse command line options
+    boost::program_options::variables_map option_variables;
+    boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
+                                      .options(cmdline_options)
+                                      .positional(positional_options)
+                                      .run(),
+                                  option_variables);
+
+    const auto &temp_config_path = option_variables["config"].as<boost::filesystem::path>();
+    if (boost::filesystem::is_regular_file(temp_config_path))
+    {
+        boost::program_options::store(boost::program_options::parse_config_file<char>(
+                                          temp_config_path.string().c_str(), cmdline_options, true),
+                                      option_variables);
+    }
+
+    if (option_variables.count("version"))
+    {
+        util::SimpleLogger().Write() << OSRM_VERSION;
+        return return_code::exit;
+    }
+
+    if (option_variables.count("help"))
+    {
+        util::SimpleLogger().Write() << "\n" << visible_options;
+        return return_code::exit;
+    }
+
+    boost::program_options::notify(option_variables);
+
+    if (!option_variables.count("input"))
+    {
+        util::SimpleLogger().Write() << "\n" << visible_options;
+        return return_code::fail;
+    }
+
+    return return_code::ok;
+}
+
 int main(int argc, char *argv[]) try
 {
    util::LogPolicy::GetInstance().Unmute();
    contractor::ContractorConfig contractor_config;

-    const contractor::return_code result =
-        contractor::ContractorOptions::ParseArguments(argc, argv, contractor_config);
+    const return_code result = parseArguments(argc, argv, contractor_config);

-    if (contractor::return_code::fail == result)
+    if (return_code::fail == result)
    {
        return EXIT_FAILURE;
    }

-    if (contractor::return_code::exit == result)
+    if (return_code::exit == result)
    {
        return EXIT_SUCCESS;
    }

-    contractor::ContractorOptions::GenerateOutputFilesNames(contractor_config);
+    contractor_config.UseDefaultOutputNames();

    if (1 > contractor_config.requested_num_threads)
    {
@@ -70,7 +179,7 @@ int main(int argc, char *argv[]) try

    tbb::task_scheduler_init init(contractor_config.requested_num_threads);

-    return contractor::Prepare(contractor_config).Run();
+    return contractor::Contractor(contractor_config).Run();
 }
 catch (const std::bad_alloc &e)
 {