Fixes resource leaks and removes deprecated c_str() calls where possible

Server/DataStructures/QueryObjectsStorage.cpp

@@ -21,32 +21,37 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 #include "QueryObjectsStorage.h"
 
-QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map<const std::string,boost::filesystem::path>& paths) {
-	if( paths["hsgrdata"].empty() ) {
+QueryObjectsStorage::QueryObjectsStorage( const ServerPaths & paths ) {
+	if( paths.find("hsgrdata") == paths.end() ) {
 		throw OSRMException("no hsgr file given in ini file");
 	}
-	if( paths["ramindex"].empty() ) {
+	if( paths.find("ramindex") == paths.end() ) {
 		throw OSRMException("no ram index file given in ini file");
 	}
-	if( paths["fileindex"].empty() ) {
+	if( paths.find("fileindex") == paths.end() ) {
 		throw OSRMException("no mem index file given in ini file");
 	}
-	if( paths["nodesdata"].empty() ) {
+	if( paths.find("nodesdata") == paths.end() ) {
 		throw OSRMException("no nodes file given in ini file");
 	}
-	if( paths["edgesdata"].empty() ) {
+	if( paths.find("edgesdata") == paths.end() ) {
 		throw OSRMException("no edges file given in ini file");
 	}
-	if( paths["namesdata"].empty() ) {
+	if( paths.find("namesdata") == paths.end() ) {
 		throw OSRMException("no names file given in ini file");
 	}
 
 	SimpleLogger().Write() << "loading graph data";
 	//Deserialize road network graph
+
+	ServerPaths::const_iterator paths_iterator = paths.find("hsgrdata");
+	BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & hsgr_data_string = paths_iterator->second.string();
+
 	std::vector< QueryGraph::_StrNode> node_list;
 	std::vector< QueryGraph::_StrEdge> edge_list;
 	const int number_of_nodes = readHSGRFromStream(
-		paths["hsgrdata"].c_str(),
+		hsgr_data_string,
 		node_list,
 		edge_list,
 		&check_sum
@@ -54,18 +59,22 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map<const std::string,
 
 	SimpleLogger().Write() << "Data checksum is " << check_sum;
 	graph = new QueryGraph(node_list, edge_list);
-	assert(0 == node_list.size());
-	assert(0 == edge_list.size());
+	BOOST_ASSERT(0 == node_list.size());
+	BOOST_ASSERT(0 == edge_list.size());
 
-	if(!paths["timestamp"].empty()) {
+	paths_iterator = paths.find("hsgrdata");
+
+	if(paths.end() != paths_iterator) {
 	    SimpleLogger().Write() << "Loading Timestamp";
-	    std::ifstream timestampInStream(paths["timestamp"].c_str());
-	    if(!timestampInStream) {
-	        SimpleLogger().Write(logWARNING) <<  paths["timestamp"].c_str() <<  " not found";
+    	const std::string & timestamp_string = paths_iterator->second.string();
+
+	    boost::filesystem::ifstream time_stamp_instream(timestamp_string);
+	    if( !time_stamp_instream.good() ) {
+	        SimpleLogger().Write(logWARNING) << timestamp_string << " not found";
 	    }
 
-	    getline(timestampInStream, timestamp);
-	    timestampInStream.close();
+	    getline(time_stamp_instream, timestamp);
+	    time_stamp_instream.close();
 	}
 	if(!timestamp.length()) {
 	    timestamp = "n/a";
@@ -75,12 +84,26 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map<const std::string,
 	}
 
     SimpleLogger().Write() << "Loading auxiliary information";
+
+    paths_iterator = paths.find("ramindex");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+    const std::string & ram_index_string = paths_iterator->second.string();
+	paths_iterator = paths.find("fileindex");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & file_index_string = paths_iterator->second.string();
+	paths_iterator = paths.find("nodesdata");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & nodes_data_string = paths_iterator->second.string();
+	paths_iterator = paths.find("edgesdata");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & edges_data_string = paths_iterator->second.string();
+
     //Init nearest neighbor data structure
 	nodeHelpDesk = new NodeInformationHelpDesk(
-		paths["ramindex"].c_str(),
-		paths["fileindex"].c_str(),
-		paths["nodesdata"].c_str(),
-		paths["edgesdata"].c_str(),
+		ram_index_string,
+		file_index_string,
+		nodes_data_string,
+		edges_data_string,
 		number_of_nodes,
 		check_sum
 	);
@@ -88,14 +111,17 @@ QueryObjectsStorage::QueryObjectsStorage(boost::unordered_map<const std::string,
 	//deserialize street name list
 	SimpleLogger().Write() << "Loading names index";
 
-    if ( !boost::filesystem::exists( paths["namesdata"] ) ) {
+	paths_iterator = paths.find("namesdata");
+    BOOST_ASSERT(paths.end() != paths_iterator);
+	const std::string & names_data_string = paths_iterator->second.string();
+    if ( !boost::filesystem::exists( paths_iterator->second ) ) {
         throw OSRMException("names file does not exist");
     }
-    if ( 0 == boost::filesystem::file_size( paths["namesdata"] ) ) {
+    if ( 0 == boost::filesystem::file_size( paths_iterator->second ) ) {
         throw OSRMException("names file is empty");
     }
 
-	boost::filesystem::ifstream name_stream(paths["namesdata"], std::ios::binary);
+	boost::filesystem::ifstream name_stream(names_data_string, std::ios::binary);
 	unsigned size = 0;
 	name_stream.read((char *)&size, sizeof(unsigned));
 	BOOST_ASSERT_MSG(0 != size, "name file broken");

Server/DataStructures/QueryObjectsStorage.h

@@ -24,6 +24,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 #include "../../Util/GraphLoader.h"
 #include "../../Util/OSRMException.h"
+#include "../../Util/ProgramOptions.h"
 #include "../../Util/SimpleLogger.h"
 #include "../../DataStructures/NodeInformationHelpDesk.h"
 #include "../../DataStructures/QueryEdge.h"
@@ -48,9 +49,9 @@ struct QueryObjectsStorage {
     std::string                                 timestamp;
     unsigned                                    check_sum;
 
-    void GetName(const unsigned name_id, std::string & result) const;
+    void GetName( const unsigned name_id, std::string & result ) const;
 
-    QueryObjectsStorage(boost::unordered_map<const std::string,boost::filesystem::path>& paths);
+    QueryObjectsStorage( const ServerPaths & paths );
     ~QueryObjectsStorage();
 };