Dennis Luxen
30e9b4513a
Merge branch 'alex85k-develop' into develop
2014-06-16 13:43:26 +02:00
alex85k
671b14dac0
pack only develop version to zip on AppVeyor
2014-06-16 16:02:14 +06:00
Porjo
82e99988e8
Change content-type header for JSON data
2014-06-16 09:29:34 +02:00
Dennis Luxen
313a7ed7fa
Merge pull request #1076 from alex85k/patch-mingw
...
Add Mingw support (tune libraries and disable cpuid with #ifdef)
2014-06-15 21:55:18 +02:00
Dennis Luxen
cf3365574e
Merge branch 'TheMarex-thread-control' into develop
2014-06-15 12:35:26 +02:00
Dennis Luxen
0e1f6f50ea
Merge branch 'thread-control' of https://github.com/TheMarex/Project-OSRM into TheMarex-thread-control
2014-06-15 12:35:15 +02:00
Dennis Luxen
5b6518d4a9
Merge branch 'TheMarex-diffencoding' into develop
2014-06-15 12:10:18 +02:00
Patrick Niklaus
c009dce591
Another VC2013 fix
2014-06-15 11:42:59 +02:00
Patrick Niklaus
40e2d7932b
Fix VC2013 issues
2014-06-15 11:29:36 +02:00
Patrick Niklaus
e29b7a6eae
Fix some minor style issues
2014-06-15 11:04:10 +02:00
Patrick Niklaus
a3e9cbc000
Allow user to force thread number
...
This allows the user to do (potentially) stupid things, but warns him.
The default is TBBs default, so probably the right thing.
To enforce thread numbers in extractor it must be passed to the child
threads.
2014-06-14 17:02:43 +02:00
Patrick Niklaus
aedcc2ff40
Add array inlcude
2014-06-12 22:01:23 +02:00
Patrick Niklaus
4c17aeb180
Removed SSE code in RangeTable to rely on compiler optimazation
2014-06-12 22:01:23 +02:00
Patrick Niklaus
ef60ae652c
Fix edge cases in RangeTable
2014-06-12 22:01:23 +02:00
Patrick Niklaus
1d62ed028e
Fix off-by-one since back() gives last value inside [begin,end)
2014-06-12 22:01:23 +02:00
Patrick Niklaus
50bf7694c2
Constify some parts of RangeTable
2014-06-12 22:01:22 +02:00
Patrick Niklaus
807f1d7c1c
Initial support for SharedDataFacade
...
SharedDataLayout was refactored to include canary values at the
boundaries of each memory block. This makes it easy to detect overruns
and block-size mismatches between osrm-datastore and the
SharedDataFacade.
2014-06-12 22:01:22 +02:00
Patrick Niklaus
7a7d0c09d9
Integrate RangeTable into server
2014-06-12 22:00:03 +02:00
Patrick Niklaus
f90ce77da4
Use differential encoding for name offsets
...
Each name is represented as an integer range in a vector of chars.
Instead of storing the absolute offset inside this array, we can store
only the offset to the previous entry (the string size). By doing this we reduce
the number of bytes need to store an offset from 4 to 1 bytes (if we
set a maximum string length of 255).
This is however slower, since the absolute offset must be computed on
each querry by summing up all previous lengths. To limit the
performance inpact we only do this for blocks of a certain size (16).
2014-06-12 22:00:03 +02:00
Dennis Luxen
d27ac27bc7
remove one fwd decl, add more comments to Connection
2014-06-12 13:46:07 +02:00
Dennis Luxen
44c6a64bf4
make c'tor of NodeInfo explicit
2014-06-11 18:26:34 +02:00
Dennis Luxen
2d6eae9391
make conversion explicit
2014-06-11 18:15:36 +02:00
Dennis Luxen
ba440550a6
make conversion explicit
2014-06-11 18:15:31 +02:00
Dennis Luxen
8e24fee9da
explicitly cast from int to bool
2014-06-11 17:44:50 +02:00
alex85k
1148652101
Add Mingw support (tune libraries and disable cpuid with #ifdef)
2014-06-11 20:58:53 +06:00
Dennis Luxen
ed01eeaeb3
reformat SharedMemoryFactory according to code guidelines
2014-06-11 15:22:51 +02:00
Dennis Luxen
096f187d6f
remove empty line
2014-06-11 15:19:11 +02:00
Dennis Luxen
fa35eb1959
adapt for merge, add deployment details
2014-06-11 15:17:51 +02:00
Dennis Luxen
8d89d30c74
Merge branch 'alex85k-win-038' into develop
2014-06-11 15:15:05 +02:00
alex85k
f1bde40939
add appveyor.yml template
2014-06-11 18:38:03 +06:00
alex85k
4e7ccaa298
use std::memcpy instead of std::copy (avoid checked iterators assertions)
2014-06-11 18:38:02 +06:00
alex85k
d0284991ed
patch Ruby files for successful testing on Windows
2014-06-11 18:38:01 +06:00
alex85k
c4998990e5
disable io-benchmark on Windows
2014-06-11 18:38:01 +06:00
alex85k
42d3ee9b94
workaround for std::packaged_task<void()> problem on MSVC
2014-06-11 18:38:00 +06:00
alex85k
be5c3e41e1
Replace sizeof asserts with warning on Windows
2014-06-11 18:37:26 +06:00
alex85k
3282d410c4
Add basic shared memory support for Windows OS
2014-06-11 18:15:17 +06:00
Alexei Kasatkin
75303c95f8
Avoid constexpr by #ifdef (not supported in MSVC18)
2014-06-11 18:15:16 +06:00
Alexei Kasatkin
0209272831
fix includes and definitions (avoid unistd.h, isatty, fix min,max, round and M_PI)
2014-06-11 18:15:15 +06:00
Alexei Kasatkin
0e16c4ed97
Add more Boost libraries on Windows, fix TBB debug linking, stop building
...
on old Microsoft compilers
2014-06-11 18:15:14 +06:00
Dennis Luxen
e49720f34a
add include
2014-06-11 13:44:10 +02:00
Dennis Luxen
8aee371d81
further include untangling, chops 5sec compile time
2014-06-11 12:25:57 +02:00
Dennis Luxen
71c4f81b59
avoid signed/unsigned comparison
2014-06-10 18:08:58 +02:00
Dennis Luxen
3127fafc88
Merge branch 'patch-6' of https://github.com/alex85k/Project-OSRM into develop
2014-06-10 17:40:56 +02:00
Dennis Luxen
4e6bdf28cc
fixes #1041 , some only_ turn restrictions are inverted under certain conditions
2014-06-10 17:26:22 +02:00
Dennis Luxen
621a5a86a0
fixes #1041 , some only_ turn restrictions are inverted under certain conditions
2014-06-10 17:26:05 +02:00
Dennis Luxen
d80c8cbd2f
add another turn restriction test
2014-06-10 17:23:24 +02:00
Dennis Luxen
686f1aeeb2
reformat some code
2014-06-10 17:23:07 +02:00
alex85k
e27a69bab7
Use one more .string().c_str() call
2014-06-10 20:34:21 +06:00
Dennis Luxen
4ee2e1d049
fix long line
2014-06-10 10:49:45 +02:00
Dennis Luxen
2102648102
fix short variable name
2014-06-10 10:48:43 +02:00
