Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Execution time measurement patch #922

Closed
wants to merge 190 commits into from
Closed

Execution time measurement patch #922

wants to merge 190 commits into from

Conversation

vershov
Copy link

@vershov vershov commented Feb 19, 2014

Here is second version of the time measurement patch. First version is #919 and are to be closed.

  • I have fixed all issues raised early, as well as have added execution time at gpx output.
  • json output is now could contain "exec_time_ms":n as well as xml output has appropriate field at the metadata field.
  • I have put measurement class into Util/TimingUtil.h, suppose it's more appropriate way to do measurement that existent one. We could discuss it here.

DennisOSRM and others added 30 commits November 22, 2013 18:05
@DennisOSRM
move Hilbert curve computation in compile unit
e2c0938
@DennisOSRM
move distance computation from r-tree to element type class
50ccfbf
@DennisOSRM
move implementation details out of templat'ized container code
0e33f63
@DennisOSRM
make rtree query do O(1) allocations only
349df0d
@DennisOSRM
add geometry compressor
a8e8833
@DennisOSRM
remove potential division by zero
cf527ed
@DennisOSRM
use explicit unsigned type in max operation
e36a273
@DennisOSRM
renaming file
d5f6c1c
@DennisOSRM
renaming file
2233c44
@DennisOSRM
fixing coverity issue
f5d22c9
@DennisOSRM
moving BFS exploration into its own function
3df89c0
@DennisOSRM
clear memory early by swap trick
4455e81
cast to larger data type on 32bits, probably fixes Project-OSRM#809
ec84b3a
@DennisOSRM
temporarily fixes Project-OSRM#811 plus 16 others
02e2b3b
@DennisOSRM
Merge branch 'develop' of https://github.com/DennisOSRM/Project-OSRM …
24c6314 
…into develop
@DennisOSRM
clean up of build config
cb86d3d
@DennisOSRM
implements Project-OSRM#801
4911601
@DennisOSRM
remove dead code
ad5d8c6
@DennisOSRM
partially fixes Project-OSRM#768, Project-OSRM#794, Project-OSRM#812
94d5bcb
@DennisOSRM
further refactoring and code simplification
78f8124
@DennisOSRM
add buffering to temporary storage
40bb27c
@DennisOSRM
add buffering to temporary storage
c8f7e63
@DennisOSRM
do not seek in temporary storage
4835544
@DennisOSRM
don't use clang specific defines
657f757
@DennisOSRM
add skeleton for geometry compression
7a5f45a
@DennisOSRM
reverting skeleton, introducing later
e32bc5e
@DennisOSRM
cache dependencies on travis ci
a5c406a
@DennisOSRM
fixes Project-OSRM#808
bde3f95
@rodo @DennisOSRM
[options] string is more explicit
f55f8a3
@DennisOSRM
workaround for Project-OSRM#783
e70485f
@DennisOSRM
fix yml syntax
9e0e536
@DennisOSRM
explicit rvm use, workaround for Travis CI testing woes
0ff1888
@DennisOSRM
install libpostgis-java to fulfil dependencies
264077a
@DennisOSRM
install osmosis manually
e6c25ae
@DennisOSRM
install osmosis manually, take two
533caf8
@DennisOSRM
install osmosis manually, take three
1d22507
@DennisOSRM
disable cucumber tests until the travis CI issues are sorted out
45a4fe4
@DennisOSRM
do not instantiate shared memory facility in routed, fixes Project-OS…
7794cd6 
…RM#905 and Project-OSRM#910
@DennisOSRM
fixes and closes Project-OSRM#914 and updates Project-OSRM#907
ea30005
@DennisOSRM
implement and use portable implementation of canonical file paths, see …
7580777 
…Project-OSRM#909, this time against dev branch
@DennisOSRM
Merge branch 'patch-1' of https://github.com/alex85k/Project-OSRM int…
f406dc5 
…o alex85k-patch-1
@DennisOSRM
install osmosis manually
08f13a1
@DennisOSRM
ignore broken osmosis from Travis CI repo
445cf5d
@DennisOSRM
run tests on different ports
2130630
@DennisOSRM
add new tool to ignore list
0ee94a5
@DennisOSRM
run debug build on different port
aedf9d3
@DennisOSRM
scale maxspeeds to 2/3 to be more realistic and in sync with the defa…
9e64ccd 
…ult profile
@DennisOSRM
refactor HashTable facade class
4c48cda
@DennisOSRM
fix tests for scaled maxspeeds
d73f3eb
@DennisOSRM
Copy link
Collaborator

please rebase your changes onto the latest develop branch and push with -f option

@DennisOSRM DennisOSRM mentioned this pull request Feb 19, 2014
Closed
@DennisOSRM
Copy link
Collaborator

Here's a script that should help rebasing your efforts against the latest origin/develop:

https://gist.github.com/DennisOSRM/9094297

@emiltin
Copy link
Contributor

emiltin commented Feb 19, 2014

you need to change the PR so it's against develop, instead of master.

@DennisOSRM it's possible to change the default branch for the repo, maybe worth considering?

@vershov
Squashed commit of the following:
0ea07cc 
commit 10b8b0b
Author: vershov <vladimir.a.ershov@gmail.com>
Date:   Wed Feb 19 16:52:18 2014 +0100

    small fix

commit 0f15054
Author: vershov <vladimir.a.ershov@gmail.com>
Date:   Wed Feb 19 13:09:07 2014 +0100

    changes into exec time measurement

commit 4efcca3
Author: vershov <vladimir.a.ershov@gmail.com>
Date:   Tue Feb 18 22:57:48 2014 +0100

    Adding execution time measurement facility
@vershov
Copy link
Author

vershov commented Feb 19, 2014

@DennisOSRM I have tried your script but it seems something is going wrong anyway, could you please advise?

@emiltin
Copy link
Contributor

emiltin commented Feb 19, 2014

the script looks complicated to me. why not just something like this?
git fetch origin # assuming gihub remove is called 'origin'
git checkout exec_time_patch # checkout your branch
git rebase origin/develop # rebase on develop

@emiltin
Copy link
Contributor

emiltin commented Feb 19, 2014

but again, this PR is currently against master, it needs to be against develop

@DennisOSRM
Copy link
Collaborator

@emiltin is right, change the PR to be against develop branch. There is no need to open a new one. You should be able to change this.

@vershov
Copy link
Author

vershov commented Feb 19, 2014

Correct pull request is #923

@vershov vershov closed this Feb 19, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vershov @DennisOSRM @emiltin @springmeyer @rodo @alex85k