Skip to content

Fix deadlock with msan #14

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
Avogar merged 1 commit into from
Aug 9, 2022
Merged

Fix deadlock with msan #14

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
27 changes: 25 additions & 2 deletions cpp/src/arrow/util/mutex.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,41 @@ struct AfterForkState {
// The leak (only in child processes) is a small price to pay for robustness.
Mutex* mutex = nullptr;

enum State {
INITIALIZED,
IN_PROCESS,
NOT_INITIALIZED,
};

std::atomic_int state = INITIALIZED;

private:
AfterForkState() {
pthread_atfork(/*prepare=*/nullptr, /*parent=*/nullptr, /*child=*/&AfterFork);
}

static void AfterFork() { instance.mutex = new Mutex; }
static void AfterFork() { instance.state.store(NOT_INITIALIZED); }

};

AfterForkState AfterForkState::instance;
} // namespace

Mutex* GlobalForkSafeMutex() { return AfterForkState::instance.mutex; }
Mutex* GlobalForkSafeMutex() {
if (AfterForkState::instance.state.load() == AfterForkState::State::INITIALIZED) {
return AfterForkState::instance.mutex;
}

int expected = AfterForkState::State::NOT_INITIALIZED;
if (AfterForkState::instance.state.compare_exchange_strong(expected, AfterForkState::State::IN_PROCESS)) {
AfterForkState::instance.mutex = new Mutex;
AfterForkState::instance.state.store(AfterForkState::State::INITIALIZED);
} else {
while (AfterForkState::instance.state.load() != AfterForkState::State::INITIALIZED);
}

return AfterForkState::instance.mutex;
}
#endif // _WIN32

} // namespace util
Expand Down