Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
8cbc018a
Commit
8cbc018a
authored
1 year ago
by
Rainer Kartmann
Committed by
ARMAR-7a
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Auto format
parent
6c80bccd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!380
ARMAR-7 Unit
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
+17
-17
17 additions, 17 deletions
...onents/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
with
17 additions
and
17 deletions
source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
+
17
−
17
View file @
8cbc018a
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment