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

[C++] std::forward fragment handlers to avoid unnecessary copies #1405

Merged
merged 1 commit into from
Mar 1, 2023
+6 −6
Merged

[C++] std::forward fragment handlers to avoid unnecessary copies #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aeron-client/src/main/cpp/Image.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ class Image
AtomicBuffer &termBuffer = m_termBuffers[index];
TermReader::ReadOutcome outcome{};

TermReader::read(outcome, termBuffer, offset, fragmentHandler, fragmentLimit, m_header, m_exceptionHandler);
TermReader::read(outcome, termBuffer, offset, std::forward<F>(fragmentHandler), fragmentLimit, m_header, m_exceptionHandler);

const std::int64_t newPosition = position + (outcome.offset - offset);
if (newPosition > position)
Expand Down
10 changes: 5 additions & 5 deletions aeron-client/src/main/cpp/Subscription.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ class CLIENT_EXPORT Subscription

for (std::size_t i = startingIndex; i < length && fragmentsRead < fragmentLimit; i++)
{
fragmentsRead += imageArray[i]->poll(fragmentHandler, fragmentLimit - fragmentsRead);
fragmentsRead += imageArray[i]->poll(std::forward<F>(fragmentHandler), fragmentLimit - fragmentsRead);
}

for (std::size_t i = 0; i < startingIndex && fragmentsRead < fragmentLimit; i++)
{
fragmentsRead += imageArray[i]->poll(fragmentHandler, fragmentLimit - fragmentsRead);
fragmentsRead += imageArray[i]->poll(std::forward<F>(fragmentHandler), fragmentLimit - fragmentsRead);
}

return fragmentsRead;
Expand Down Expand Up @@ -263,12 +263,12 @@ class CLIENT_EXPORT Subscription

for (std::size_t i = startingIndex; i < length && fragmentsRead < fragmentLimit; i++)
{
fragmentsRead += imageArray[i]->controlledPoll(fragmentHandler, fragmentLimit - fragmentsRead);
fragmentsRead += imageArray[i]->controlledPoll(std::forward<F>(fragmentHandler), fragmentLimit - fragmentsRead);
}

for (std::size_t i = 0; i < startingIndex && fragmentsRead < fragmentLimit; i++)
{
fragmentsRead += imageArray[i]->controlledPoll(fragmentHandler, fragmentLimit - fragmentsRead);
fragmentsRead += imageArray[i]->controlledPoll(std::forward<F>(fragmentHandler), fragmentLimit - fragmentsRead);
}

return fragmentsRead;
Expand All @@ -291,7 +291,7 @@ class CLIENT_EXPORT Subscription

for (std::size_t i = 0; i < length; i++)
{
bytesConsumed += imageArray[i]->blockPoll(blockHandler, blockLengthLimit);
bytesConsumed += imageArray[i]->blockPoll(std::forward<F>(blockHandler), blockLengthLimit);
}

return bytesConsumed;
Expand Down