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

OboeTester: Fix race condition with setWorkload in Dynamic Workload Activity #2140

Merged
merged 2 commits into from
Jan 17, 2025
Merged

OboeTester: Fix race condition with setWorkload in Dynamic Workload Activity #2140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
278a78e
OboeTester: Fix race condition with setWorkload in Dynamic Workload test
robertwu1 Jan 17, 2025
2dc9ce8
remove something i used for testing
robertwu1 Jan 17, 2025
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
7 changes: 4 additions & 3 deletions apps/OboeTester/app/src/main/cpp/OboeStreamCallbackProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ oboe::DataCallbackResult OboeStreamCallbackProxy::onAudioReady(
int numFrames) {
oboe::DataCallbackResult callbackResult = oboe::DataCallbackResult::Stop;
int64_t startTimeNanos = getNanoseconds();
int32_t numWorkloadVoices = mNumWorkloadVoices;

// Record which CPU this is running on.
orCurrentCpuMask(sched_getcpu());

// Tell ADPF in advance what our workload will be.
if (mWorkloadReportingEnabled) {
audioStream->reportWorkload(mNumWorkloadVoices);
audioStream->reportWorkload(numWorkloadVoices);
}

// Change affinity if app requested a change.
Expand All @@ -54,8 +55,8 @@ oboe::DataCallbackResult OboeStreamCallbackProxy::onAudioReady(
callbackResult = mCallback->onAudioReady(audioStream, audioData, numFrames);
}

mSynthWorkload.onCallback(mNumWorkloadVoices);
if (mNumWorkloadVoices > 0) {
mSynthWorkload.onCallback(numWorkloadVoices);
if (numWorkloadVoices > 0) {
// Render into the buffer or discard the synth voices.
float *buffer = (audioStream->getChannelCount() == 2 && mHearWorkload)
? static_cast<float *>(audioData) : nullptr;
Expand Down
2 changes: 1 addition & 1 deletion apps/OboeTester/app/src/main/cpp/OboeStreamCallbackProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class OboeStreamCallbackProxy : public OboeTesterStreamCallback {
std::atomic<float> mMaxCpuLoad{0.0f};
int64_t mPreviousCallbackTimeNs = 0;
DoubleStatistics mStatistics;
int32_t mNumWorkloadVoices = 0;
std::atomic<int32_t> mNumWorkloadVoices{0};
SynthWorkload mSynthWorkload;
bool mHearWorkload = false;
bool mWorkloadReportingEnabled = false;
Expand Down
Loading