Alexei Kasatkin
b6787b0014
safeguard: do not read/write 0 bytes (iostream)
2014-06-05 23:16:19 +06:00
Dennis Luxen
adbbe2b097
fix broken transmission of checksum/hinting mechanism on shared memory
2014-06-05 10:55:27 +02:00
Dennis Luxen
a4689c7a27
add some comments to reduce NCSS complexity
2014-06-03 10:49:25 +02:00
Dennis Luxen
aed04c7d55
server cast int to string only where it is needed
2014-05-28 12:34:48 +02:00
Dennis Luxen
bb5973f2fd
rename variable
2014-05-28 12:34:24 +02:00
Dennis Luxen
f801fd1f0d
fix inverted logic
2014-05-28 12:06:57 +02:00
Dennis Luxen
f4f49b2b46
remove unused variable
2014-05-26 12:42:47 +02:00
shipenok
2bdec31219
minor fix to open result in browser
2014-05-23 14:27:55 +04:00
Dennis Luxen
6a03f13d55
fixes #1032 :
...
- remove left-overs from OpenMP
- replace omp_* calls with TBB equivalents
2014-05-22 18:39:11 +02:00
Dennis Luxen
4ec9f2c00f
fix #1021 , always check if files exist
2014-05-20 14:33:03 +02:00
Dennis Luxen
75a2d4d00a
minor code refactoring, wip
2014-05-20 14:33:02 +02:00
Dennis Luxen
a80815d57a
implements output generation through a dedicated JSON container:
...
- JSON syntax is not scattered over several files, but one place
- Reduces code duplication
- breaking changes:
- new property in json(p) formatted response: "found_alternative": True/False
- returned filenames now response.js(on) or route.gpx
- /hello plugin returns JSON now
2014-05-20 14:33:00 +02:00
Dennis Luxen
e769821e0f
use range based for loops to traverse graphs
2014-05-13 16:56:30 +02:00
Dennis Luxen
1816e6607e
remove boost::thread from Server
2014-05-13 10:02:36 +02:00
Dennis Luxen
584ba10726
reformatting RequestHandler
2014-05-11 18:03:05 +02:00
Dennis Luxen
7e7aa6aaee
workaround incomplete std::shared_ptr compatibility of old boost versions
2014-05-11 16:51:14 +02:00
Dennis Luxen
00e27e4b5c
replace left-overs from boost::shared_ptr usage
2014-05-09 17:04:55 +02:00
Dennis Luxen
b3ec9c9323
reformat
2014-05-09 16:48:58 +02:00
Dennis Luxen
84ffedd95d
replace boost::shared_ptr
2014-05-09 16:47:42 +02:00
Dennis Luxen
1a57aff0f4
remove unneeded boost include
2014-05-09 14:12:10 +02:00
Dennis Luxen
cc982a578d
deactivate the cool put_time thing in C++11 as GCC craps out again
2014-05-07 19:30:22 +02:00
Dennis Luxen
3d68769503
reformat Server source and migrate it to C++11
2014-05-07 17:14:57 +02:00
Dennis Luxen
bd316e7e98
reformat Server/RequestHandler according to guideline
2014-05-07 17:08:30 +02:00
Dennis Luxen
3f4c4d675b
reformat Server/APIGrammar according to guideline
2014-05-07 17:06:28 +02:00
Dennis Luxen
4b7e5b7445
reformat Server/APIGrammar according to guideline
2014-05-07 17:05:33 +02:00
Dennis Luxen
996dbdde00
reformat Server/DataStructure according to guideline
2014-05-07 17:03:58 +02:00
Dennis Luxen
db67f2ddf1
reformat files according to guidelines, remove superflous inclue
2014-05-07 16:58:32 +02:00
Dennis Luxen
7b9b2fd23a
use C++11's put time to put the timestamp
2014-05-07 16:50:48 +02:00
Dennis Luxen
9710f39cad
remove (almost) all BOOST_FOREACH calls
2014-05-07 16:17:47 +02:00
Dennis Luxen
9c2926ef8a
remove boost/integer include
2014-05-07 14:44:18 +02:00
Dennis Luxen
2d3fb858ad
move StaticGraph to C++11
2014-05-07 10:38:31 +02:00
Dennis Luxen
45f0af2afc
remove unnecessary else statements
2014-04-28 15:08:54 +02:00
Dennis Luxen
018c144c76
minor refactoring
2014-04-28 13:19:35 +02:00
Dennis Luxen
5d6b05979d
remove unused variable
2014-04-28 12:59:24 +02:00
Dennis Luxen
538f8d040a
avoid short variable name
2014-04-28 12:58:40 +02:00
Dennis Luxen
7d52aa1272
avoid short variable name
2014-04-28 12:58:00 +02:00
Dennis Luxen
0f8a32f38c
shape up code
2014-04-24 13:31:04 +02:00
Dennis Luxen
c6a58ff1b4
remove debug lint again
2014-04-24 13:31:04 +02:00
Dennis Luxen
45f751720a
fix unpacking of geometry for shared memory
2014-04-24 13:31:04 +02:00
Dennis Luxen
edef9c11f7
add default clause to switch statement albeit technically superflous
2014-04-24 13:06:57 +02:00
Dennis Luxen
9b3dab8055
implement loading of compressed geometries
2014-04-24 13:06:56 +02:00
Dennis Luxen
f468fcc2b6
implement more details of shared memory store
2014-04-24 13:06:56 +02:00
Dennis Luxen
d09be5a80e
remove debug code, make variables const
2014-04-24 13:06:56 +02:00
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
b429d9f509
remove unreachable code
2014-04-24 12:55:52 +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
6b91d6692f
unpacking target correctly, also partial unpacking origin and destination are on the very same packed edge
2014-04-24 12:47:36 +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
Dennis Luxen
da81e4839a
reverse include order
2014-04-21 17:40:07 +02:00
Dennis Luxen
25013afdd2
make single argument c'tor explicit (thx flint)
2014-04-21 17:40:06 +02:00
Dennis Luxen
eaed8572f0
make all error messages JSON
2014-04-21 17:40:06 +02:00
Dennis Luxen
33faa2f252
set output size on StockReplies properly
2014-03-24 18:13:40 +01: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
5adfe2d46b
transfrom short switch statements into readable if statements
2014-03-17 15:45:47 +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
32bf99ba40
decode all URIs, fixes #937 , 386
2014-03-04 13:56:11 +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
Dennis Luxen
fea0c07e1c
implements #386
2014-01-21 16:31:29 +01:00
DennisOSRM
41f3f53540
move includes to include/osrm
2013-12-20 13:12:56 +01:00
Dennis Luxen
5d082f53ae
remove deleted files from repo
2013-12-17 18:02:34 +01:00
Dennis Luxen
591d79ba49
remove deleted files from repo
2013-12-17 18:02:24 +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
8c4c1a56fd
reduce compile time by using fwd decls
2013-12-16 11:29:38 +01:00
Dennis Luxen
b030fe7db2
break out Coordinate in compile unit
2013-12-13 17:26:57 -05:00
Dennis Luxen
9b09c9f0c3
move includes into compile unit
2013-12-13 12:34:21 -05:00
Dennis Luxen
de73809bb9
remove unneeded includes
2013-12-13 12:33:41 -05:00
Dennis Luxen
a492bf3885
kill superflous semicolon
2013-12-13 09:52:22 -05:00
Dennis Luxen
ca17efd764
break out OriginalEdgeData class into its own include
2013-12-09 11:45:45 -05:00
Dennis Luxen
dd104a49f6
break-out Requesthandler into compile unit
2013-12-09 10:54:17 -05:00
Dennis Luxen
b849d008d2
break-out Requesthandler into compile unit
2013-12-09 10:48:32 -05:00
Dennis Luxen
04afe8fbf1
remove pesky sstream
2013-12-08 19:43:43 +01:00
Dennis Luxen
392726bad3
remove pesky sstream
2013-12-08 19:42:48 +01:00
Dennis Luxen
19285d61ab
reorder includes to cut compile time
2013-12-08 19:38:13 +01:00
Dennis Luxen
aff61dbc3e
remove unused include
2013-12-08 19:11:38 +01:00
Dennis Luxen
992458ae4b
fix indentation
2013-11-21 00:06:00 +01:00
Dennis Luxen
cabaad4b17
replaced contigouos output data with collection of small'ish sub blocks. saves (re-)allocations. also removed a remaining stringstream
2013-11-14 17:16:26 -05:00
Dennis Luxen
8b6fe691ed
add missing files
2013-11-14 12:44:36 -05:00
Dennis Luxen
bf66bec4c7
rename file, untangle more includes
2013-11-14 12:42:50 -05:00
Dennis Luxen
3319709526
rename file, untangle more includes
2013-11-14 12:42:33 -05:00
Dennis Luxen
b13985d550
remove old files
2013-11-14 12:31:20 -05:00
Dennis Luxen
dc4a3e9b89
untangle server and http components
2013-11-14 12:29:56 -05:00
Dennis Luxen
d538c35532
moving and splitting of http protocal data types
2013-11-14 12:28:28 -05:00
Dennis Luxen
a9f54c44e9
move Reply into compile unit
2013-11-13 18:42:42 -05:00
Dennis Luxen
3da664236c
reverting premature revert
2013-11-12 17:39:24 -05:00
Dennis Luxen
dced5816df
RVO optimization of output buffer generation
2013-11-11 15:17:52 -05: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