Commit Graph

190 Commits

Author SHA1 Message Date
Dennis Luxen
db5fd5506d partial implementation of new datastore functions 2014-04-24 13:06:55 +02:00
Dennis Luxen
f2be495e95 implement shared data facade geometry loader and getter functions 2014-04-24 13:06:55 +02:00
Dennis Luxen
6d8465a04d implement geometry uncompressing using STL 2014-04-24 13:06:55 +02:00
Dennis Luxen
44077cb007 refactor and streamline use of TurnInstructionsClass members 2014-04-24 12:55:53 +02:00
Dennis Luxen
9cc49f6ff3 remove debug output 2014-04-24 12:54:24 +02:00
Dennis Luxen
ba37836e24 allow graphs with zero edges to load 2014-04-24 12:51:18 +02:00
Dennis Luxen
9b33aaa11a fix test for borked lat/lons 2014-04-24 12:51:17 +02:00
Dennis Luxen
eca09e6c81 unpacking of target segment works 2014-04-24 12:47:00 +02:00
Dennis Luxen
b679a94930 first segment needs to be properly cut 2014-04-24 12:15:04 +02:00
Dennis Luxen
5bde545ce3 All good, but needs unpacking of start and end 2014-04-24 12:07:46 +02:00
Dennis Luxen
c71c8b0047 Unpacking of intermediate paths 2014-04-24 12:03:19 +02:00
Dennis Luxen
b5170ed1fd remove trivial geometry nodes 2014-04-24 11:28:11 +02:00
Dennis Luxen
64720c2d2e several lints fixed that were detected by facebook's flint 2014-04-21 17:40:07 +02:00
andrewbts
482d79ef4b Fix comment typo
SharedDataFacade.h is for the shared memory case; old comment implied the opposite.
2014-03-24 15:52:54 +01:00
Dennis Luxen
c50b69c654 Escape characters in JSON instead of HTML-entetizing, implements #895 2014-03-04 14:54:34 +01:00
Dennis Luxen
7794cd6274 do not instantiate shared memory facility in routed, fixes #905 and #910 2014-02-11 11:35:29 +01:00
Dennis Luxen
f14fac3f7d fixes off-by-one and testing issue discussed in 889 2014-02-01 16:02:43 +01:00
DennisOSRM
41f3f53540 move includes to include/osrm 2013-12-20 13:12:56 +01:00
Dennis Luxen
5ee6ede824 remove deleted files from repo 2013-12-17 18:02:01 +01:00
Dennis Luxen
fd2f000075 install lib header files with make install target 2013-12-17 17:59:44 +01:00
Dennis Luxen
de73809bb9 remove unneeded includes 2013-12-13 12:33:41 -05:00
Dennis Luxen
ca17efd764 break out OriginalEdgeData class into its own include 2013-12-09 11:45:45 -05:00
Dennis Luxen
aff61dbc3e remove unused include 2013-12-08 19:11:38 +01:00
Dennis Luxen
6bf35c679f add timestamp to management data structure 2013-10-30 14:15:55 +01:00
Dennis Luxen
c8ab430491 less verbose output 2013-10-30 11:42:05 +01:00
Dennis Luxen
64566ec6cf fix pesky resource leak that took me two f*#+ing days to figure out. No thanks to you, valgrind 2013-10-29 18:45:01 +01:00
Dennis Luxen
571d9bd610 print info on shared data only on reload 2013-10-28 15:11:53 +01:00
Dennis Luxen
e9f6531db7 remove comma at end of enum 2013-10-28 10:54:15 +01:00
Dennis Luxen
62c2c750ea load correct segment, remove some debug output 2013-10-25 22:26:27 +02:00
Dennis Luxen
54c5af30d9 refetch data if changed 2013-10-25 19:31:39 +02:00
Dennis Luxen
47d302221d add ram index file name to layout, rename data types 2013-10-25 17:45:03 +02:00
Dennis Luxen
86433ab3a8 fix indentation 2013-10-25 11:19:02 +02:00
Dennis Luxen
7214800d93 add marker where current shared data resides 2013-10-25 11:16:18 +02:00
Dennis Luxen
6ae880f61e finished locking implementation in queries. YAY\! 2013-10-23 13:22:59 +02:00
Dennis Luxen
49a8980dea use named mtx's and condition for interprocess communication 2013-10-22 13:26:39 +02:00
Dennis Luxen
b7db65a023 rename condidition variable and add mutex for pending update 2013-10-21 19:07:49 +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
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
02e9f8aef3 Rework facades to accept ServerPaths object as configuration 2013-10-15 15:44:35 +02:00
DennisOSRM
27a760c58c Move edge-based node out ouf surrounding class 2013-10-15 14:35:36 +02:00
Dennis Luxen
29e6b85f79 Add explicit shmem id for data loading 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
252113c838 implementing the fetch of name ids in shared memory 2013-10-15 14:32:45 +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
4d00b2ebbb Renaming variables to properly reflect its content 2013-10-15 14:32:43 +02:00
Dennis Luxen
b87a98bbda street name file is now more canonical 2013-10-15 14:32:43 +02:00
Dennis Luxen
f76361a345 changing file format for coordinates to be canonical 2013-10-15 14:32:43 +02:00
Dennis Luxen
94e9dd8f28 store name id of edges in shmem, too 2013-10-15 14:32:42 +02:00
Dennis Luxen
90215ca0dd move shmem stored sizes to 64 bits 2013-10-15 14:32:42 +02:00
Dennis Luxen
83205290de Reordering resource aquisition 2013-10-15 14:32:42 +02:00
Dennis Luxen
02fd528c32 removing debug output 2013-10-15 14:32:42 +02:00
Dennis Luxen
5a04700bae create sentinel to adjancency array during preprocessing 2013-10-15 14:32:41 +02:00
Dennis Luxen
9522e6e714 properly check for (non-)empty vectors 2013-10-15 14:32:41 +02:00
Dennis Luxen
7836ea4479 implement GetName() for shared memory (copy&paste) 2013-10-15 14:32:40 +02:00
Dennis Luxen
34048497e7 implement GetName for internal memory 2013-10-15 14:32:40 +02:00
Dennis Luxen
5197422482 fetch ptr from shared memory to via node list 2013-10-15 14:32:40 +02:00
Dennis Luxen
d9987c2734 load street names into internal memory 2013-10-15 14:32:40 +02:00
Dennis Luxen
c9671b4712 load via node information from shared memory 2013-10-15 14:32:40 +02:00
Dennis Luxen
bbf03e3060 Load r-tree search data structure from shared memory 2013-10-15 14:32:40 +02:00
Dennis Luxen
2dd2d3dd7b adjust facade to pass compilation 2013-10-15 14:31:32 +02:00
Dennis Luxen
b018ea7b1b Give all data types in shared memory 2013-10-15 14:31:31 +02:00
Dennis Luxen
d6cdca35d4 Use typedef instead of base class 2013-10-15 14:31:31 +02:00
Dennis Luxen
056c95670f Added list of all data types in shared memory 2013-10-15 14:31:31 +02:00
DennisOSRM
642473244e fixing include typos 2013-10-15 14:19:53 +02:00
Dennis Luxen
7951795ea4 Implementation of internal data storage 2013-10-15 14:19:53 +02:00
Dennis Luxen
9452c7e0c7 further implementation of data facades 2013-10-15 14:19:52 +02:00
Dennis Luxen
092f1a4959 corrected include fence 2013-10-15 14:14:11 +02:00
Dennis Luxen
21bee7e40c Further includes in Facades 2013-10-15 14:14:10 +02:00
Dennis Luxen
a9ac0ac725 Mockups for data facades 2013-10-15 14:12:30 +02:00
Dennis Luxen
5dc1ed6696 plugging in base facade ptr 2013-10-15 14:09:40 +02:00
Dennis Luxen
b55f66e69c added graph data access 2013-10-15 14:08:49 +02:00
Dennis Luxen
fa665c5494 Facade base class to provide all data access 2013-10-15 14:05:42 +02:00
Dennis Luxen
4c6f85fd25 Further includes in Facades 2013-10-15 14:04:12 +02:00
Dennis Luxen
b51d3da7e5 Mockups for data facades 2013-10-15 14:04:11 +02:00
Dennis Luxen
861dbd5977 plugging in base facade ptr 2013-10-15 14:02:31 +02:00
Dennis Luxen
5001fcdd53 added graph data access 2013-10-15 14:02:31 +02:00
Dennis Luxen
eeb47dc724 remove unneeded white spaces 2013-10-15 14:02:31 +02:00
Dennis Luxen
18b57fa6aa Facade base class to provide all data access 2013-10-15 13:45:45 +02:00
Dennis Luxen
12bb4d75fd Adding shared memory data types 2013-10-15 13:45:45 +02:00
Dennis Luxen
29499f21c5 License change to (simplified) 2-clause BSD. Good riddance, AGPL 2013-10-14 13:42:28 +02:00
DennisOSRM
467cf73635 load timestamp properly 2013-10-13 14:26:42 +02:00
DennisOSRM
457519eae3 Fixes resource leaks and removes deprecated c_str() calls where possible 2013-10-13 14:13:08 +02:00
Emil Tin
644fad8355 allow old capitalized option names in routed, few other adjustments 2013-10-12 09:59:42 +02:00
Emil Tin
613e38d7f8 use boost program_options in osrm-prepare/routed 2013-10-12 09:59:42 +02:00
DennisOSRM
dee7c339b3 Move edge-based node out ouf surrounding class 2013-10-11 16:14:59 +02:00
Dennis Luxen
2211c69455 Add explicit shmem id for data loading 2013-10-08 18:10:31 +02:00
Dennis Luxen
940b740b24 checking if data files actually exist 2013-10-01 17:37:52 +02:00
Dennis Luxen
ca3464512d implementing the fetch of name ids in shared memory 2013-10-01 13:25:11 +02:00
Dennis Luxen
73234e7782 loading correct file with rtree leafs and not inner nodes 2013-09-30 15:55:29 +02:00
Dennis Luxen
de8d28ea5f printing debug output 2013-09-30 15:54:32 +02:00
Dennis Luxen
f965b7129b Renaming variables to properly reflect its content 2013-09-27 12:00:58 +02:00
Dennis Luxen
333aba8be6 street name file is now more canonical 2013-09-26 18:19:51 +02:00
Dennis Luxen
e9d93ae210 changing file format for coordinates to be canonical 2013-09-26 11:52:15 +02:00
Dennis Luxen
4bf1987bb7 store name id of edges in shmem, too 2013-09-25 18:59:07 +02:00
Dennis Luxen
ae45eed2b1 move shmem stored sizes to 64 bits 2013-09-25 18:58:39 +02:00
Dennis Luxen
7579c41a35 Reordering resource aquisition 2013-09-25 18:26:10 +02:00
Dennis Luxen
4e589c2575 removing debug output 2013-09-25 18:00:12 +02:00