-
Notifications
You must be signed in to change notification settings - Fork 388
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.
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
whitespace cleanup #2
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
# Find GIT revisions | ||
execute_process(COMMAND | ||
git describe --match=None --always --abbrev=40 --dirty | ||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" | ||
OUTPUT_VARIABLE ICEORYX_SHA1 | ||
OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
git describe --match=None --always --abbrev=40 --dirty | ||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" | ||
OUTPUT_VARIABLE ICEORYX_SHA1 | ||
OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
|
||
execute_process(COMMAND | ||
date -u -R | ||
OUTPUT_VARIABLE ICEORYX_BUILDDATE | ||
OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
date -u -R | ||
OUTPUT_VARIABLE ICEORYX_BUILDDATE | ||
OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
|
||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/iceoryx_versions.hpp.in" | ||
"${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_versions.hpp" @ONLY) | ||
"${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_versions.hpp" @ONLY) | ||
install(FILES ${CMAKE_BINARY_DIR}/generated/iceoryx/include/iceoryx_versions.hpp | ||
DESTINATION include/${PREFIX} | ||
COMPONENT dev) | ||
DESTINATION include/${PREFIX} | ||
COMPONENT dev) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,7 +27,7 @@ | |
#include <thread> | ||
#include <vector> | ||
|
||
#include <map> | ||
#include <map> | ||
|
||
namespace iox | ||
{ | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,8 +50,8 @@ MePooConfig& MePooConfig::setDefaults() noexcept | |
m_mempoolConfig.push_back({1024 * 1024 * 2, 20}); | ||
m_mempoolConfig.push_back({1024 * 1024 * 4, 10}); | ||
m_mempoolConfig.push_back({1024 * 1024 * 8, 10}); | ||
m_mempoolConfig.push_back({1024 * 1024 * 16, 5}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the default mempool configuration reserves nearly 500 megabytes of RAM, with your adaptions it would consume approx. 730 megabytes. Is this intended? On the side i take the point with me to provide an example with a custom-sized mempool in RouDi for the user. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. legacy changes for presentation. |
||
m_mempoolConfig.push_back({1024 * 1024 * 32, 2}); | ||
m_mempoolConfig.push_back({1024 * 1024 * 16, 10}); | ||
m_mempoolConfig.push_back({1024 * 1024 * 32, 10}); | ||
|
||
return *this; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
*allocate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
addressed in a204c13