Merge pull request #1446 from Project-OSRM/fix/sharedmemory-default

Fix/sharedmemory default
Project-OSRM · Apr 22, 2015 · d2a19ec · d2a19ec
2 parents fbb4e90 + 8f3feac
commit d2a19ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/include/osrm/libosrm_config.hpp b/include/osrm/libosrm_config.hpp
@@ -35,13 +35,13 @@ struct libosrm_config
     libosrm_config(const libosrm_config &) = delete;
     libosrm_config()
         : max_locations_distance_table(100), max_locations_map_matching(-1),
-          use_shared_memory(false)
+          use_shared_memory(true)
     {
     }
 
-    libosrm_config(const ServerPaths &paths, const bool flag, const int max_table, const int max_matching)
+    libosrm_config(const ServerPaths &paths, const bool sharedmemory_flag, const int max_table, const int max_matching)
         : server_paths(paths), max_locations_distance_table(max_table),
-          max_locations_map_matching(max_matching), use_shared_memory(flag)
+          max_locations_map_matching(max_matching), use_shared_memory(sharedmemory_flag)
     {
     }
 

diff --git a/routed.cpp b/routed.cpp
@@ -74,6 +74,8 @@ int main(int argc, const char *argv[])
         int ip_port, requested_thread_num;
 
         libosrm_config lib_config;
+        // make the behaviour of routed backward compatible
+        lib_config.use_shared_memory = false;
 
         const unsigned init_result = GenerateServerProgramOptions(
             argc, argv, lib_config.server_paths, ip_address, ip_port, requested_thread_num,