Skip to content

fix: add mutex to VoiceActivityDetection to prevent race between generate() and unload() #1056

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

Open
radko93 wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −0
Open

fix: add mutex to VoiceActivityDetection to prevent race between generate() and unload() #1056

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: 6 additions & 0 deletions ...executorch/common/rnexecutorch/models/voice_activity_detection/VoiceActivityDetection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,14 @@ VoiceActivityDetection::preprocess(std::span<float> waveform) const {
return frameBuffer;
}

void VoiceActivityDetection::unload() noexcept {
std::scoped_lock lock(inference_mutex_);
BaseModel::unload();
}

std::vector<types::Segment>
VoiceActivityDetection::generate(std::span<float> waveform) const {
std::scoped_lock lock(inference_mutex_);

auto windowedInput = preprocess(waveform);
auto [chunksNumber, remainder] = std::div(
Expand Down
13 changes: 13 additions & 0 deletions ...e-executorch/common/rnexecutorch/models/voice_activity_detection/VoiceActivityDetection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <executorch/extension/tensor/tensor.h>
#include <executorch/extension/tensor/tensor_ptr.h>
#include <executorch/runtime/core/evalue.h>
#include <mutex>
#include <span>

#include "rnexecutorch/metaprogramming/ConstructorHelpers.h"
Expand All @@ -23,7 +24,19 @@ class VoiceActivityDetection : public BaseModel {
[[nodiscard("Registered non-void function")]] std::vector<types::Segment>
generate(std::span<float> waveform) const;

/**
* @brief Thread-safe unload that waits for any in-flight inference to
* complete.
*
* Mirrors VisionModel::unload(). Without this, BaseModel::unload() can
* destroy module_ while generate() is still calling forward() on a worker
* thread, causing SIGILL / SIGSEGV crashes.
*/
void unload() noexcept;

private:
mutable std::mutex inference_mutex_;

std::vector<std::array<float, constants::kPaddedWindowSize>>
preprocess(std::span<float> waveform) const;
std::vector<types::Segment> postprocess(const std::vector<float> &scores,
Expand Down
Loading