Allow multiple named shared memory regions #4982
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TheMarex
force-pushed
the
feature/multiple_shm
branch
4 times, most recently
from
982c712 to
410f545
Compare
oxidase
approved these changes
Apr 5, 2018
src/storage/storage.cpp
Outdated
| util::UnbufferedLog() << "ok."; | ||
| } | ||
|
|
||
| util::Log() << "Loading data into " << regionToString(next_region); | ||
| util::Log() << "Loading data into " << shm_key; |
There was a problem hiding this comment.
shm_key has 8 bits type and will be printed as a character Loading data into �. static_cast<int> or (int)?
src/storage/storage.cpp
Outdated
| } | ||
|
|
||
| util::Log() << "All data loaded. Notify all client about new data in " | ||
| << regionToString(next_region) << " with timestamp " << next_timestamp; | ||
| util::Log() << "All data loaded. Notify all client about new data in " << shm_key |
src/storage/storage.cpp
Outdated
| { | ||
| util::UnbufferedLog() << "Marking old shared memory region " | ||
| << regionToString(in_use_region) << " for removal... "; | ||
| util::UnbufferedLog() << "Marking old shared memory region " << in_use_key |
src/tools/store.cpp
Outdated
| { | ||
| auto id = shared_register.Find(name); | ||
| auto region = shared_register.GetRegion(id); | ||
| osrm::util::Log() << name << "\t" << (int)region.shm_key << "\t" << region.timestamp; |
There was a problem hiding this comment.
would it make sense to add "\tsize" column?
auto shm = osrm::storage::makeSharedMemory(region.shm_key);
osrm::util::Log() << name << "\t" << (int)region.shm_key << "\t" << region.timestamp << "\t" << shm->Size();
otherwise an extra ipcs -m call is needed
include/storage/shared_datatype.hpp
Outdated
| } | ||
| } | ||
|
|
||
| void Deregister(const RegionID key) { regions[key] = SharedRegion{}; } |
There was a problem hiding this comment.
The method is not used and DataWatchdogImpl assumes that the shared region pointer won't be changed during an engine process life-time. Is a follow-up issue about deleting named regions needed?
There was a problem hiding this comment.
Good catch, I wanted to use this for the spring-clean command, but instead we just overwrite the whole registry.
| @@ -28,12 +28,6 @@ OSRM::OSRM(engine::EngineConfig &config) | |||
| throw util::exception("Required files are missing, cannot continue. Have all the " | |||
| "pre-processing steps been run?"); | |||
| } | |||
| else if (config.use_shared_memory) | |||
|
It is also possible to add |
TheMarex
force-pushed
the
feature/multiple_shm
branch
from
764f6e3 to
13e44fe
Compare
|
@oxidase thanks for the test case! Changed all locations and added the test. Should be good to merge after Travis passes. |
TheMarex
force-pushed
the
feature/multiple_shm
branch
from
13e44fe to
2a210f4
Compare
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
This PR adds support for having multiple named shared memory regions.
This is going to unlock #1221 and #4873 by making it easier to have multiple named regions.
Tasklist
Requirements / Relations
Based on #4975.