From ab637e22b1c5541a83215a041867e63228dbbe3a Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 17 Sep 2013 18:37:08 +0200 Subject: [PATCH] instantiate different inherited class at bcp that provides all data --- Library/OSRM.cpp | 99 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/Library/OSRM.cpp b/Library/OSRM.cpp index 0061dade4..d75d5bf40 100644 --- a/Library/OSRM.cpp +++ b/Library/OSRM.cpp @@ -12,6 +12,7 @@ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +<<<<<<< HEAD THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -28,13 +29,97 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OSRM.h" #include -OSRM::OSRM(boost::unordered_map& paths) { - objects = new QueryObjectsStorage( paths ); - RegisterPlugin(new HelloWorldPlugin()); - RegisterPlugin(new LocatePlugin(objects)); - RegisterPlugin(new NearestPlugin(objects)); - RegisterPlugin(new TimestampPlugin(objects)); - RegisterPlugin(new ViaRoutePlugin(objects)); +OSRM::OSRM(const char * server_ini_path, const bool use_shared_memory) + : use_shared_memory(use_shared_memory) +{ + if( !use_shared_memory ) { + if( !testDataFile(server_ini_path) ){ + std::string error_message = std::string(server_ini_path) + " not found"; + throw OSRMException(error_message.c_str()); + } + + IniFile serverConfig(server_ini_path); + + boost::filesystem::path base_path = + boost::filesystem::absolute(server_ini_path).parent_path(); + + if ( !serverConfig.Holds("hsgrData")) { + throw OSRMException("no ram index file name in server ini"); + } + if ( !serverConfig.Holds("ramIndex") ) { + throw OSRMException("no mem index file name in server ini"); + } + if ( !serverConfig.Holds("fileIndex") ) { + throw OSRMException("no nodes file name in server ini"); + } + if ( !serverConfig.Holds("nodesData") ) { + throw OSRMException("no nodes file name in server ini"); + } + if ( !serverConfig.Holds("edgesData") ) { + throw OSRMException("no edges file name in server ini"); + } + + boost::filesystem::path hsgr_path = boost::filesystem::absolute( + serverConfig.GetParameter("hsgrData"), + base_path + ); + + boost::filesystem::path ram_index_path = boost::filesystem::absolute( + serverConfig.GetParameter("ramIndex"), + base_path + ); + + boost::filesystem::path file_index_path = boost::filesystem::absolute( + serverConfig.GetParameter("fileIndex"), + base_path + ); + + boost::filesystem::path node_data_path = boost::filesystem::absolute( + serverConfig.GetParameter("nodesData"), + base_path + ); + boost::filesystem::path edge_data_path = boost::filesystem::absolute( + serverConfig.GetParameter("edgesData"), + base_path + ); + boost::filesystem::path name_data_path = boost::filesystem::absolute( + serverConfig.GetParameter("namesData"), + base_path + ); + boost::filesystem::path timestamp_path = boost::filesystem::absolute( + serverConfig.GetParameter("timestamp"), + base_path + ); + + objects = new QueryObjectsStorage( + hsgr_path.string(), + ram_index_path.string(), + file_index_path.string(), + node_data_path.string(), + edge_data_path.string(), + name_data_path.string(), + timestamp_path.string() + ); + + RegisterPlugin(new HelloWorldPlugin()); + RegisterPlugin(new LocatePlugin(objects)); + RegisterPlugin(new NearestPlugin(objects)); + RegisterPlugin(new TimestampPlugin(objects)); + RegisterPlugin(new ViaRoutePlugin(objects)); + + } else { + //TODO: fetch pointers from shared memory + + //TODO: objects = new QueryObjectsStorage() + + //TODO: generate shared memory plugins + RegisterPlugin(new HelloWorldPlugin()); + RegisterPlugin(new LocatePlugin(objects)); + RegisterPlugin(new NearestPlugin(objects)); + RegisterPlugin(new TimestampPlugin(objects)); + RegisterPlugin(new ViaRoutePlugin(objects)); + + } } OSRM::~OSRM() {