hayodea/salmanoff
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

PcloudStimProd: make sh_ptrs to Pcloud*StimBuff atomic<>

Browse Source 
This change is a bit pedantic, but since these vars aren't accessed
in any hotpath, it's fine to be pedantic. We made these sh_ptrs
atomic so we can use acquire and release side effects when loading
and storing them. This doesn't eliminate the problem of seeing
inconsistent state across microcontrollers, but it helps with simple
accesses like these ones we already do.
This commit is contained in:
Hayodea Hekol
2025-11-26 00:11:40 -04:00
parent edab71b823
commit 5cce473e01
4 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stimBuffApis/livoxGen1/pcloudStimulusProducer.cpp
+34 -19
View File
@@ -214,12 +214,24 @@ void PcloudStimulusProducer::destroyAttachedStimulusBuffer(
this->stop();
// Clear specialized buffer pointers if they match
if (meshStimulusBuffer == buffer)
{ meshStimulusBuffer.reset(); }
if (intensityStimulusBuffer == buffer)
{ intensityStimulusBuffer.reset(); }
if (ambienceStimulusBuffer == buffer)
{ ambienceStimulusBuffer.reset(); }
auto meshBuff = meshStimulusBuffer.load(std::memory_order_acquire);
if (meshBuff == buffer)
{
meshBuff.reset();
meshStimulusBuffer.store(nullptr, std::memory_order_release);
}
auto intensityBuff = intensityStimulusBuffer.load(std::memory_order_acquire);
if (intensityBuff == buffer)
{
intensityBuff.reset();
intensityStimulusBuffer.store(nullptr, std::memory_order_release);
}
auto ambienceBuff = ambienceStimulusBuffer.load(std::memory_order_acquire);
if (ambienceBuff == buffer)
{
ambienceBuff.reset();
ambienceStimulusBuffer.store(nullptr, std::memory_order_release);
}
// Call base class implementation to remove from attachedStimulusBuffers
StimulusProducer::destroyAttachedStimulusBuffer(buffer);
@@ -266,7 +278,7 @@ std::cout << __func__ << ": $$$$$$$ Creating MeshStimulusBuffer" << std::endl;
std::cout << __func__ << ": $$$$$$$ Created MeshStimulusBuffer" << std::endl;
this->stop();
addAttachedStimulusBufferIfNotExists(meshBuffer);
meshStimulusBuffer = meshBuffer;
meshStimulusBuffer.store(meshBuffer, std::memory_order_release);
this->start();
return meshBuffer;
}
@@ -289,7 +301,8 @@ std::cout << __func__ << ": $$$$$$$ Creating PcloudIntensityStimulusBuffer" << s
std::cout << __func__ << ": $$$$$$$ Created PcloudIntensityStimulusBuffer" << std::endl;
this->stop();
addAttachedStimulusBufferIfNotExists(intensityBuffer);
intensityStimulusBuffer = intensityBuffer;
intensityStimulusBuffer.store(
intensityBuffer, std::memory_order_release);
this->start();
return intensityBuffer;
}
@@ -322,7 +335,7 @@ std::cout << __func__ << ": $$$$$$$ Created PcloudIntensityStimulusBuffer" << st
std::cout << __func__ << ": $$$$$$$ Created PcloudAmbienceStimulusBuffer" << std::endl;
this->stop();
addAttachedStimulusBufferIfNotExists(ambienceBuffer);
ambienceStimulusBuffer = ambienceBuffer;
ambienceStimulusBuffer.store(ambienceBuffer, std::memory_order_release);
this->start();
return ambienceBuffer;
}
@@ -407,13 +420,14 @@ public:
context->frameAssemblyResult = loop;
// Check if intensity buffer is attached and acquire frame if so
if (pcloudProducer.intensityStimulusBuffer)
if (auto intensityBuff = pcloudProducer.intensityStimulusBuffer.load(
std::memory_order_acquire))
{
size_t intensityRingbuffIndex = pcloudProducer
.intensityStimulusBuffer->ringBuffer.getIndexToProduceInto();
size_t intensityRingbuffIndex = intensityBuff
->ringBuffer.getIndexToProduceInto();
StimulusFrame& intensityStimFrame = pcloudProducer
.intensityStimulusBuffer->ringBuffer.getDataAtSlot(
StimulusFrame& intensityStimFrame = intensityBuff
->ringBuffer.getDataAtSlot(
intensityRingbuffIndex);
intensityStimFrame.lock.writeAcquire();
@@ -425,13 +439,14 @@ public:
}
// Check if ambience buffer is attached and acquire frame if so
if (pcloudProducer.ambienceStimulusBuffer)
if (auto ambienceBuff = pcloudProducer.ambienceStimulusBuffer.load(
std::memory_order_acquire))
{
size_t ambienceRingbuffIndex = pcloudProducer
.ambienceStimulusBuffer->ringBuffer.getIndexToProduceInto();
size_t ambienceRingbuffIndex = ambienceBuff
->ringBuffer.getIndexToProduceInto();
StimulusFrame& ambienceStimFrame = pcloudProducer
.ambienceStimulusBuffer->ringBuffer.getDataAtSlot(
StimulusFrame& ambienceStimFrame = ambienceBuff
->ringBuffer.getDataAtSlot(
ambienceRingbuffIndex);
ambienceStimFrame.lock.writeAcquire();