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

TMemoCache refactor + double assign race condition fix #321

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

TMemoCache refactor + double assign race condition fix #321

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11cabab
TMemoCache refactor
madMAx43v3r Jan 10, 2022
cb707e0
TMemoCache double assign race condition fix
madMAx43v3r Jan 10, 2022
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
23 changes: 15 additions & 8 deletions src/encoding.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ class TMemoCache {
public:
~TMemoCache()
{
std::lock_guard<std::mutex> l(memoMutex);
// Clean up global entries on destruction
std::map<double, FSE_CTable *>::iterator itc;
for (itc = CT_MEMO.begin(); itc != CT_MEMO.end(); itc++) {
FSE_freeCTable(itc->second);
for (const auto& entry : CT_MEMO) {
FSE_freeCTable(entry.second);
}
std::map<double, FSE_DTable *>::iterator itd;
for (itd = DT_MEMO.begin(); itd != DT_MEMO.end(); itd++) {
FSE_freeDTable(itd->second);
for (const auto& entry : DT_MEMO) {
FSE_freeDTable(entry.second);
}
}

Expand All @@ -61,13 +60,21 @@ class TMemoCache {
void CTAssign(double R, FSE_CTable *ct)
{
std::lock_guard<std::mutex> l(memoMutex);
CT_MEMO[R] = ct;
auto& table = CT_MEMO[R];
if(table) {
FSE_freeCTable(table);
}
table = ct;
}

void DTAssign(double R, FSE_DTable *dt)
{
std::lock_guard<std::mutex> l(memoMutex);
DT_MEMO[R] = dt;
auto& table = DT_MEMO[R];
if(table) {
FSE_freeDTable(table);
}
table = dt;
}

FSE_CTable *CTGet(double R)
Expand Down