renamed: Util/OSRMException.h -> Util/osrm_exception.hpp

Elveris · Jan 5, 2015 · 25326b5 · 25326b5
1 parent 5e2f4c9
commit 25326b5
Show file tree

Hide file tree

Showing 26 changed files with 177 additions and 131 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,15 +56,16 @@ file(GLOB ImporterGlob data_structures/import_edge.cpp data_structures/external_
 add_library(IMPORT OBJECT ${ImporterGlob})
 add_library(LOGGER OBJECT Util/simple_logger.cpp)
 add_library(PHANTOMNODE OBJECT data_structures/phantom_node.cpp)
+add_library(EXCEPTION OBJECT Util/osrm_exception.cpp)
 
 set(ExtractorSources extract.cpp ${ExtractorGlob})
-add_executable(osrm-extract ${ExtractorSources} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER>)
+add_executable(osrm-extract ${ExtractorSources} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:EXCEPTION>)
 
 add_library(RESTRICTION OBJECT data_structures/restriction_map.cpp)
 
 file(GLOB PrepareGlob contractor/*.cpp data_structures/hilbert_value.cpp Util/compute_angle.cpp {RestrictionMapGlob})
 set(PrepareSources prepare.cpp ${PrepareGlob})
-add_executable(osrm-prepare ${PrepareSources} $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION>)
+add_executable(osrm-prepare ${PrepareSources} $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION> $<TARGET_OBJECTS:EXCEPTION>)
 
 file(GLOB ServerGlob Server/*.cpp)
 file(GLOB DescriptorGlob descriptors/*.cpp)
@@ -92,15 +93,15 @@ add_library(GITDESCRIPTION OBJECT Util/git_sha.cpp)
 add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
 add_dependencies(FINGERPRINT FingerPrintConfigure)
 
-add_executable(osrm-routed routed.cpp ${ServerGlob})
-add_executable(osrm-datastore datastore.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
+add_executable(osrm-routed routed.cpp ${ServerGlob} $<TARGET_OBJECTS:EXCEPTION>)
+add_executable(osrm-datastore datastore.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:EXCEPTION>)
 
 # Unit tests
-add_executable(datastructure-tests EXCLUDE_FROM_ALL UnitTests/datastructure_tests.cpp ${DataStructureTestsGlob} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
-add_executable(algorithm-tests EXCLUDE_FROM_ALL UnitTests/algorithm_tests.cpp ${AlgorithmTestsGlob} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
+add_executable(datastructure-tests EXCLUDE_FROM_ALL UnitTests/datastructure_tests.cpp ${DataStructureTestsGlob} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION>)
+add_executable(algorithm-tests EXCLUDE_FROM_ALL UnitTests/algorithm_tests.cpp ${AlgorithmTestsGlob} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION>)
 
 # Benchmarks
-add_executable(rtree-bench EXCLUDE_FROM_ALL benchmarks/static_rtree.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE>)
+add_executable(rtree-bench EXCLUDE_FROM_ALL benchmarks/static_rtree.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION>)
 
 # Check the release mode
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
@@ -139,7 +140,7 @@ endif()
 # Configuring compilers
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   # using Clang
-  #  -Weverything -Wno-c++98-compat
+  #  -Weverything -Wno-c++98-compat -Wno-shadow -Wno-exit-time-destructors
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunreachable-code -pedantic -fPIC")
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   set(COLOR_FLAG "-fdiagnostics-color=auto")
@@ -288,7 +289,7 @@ if(WITH_TOOLS OR BUILD_TOOLS)
   message(STATUS "Activating OSRM internal tools")
   find_package(GDAL)
   if(GDAL_FOUND)
-    add_executable(osrm-components tools/components.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION>)
+    add_executable(osrm-components tools/components.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION> $<TARGET_OBJECTS:EXCEPTION>)
     target_link_libraries(osrm-components ${TBB_LIBRARIES})
     include_directories(${GDAL_INCLUDE_DIR})
     target_link_libraries(
@@ -298,19 +299,19 @@ if(WITH_TOOLS OR BUILD_TOOLS)
   else()
     message(FATAL_ERROR "libgdal and/or development headers not found")
   endif()
-  add_executable(osrm-cli tools/simpleclient.cpp $<TARGET_OBJECTS:LOGGER>)
+  add_executable(osrm-cli tools/simpleclient.cpp $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:LOGGER>)
   target_link_libraries(osrm-cli ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
   target_link_libraries(osrm-cli ${TBB_LIBRARIES})
-  add_executable(osrm-io-benchmark tools/io-benchmark.cpp $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
+  add_executable(osrm-io-benchmark tools/io-benchmark.cpp $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
   target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES})
-  add_executable(osrm-unlock-all tools/unlock_all_mutexes.cpp $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
+  add_executable(osrm-unlock-all tools/unlock_all_mutexes.cpp $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:EXCEPTION>)
   target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
   if(UNIX AND NOT APPLE)
     target_link_libraries(osrm-unlock-all rt)
   endif()
-  add_executable(osrm-check-hsgr tools/check-hsgr.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:LOGGER>)
+  add_executable(osrm-check-hsgr tools/check-hsgr.cpp $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:LOGGER>)
   target_link_libraries(osrm-check-hsgr ${Boost_LIBRARIES})
-  add_executable(osrm-springclean tools/springclean.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:GITDESCRIPTION>)
+  add_executable(osrm-springclean tools/springclean.cpp $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:EXCEPTION>)
   target_link_libraries(osrm-springclean ${Boost_LIBRARIES})
 
   install(TARGETS osrm-cli DESTINATION bin)

diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../data_structures/phantom_node.hpp"
 #include "../../data_structures/turn_instructions.hpp"
 #include "../../Util/integer_range.hpp"
-#include "../../Util/OSRMException.h"
+#include "../../Util/osrm_exception.hpp"
 #include "../../Util/string_util.hpp"
 #include "../../typedefs.h"
 

diff --git a/Server/DataStructures/InternalDataFacade.h b/Server/DataStructures/InternalDataFacade.h
@@ -235,31 +235,31 @@ template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<Edge
         // generate paths of data files
         if (server_paths.find("hsgrdata") == server_paths.end())
         {
-            throw OSRMException("no hsgr file given in ini file");
+            throw osrm::exception("no hsgr file given in ini file");
         }
         if (server_paths.find("ramindex") == server_paths.end())
         {
-            throw OSRMException("no ram index file given in ini file");
+            throw osrm::exception("no ram index file given in ini file");
         }
         if (server_paths.find("fileindex") == server_paths.end())
         {
-            throw OSRMException("no leaf index file given in ini file");
+            throw osrm::exception("no leaf index file given in ini file");
         }
         if (server_paths.find("geometries") == server_paths.end())
         {
-            throw OSRMException("no geometries file given in ini file");
+            throw osrm::exception("no geometries file given in ini file");
         }
         if (server_paths.find("nodesdata") == server_paths.end())
         {
-            throw OSRMException("no nodes file given in ini file");
+            throw osrm::exception("no nodes file given in ini file");
         }
         if (server_paths.find("edgesdata") == server_paths.end())
         {
-            throw OSRMException("no edges file given in ini file");
+            throw osrm::exception("no edges file given in ini file");
         }
         if (server_paths.find("namesdata") == server_paths.end())
         {
-            throw OSRMException("no names file given in ini file");
+            throw osrm::exception("no names file given in ini file");
         }
 
         ServerPaths::const_iterator paths_iterator = server_paths.find("hsgrdata");

diff --git a/Server/DataStructures/SharedDataFacade.h b/Server/DataStructures/SharedDataFacade.h
@@ -258,7 +258,7 @@ template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDa
             if (!boost::filesystem::exists(file_index_path))
             {
                 SimpleLogger().Write(logDEBUG) << "Leaf file name " << file_index_path.string();
-                throw OSRMException("Could not load leaf index file."
+                throw osrm::exception("Could not load leaf index file."
                                     "Is any data loaded into shared memory?");
             }
 

diff --git a/Server/DataStructures/SharedDataType.h b/Server/DataStructures/SharedDataType.h
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef SHARED_DATA_TYPE_H_
 #define SHARED_DATA_TYPE_H_
 
-#include "../../Util/OSRMException.h"
+#include "../../Util/osrm_exception.hpp"
 #include "../../Util/simple_logger.hpp"
 
 #include <cstdint>
@@ -162,11 +162,11 @@ struct SharedDataLayout
             bool end_canary_alive = std::equal(CANARY, CANARY + sizeof(CANARY), end_canary_ptr);
             if (!start_canary_alive)
             {
-                throw OSRMException("Start canary of block corrupted.");
+                throw osrm::exception("Start canary of block corrupted.");
             }
             if (!end_canary_alive)
             {
-                throw OSRMException("End canary of block corrupted.");
+                throw osrm::exception("End canary of block corrupted.");
             }
         }
 

diff --git a/Util/BoostFileSystemFix.h b/Util/BoostFileSystemFix.h
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef BOOST_FILE_SYSTEM_FIX_H
 #define BOOST_FILE_SYSTEM_FIX_H
 
-#include "OSRMException.h"
+#include "osrm_exception.hpp"
 
 // #include <boost/any.hpp>
 #include <boost/filesystem.hpp>
@@ -62,7 +62,7 @@ namespace filesystem
 //     if(boost::filesystem::is_regular_file(input_string)) {
 //         v = boost::any(boost::filesystem::path(input_string));
 //     } else {
-//         throw OSRMException(input_string + " not found");
+//         throw osrm::exception(input_string + " not found");
 //     }
 // }
 
@@ -137,7 +137,7 @@ inline void AssertPathExists(const boost::filesystem::path &path)
 {
     if (!boost::filesystem::is_regular_file(path))
     {
-        throw OSRMException(path.string() + " not found.");
+        throw osrm::exception(path.string() + " not found.");
     }
 }
 

diff --git a/Util/DataStoreOptions.h b/Util/DataStoreOptions.h
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BoostFileSystemFix.h"
 #include "git_sha.hpp"
 #include "IniFileUtil.h"
-#include "OSRMException.h"
+#include "osrm_exception.hpp"
 #include "simple_logger.hpp"
 
 #include <osrm/ServerPaths.h>
@@ -221,56 +221,56 @@ bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &p
     path_iterator = paths.find("hsgrdata");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".hsgr file must be specified");
+        throw osrm::exception(".hsgr file must be specified");
     }
     AssertPathExists(path_iterator->second);
 
     path_iterator = paths.find("nodesdata");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".nodes file must be specified");
+        throw osrm::exception(".nodes file must be specified");
     }
     AssertPathExists(path_iterator->second);
 
     path_iterator = paths.find("edgesdata");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".edges file must be specified");
+        throw osrm::exception(".edges file must be specified");
     }
     AssertPathExists(path_iterator->second);
 
     path_iterator = paths.find("geometry");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".geometry file must be specified");
+        throw osrm::exception(".geometry file must be specified");
     }
     AssertPathExists(path_iterator->second);
 
     path_iterator = paths.find("ramindex");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".ramindex file must be specified");
+        throw osrm::exception(".ramindex file must be specified");
     }
     AssertPathExists(path_iterator->second);
 
     path_iterator = paths.find("fileindex");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".fileindex file must be specified");
+        throw osrm::exception(".fileindex file must be specified");
     }
     AssertPathExists(path_iterator->second);
 
     path_iterator = paths.find("namesdata");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".names file must be specified");
+        throw osrm::exception(".names file must be specified");
     }
     AssertPathExists(path_iterator->second);
 
     path_iterator = paths.find("timestamp");
     if (path_iterator == paths.end() || path_iterator->second.string().empty())
     {
-        throw OSRMException(".timestamp file must be specified");
+        throw osrm::exception(".timestamp file must be specified");
     }
 
     return true;

diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "git_sha.hpp"
 #include "IniFileUtil.h"
-#include "OSRMException.h"
+#include "osrm_exception.hpp"
 #include "simple_logger.hpp"
 
 #include <osrm/ServerPaths.h>
@@ -88,49 +88,49 @@ inline void populate_base_path(ServerPaths &server_paths)
             SimpleLogger().Write() << "not a regular file";
         }
 
-        throw OSRMException(".hsgr not found: " + path_iterator->second.string());
+        throw osrm::exception(".hsgr not found: " + path_iterator->second.string());
     }
 
     path_iterator = server_paths.find("nodesdata");
     if (path_iterator == server_paths.end() ||
         !boost::filesystem::is_regular_file(path_iterator->second))
     {
-        throw OSRMException(".nodes not found");
+        throw osrm::exception(".nodes not found");
     }
 
     path_iterator = server_paths.find("edgesdata");
     if (path_iterator == server_paths.end() ||
         !boost::filesystem::is_regular_file(path_iterator->second))
     {
-        throw OSRMException(".edges not found");
+        throw osrm::exception(".edges not found");
     }
 
     path_iterator = server_paths.find("geometries");
     if (path_iterator == server_paths.end() ||
         !boost::filesystem::is_regular_file(path_iterator->second))
     {
-        throw OSRMException(".geometry not found");
+        throw osrm::exception(".geometry not found");
     }
 
     path_iterator = server_paths.find("ramindex");
     if (path_iterator == server_paths.end() ||
         !boost::filesystem::is_regular_file(path_iterator->second))
     {
-        throw OSRMException(".ramIndex not found");
+        throw osrm::exception(".ramIndex not found");
     }
 
     path_iterator = server_paths.find("fileindex");
     if (path_iterator == server_paths.end() ||
         !boost::filesystem::is_regular_file(path_iterator->second))
     {
-        throw OSRMException(".fileIndex not found");
+        throw osrm::exception(".fileIndex not found");
     }
 
     path_iterator = server_paths.find("namesdata");
     if (path_iterator == server_paths.end() ||
         !boost::filesystem::is_regular_file(path_iterator->second))
     {
-        throw OSRMException(".namesIndex not found");
+        throw osrm::exception(".namesIndex not found");
     }
 
     SimpleLogger().Write() << "HSGR file:\t" << server_paths["hsgrdata"];
@@ -261,7 +261,7 @@ inline unsigned GenerateServerProgramOptions(const int argc,
 
     if (1 > requested_num_threads)
     {
-        throw OSRMException("Number of threads must be a positive number");
+        throw osrm::exception("Number of threads must be a positive number");
     }
 
     if (!use_shared_memory && option_variables.count("base"))

diff --git a/Util/finger_print.cpp.in b/Util/finger_print.cpp.in
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "FingerPrint.h"
 
-#include "OSRMException.h"
+#include "osrm_exception.hpp"
 
 #include <boost/uuid/name_generator.hpp>
 
@@ -70,7 +70,7 @@ bool FingerPrint::TestGraphUtil(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {
-        throw OSRMException("hsgr input file misses magic number. Check or reprocess the file");
+        throw osrm::exception("hsgr input file misses magic number. Check or reprocess the file");
     }
     return std::equal(md5_graph, md5_graph + 32, other.md5_graph);
 }
@@ -79,7 +79,7 @@ bool FingerPrint::TestPrepare(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {
-        throw OSRMException("osrm input file misses magic number. Check or reprocess the file");
+        throw osrm::exception("osrm input file misses magic number. Check or reprocess the file");
     }
     return std::equal(md5_prepare, md5_prepare + 32, other.md5_prepare);
 }
@@ -88,7 +88,7 @@ bool FingerPrint::TestRTree(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {
-        throw OSRMException("r-tree input file misses magic number. Check or reprocess the file");
+        throw osrm::exception("r-tree input file misses magic number. Check or reprocess the file");
     }
     return std::equal(md5_tree, md5_tree + 32, other.md5_tree);
 }
@@ -97,7 +97,7 @@ bool FingerPrint::TestQueryObjects(const FingerPrint &other) const
 {
     if (!other.IsMagicNumberOK())
     {
-        throw OSRMException("missing magic number. Check or reprocess the file");
+        throw osrm::exception("missing magic number. Check or reprocess the file");
     }
     return std::equal(md5_objects, md5_objects + 32, other.md5_objects);
 }