Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1ab2232f3
							
						
					 | 
					
						
						
							
							use iterator based regex replace
						
						
						
						
						
					 | 
					
						2013-10-21 11:46:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf69f43166
							
						
					 | 
					
						
						
							
							add proper licence header to newly added files
						
						
						
						
						
					 | 
					
						2013-10-21 11:45:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							9833438733
							
						
					 | 
					
						
						
							
							add better comment
						
						
						
						
						
					 | 
					
						2013-10-18 21:58:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							19a457ab7d
							
						
					 | 
					
						
						
							
							implement update barrier
						
						
						
						
						
					 | 
					
						2013-10-17 18:11:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							53a0bc963a
							
						
					 | 
					
						
						
							
							indicate the type of memory to the user
						
						
						
						
						
					 | 
					
						2013-10-16 13:40:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2819d822a
							
						
					 | 
					
						
						
							
							load data from server.ini only iff no parameters are give
						
						
						
						
						
					 | 
					
						2013-10-16 13:27:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							175112d97d
							
						
					 | 
					
						
						
							
							fix status messages during configure
						
						
						
						
						
					 | 
					
						2013-10-16 11:58:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							dced47024f
							
						
					 | 
					
						
						
							
							replace FLT_EPSILON with proper C++ variant
						
						
						
						
						
					 | 
					
						2013-10-15 18:42:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffc361406e
							
						
					 | 
					
						
						
							
							move git descriptor into a static library that is linked against all tools
						
						
						
						
						
					 | 
					
						2013-10-15 18:28:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							852c648235
							
						
					 | 
					
						
						
							
							use program options in data store tool
						
						
						
						
						
					 | 
					
						2013-10-15 18:24:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							1197b96c49
							
						
					 | 
					
						
						
							
							add shared memory option to command line parameters
						
						
						
						
						
					 | 
					
						2013-10-15 17:06:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							f21fe81e16
							
						
					 | 
					
						
						
							
							remove superflous include guard
						
						
						
						
						
					 | 
					
						2013-10-15 17:06:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							593dfd0108
							
						
					 | 
					
						
						
							
							Merging and rebasing of develop into shared_memory
						
						
						
						
						
						
						
						Conflicts:
	DataStructures/SearchEngine.h
	DataStructures/StaticRTree.h
	Descriptors/DescriptionFactory.cpp
	Library/OSRM.cpp
	Library/OSRM.h
	RoutingAlgorithms/BasicRoutingInterface.h
	RoutingAlgorithms/ShortestPathRouting.h
	Server/DataStructures/BaseDataFacade.h
	Server/DataStructures/InternalDataFacade.h
	Server/DataStructures/QueryObjectsStorage.cpp
	Server/DataStructures/SharedDataFacade.h
	routed.cpp 
						
					 | 
					
						2013-10-15 17:04:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							aaf0fb9d12
							
						
					 | 
					
						
						
							
							Rework facades to accept ServerPaths object as configuration
						
						
						
						
						
					 | 
					
						2013-10-15 15:44:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							02e9f8aef3
							
						
					 | 
					
						
						
							
							Rework facades to accept ServerPaths object as configuration
						
						
						
						
						
					 | 
					
						2013-10-15 15:44:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							424055c04e
							
						
					 | 
					
						
						
							
							fix iterator concept implementation
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							02daf17326
							
						
					 | 
					
						
						
							
							fix iterator concept implementation
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							a666f0d52e
							
						
					 | 
					
						
						
							
							change EdgeBasedNode namespace
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DennisOSRM
							
						 
					 | 
					
						
						
						
						
							
						
						
							27a760c58c
							
						
					 | 
					
						
						
							
							Move edge-based node out ouf surrounding class
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ba12f48c6
							
						
					 | 
					
						
						
							
							state type of template class member function explicitly
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							eaaf54d886
							
						
					 | 
					
						
						
							
							make C++11 default on OS X
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b3d634fe9
							
						
					 | 
					
						
						
							
							always compile with C++11 on OS X (Linux to follow)
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							f77a699ea4
							
						
					 | 
					
						
						
							
							remove problematic luabind code
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							e989e38cc2
							
						
					 | 
					
						
						
							
							further compile fixes for clang 3.3 (OS X 10.9)
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a900ed6e7
							
						
					 | 
					
						
						
							
							remove unneeded member
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							29e6b85f79
							
						
					 | 
					
						
						
							
							Add explicit shmem id for data loading
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2641408d53
							
						
					 | 
					
						
						
							
							fail gracefully when lock file is not present
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b79226183
							
						
					 | 
					
						
						
							
							add static function to remove shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							98f9f0cd48
							
						
					 | 
					
						
						
							
							make shmem swappable by ref and ptr
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf7e107ad1
							
						
					 | 
					
						
						
							
							check if shmem segment exists
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab66c1aa1b
							
						
					 | 
					
						
						
							
							mild refactoring of debug outputs
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b03366909
							
						
					 | 
					
						
						
							
							checking if data files actually exist
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7824e1446a
							
						
					 | 
					
						
						
							
							removing completed todo markers
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							59cf1a4937
							
						
					 | 
					
						
						
							
							deciding which memory subsystem to use depending on server.ini
						
						
						
						
						
					 | 
					
						2013-10-15 14:35:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							252113c838
							
						
					 | 
					
						
						
							
							implementing the fetch of name ids in shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2f84d1acd
							
						
					 | 
					
						
						
							
							commenting unneeded variables
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							204dcecb28
							
						
					 | 
					
						
						
							
							fixing typo in build configuration
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							70bbfbea12
							
						
					 | 
					
						
						
							
							fixing include typo
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2221a0a908
							
						
					 | 
					
						
						
							
							removing extra ;
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							203b215093
							
						
					 | 
					
						
						
							
							loading correct file with rtree leafs and not inner nodes
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							76ee84dae8
							
						
					 | 
					
						
						
							
							printing debug output
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							79e1c87a01
							
						
					 | 
					
						
						
							
							swapping correct vectors
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed208114be
							
						
					 | 
					
						
						
							
							properly loading all data into shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dd711b37c
							
						
					 | 
					
						
						
							
							use only one pointer for shared layout
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4852802d66
							
						
					 | 
					
						
						
							
							load graph into shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							c495b1faab
							
						
					 | 
					
						
						
							
							graph format now canonical
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb5bd8e6ac
							
						
					 | 
					
						
						
							
							load timestamp into shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff7dcf9c17
							
						
					 | 
					
						
						
							
							load coordinate list into shared memory
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b12a16c84
							
						
					 | 
					
						
						
							
							load orig edge information
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dennis Luxen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d00b2ebbb
							
						
					 | 
					
						
						
							
							Renaming variables to properly reflect its content
						
						
						
						
						
					 | 
					
						2013-10-15 14:32:43 +02:00 | 
					
					
						
						
							
							
							
						
					 |