Skip to content

Please consider the following formatting changes to #6600 #94

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

Merged
ktf merged 1 commit into from
Jul 6, 2021
Merged

Please consider the following formatting changes to #6600 #94

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
6 changes: 3 additions & 3 deletions Framework/Core/src/ArrowSupport.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()
LOGP(INFO, "Unused offer {}", unusedOfferedMemory);
lastUnusedOfferedMemory = unusedOfferedMemory;
}
// availableSharedMemory is the amount of memory which we know is available to be offered.
// availableSharedMemory is the amount of memory which we know is available to be offered.
// We subtract the amount which we know was already offered but it's unused and we then balance how
// much was created with how much was destroyed.
availableSharedMemory = MAX_SHARED_MEMORY + ((totalBytesDestroyed - totalBytesCreated) / 1000000) - unusedOfferedMemory;
Expand Down Expand Up @@ -325,12 +325,12 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec()
LOGP(INFO, "Message {}/{} is forwarded so we are not returning its memory.", dh->dataOrigin, dh->dataDescription);
continue;
}
LOGP(INFO, "Message {}/{} is being deleted. We will return {}MB.", dh->dataOrigin, dh->dataDescription, dh->payloadSize/1000000.);
LOGP(INFO, "Message {}/{} is being deleted. We will return {}MB.", dh->dataOrigin, dh->dataDescription, dh->payloadSize / 1000000.);
totalBytes += dh->payloadSize;
totalMessages += 1;
}
arrow->updateBytesDestroyed(totalBytes);
LOGP(INFO, "{}MB bytes being given back to reader, totaling {}MB", totalBytes/1000000., arrow->bytesDestroyed()/1000000.);
LOGP(INFO, "{}MB bytes being given back to reader, totaling {}MB", totalBytes / 1000000., arrow->bytesDestroyed() / 1000000.);
arrow->updateMessagesDestroyed(totalMessages);
auto& monitoring = ctx.services().get<Monitoring>();
monitoring.send(Metric{(uint64_t)arrow->bytesDestroyed(), "arrow-bytes-destroyed"}.addTag(Key::Subsystem, monitoring::tags::Value::DPL));
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/src/ComputingQuotaEvaluator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ void ComputingQuotaEvaluator::consume(int id, ComputingQuotaConsumer& consumer)
using o2::monitoring::tags::Key;
using o2::monitoring::tags::Value;
// This will report how much of the offers has to be considered consumed.
// Notice that actual memory usage might be larger, because we can over
// Notice that actual memory usage might be larger, because we can over
// allocate.
auto reportConsumedOffer = [&totalDisposedMemory = mTotalDisposedSharedMemory, &monitoring = mRegistry.get<Monitoring>()](ComputingQuotaOffer const&accumulatedConsumed) {
auto reportConsumedOffer = [&totalDisposedMemory = mTotalDisposedSharedMemory, &monitoring = mRegistry.get<Monitoring>()](ComputingQuotaOffer const& accumulatedConsumed) {
totalDisposedMemory += accumulatedConsumed.sharedMemory;
monitoring.send(Metric{(uint64_t)totalDisposedMemory, "shm-offer-consumed"}.addTag(Key::Subsystem, Value::DPL));
};
Expand Down