Skip to content
Snippets Groups Projects
Commit 8cbc018a authored by Rainer Kartmann's avatar Rainer Kartmann Committed by ARMAR-7a
Browse files

Auto format

parent 6c80bccd
No related branches found
No related tags found
1 merge request!380ARMAR-7 Unit
......@@ -276,10 +276,8 @@ namespace armarx
}
}
const auto PotentiallyMinimizeMember = [](auto & member, bool minimize) {
return minimize ? 0 : member;
};
const auto PotentiallyMinimizeMember = [](auto& member, bool minimize)
{ return minimize ? 0 : member; };
detail::RtMessageLogBuffer::RtMessageLogBuffer(const detail::RtMessageLogBuffer& other,
bool minimize) :
......@@ -301,13 +299,13 @@ namespace armarx
maxAlign{1}
{
ARMARX_DEBUG << "copying RtMessageLogBuffer with minimize = " << minimize << " "
<< VAROUT(initialBufferSize) << " " << VAROUT(initialBufferEntryNumbers) << " "
<< VAROUT(bufferMaxSize) << " " << VAROUT(bufferMaxNumberEntries) << " "
<< VAROUT(buffer.size()) << " " << VAROUT(other.bufferSpace) << " "
<< VAROUT(bufferPlace) << " " << VAROUT(entries.size()) << " "
<< VAROUT(entriesWritten) << " " << VAROUT(requiredAdditionalBufferSpace) << " "
<< VAROUT(requiredAdditionalEntries) << " " << VAROUT(messagesLost) << " "
<< VAROUT(maxAlign);
<< VAROUT(initialBufferSize) << " " << VAROUT(initialBufferEntryNumbers) << " "
<< VAROUT(bufferMaxSize) << " " << VAROUT(bufferMaxNumberEntries) << " "
<< VAROUT(buffer.size()) << " " << VAROUT(other.bufferSpace) << " "
<< VAROUT(bufferPlace) << " " << VAROUT(entries.size()) << " "
<< VAROUT(entriesWritten) << " " << VAROUT(requiredAdditionalBufferSpace)
<< " " << VAROUT(requiredAdditionalEntries) << " " << VAROUT(messagesLost)
<< " " << VAROUT(maxAlign);
for (std::size_t idx = 0; idx < other.entries.size() && other.entries.at(idx); ++idx)
{
const RtMessageLogEntryBase* entry = other.entries.at(idx);
......@@ -361,10 +359,12 @@ namespace armarx
deleteAll();
if (requiredAdditionalEntries || entries.size() < numEntries)
{
const auto numExcessEntries = std::max(requiredAdditionalEntries, numEntries - entries.size());
const auto numExcessEntries =
std::max(requiredAdditionalEntries, numEntries - entries.size());
const auto requiredSize = entries.size() + numExcessEntries;
ARMARX_WARNING << "Iteration " << iterationCount << " required "
<< requiredAdditionalEntries << " | " << numExcessEntries << " additional message entries. \n"
<< requiredAdditionalEntries << " | " << numExcessEntries
<< " additional message entries. \n"
<< "The requested total number of entries is " << requiredSize << ". \n"
<< "The current number of entries is " << entries.size() << ". \n"
<< "The maximal number of entries is "
......@@ -514,10 +514,10 @@ namespace armarx
{
ARMARX_TRACE;
ARMARX_DEBUG << "Copy ControlThreadOutputBufferEntry with parameters: " << VAROUT(minimize)
<< " " << VAROUT(writeTimestamp) << " " << VAROUT(sensorValuesTimestamp) << " "
<< VAROUT(timeSinceLastIteration) << " " << VAROUT(iteration) << " "
<< VAROUT(buffer.size()) << " " << VAROUT(messages.buffer.size()) << " "
<< VAROUT(messages.entries.size());
<< " " << VAROUT(writeTimestamp) << " " << VAROUT(sensorValuesTimestamp) << " "
<< VAROUT(timeSinceLastIteration) << " " << VAROUT(iteration) << " "
<< VAROUT(buffer.size()) << " " << VAROUT(messages.buffer.size()) << " "
<< VAROUT(messages.entries.size());
void* place = buffer.data();
std::size_t space = buffer.size();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment