ad69ac84b1
As discussed (many times) on Discord, does the same as the new favorite
tag, but instead allows you to add multiple groups.
Initially, this would cause some insane issues with draw/reset
(apparantly) fighting eachother in the pattern drawer. After a lot of
trial and error, I decided to rewrite the flow that is responsible for
calling reset. Now evaluating patterns is the one to decide when the
reset happens, not the core "game"-loop.
To make sure that draw and reset can never happen at the same time, the
mutex originally used for the favorites has been repurposed. Due to the
restructuring, the mutex in the favorite-task is no longer needed, as
that will only ever kick-off after reset is called and if there are
actually patterns, which can never line up to be accessed on different
threads at the same time.
Last but not least, I noticed that hard crashes could result in your
config file getting overridden. I added a check to prevent that.
Last I issue I can see is that if you use an excessive amount of
favorites/groups, a crash can still happen, but it only happens when you
close the program (occasionally, but unpredictable). Before, this would
happen if you ran the evaluation a second time. I boiled the cause of
the crash down to these lines of code in evaluator.cpp >
patternDestroyed:
```cpp
if (pattern->isPatternLocal()) {
if (auto it = this->m_patternLocalStorage.find(pattern->getHeapAddress()); it != this->m_patternLocalStorage.end()) {
auto &[key, data] = *it;
data.referenceCount--;
if (data.referenceCount == 0)
this->m_patternLocalStorage.erase(it);
} else if (!this->m_evaluated) {
err::E0001.throwError(fmt::format("Double free of variable named '{}'.", pattern->getVariableName()));
}
}
```
Specifically, trying to access the `*it` is the reason for the crash
(this was also the cause of the crashes before my fixes, but then during
evaluation).
I'm suspecting the root cause is somewhere in the `.clone` methods of
the patterns. I'd say that for now a crash when closing the program is
more acceptable than during evaluation (which can even happen if you use
favorites).
62 lines
2.5 KiB
C++
62 lines
2.5 KiB
C++
#include <content/views/view_pattern_data.hpp>
|
|
|
|
#include <hex/api/content_registry.hpp>
|
|
#include <hex/providers/provider.hpp>
|
|
|
|
#include <pl/patterns/pattern.hpp>
|
|
#include <wolv/utils/lock.hpp>
|
|
|
|
namespace hex::plugin::builtin {
|
|
|
|
ViewPatternData::ViewPatternData() : View("hex.builtin.view.pattern_data.name") {
|
|
// Handle tree style setting changes
|
|
EventManager::subscribe<EventSettingsChanged>(this, [this]() {
|
|
auto patternStyle = ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.pattern_tree_style", 0);
|
|
this->m_patternDrawer.setTreeStyle(static_cast<ui::PatternDrawer::TreeStyle>(patternStyle));
|
|
});
|
|
|
|
// Reset the pattern drawer when the provider changes
|
|
EventManager::subscribe<EventProviderChanged>(this, [this](auto, auto) {
|
|
this->m_patternDrawer.reset();
|
|
});
|
|
|
|
EventManager::subscribe<EventPatternEvaluating>(this, [this]{
|
|
this->m_patternDrawer.reset();
|
|
});
|
|
|
|
EventManager::subscribe<EventPatternExecuted>(this, [this](auto){
|
|
this->m_patternDrawer.reset();
|
|
});
|
|
|
|
// Handle jumping to a pattern's location when it is clicked
|
|
this->m_patternDrawer.setSelectionCallback([](Region region){ ImHexApi::HexEditor::setSelection(region); });
|
|
}
|
|
|
|
ViewPatternData::~ViewPatternData() {
|
|
EventManager::unsubscribe<EventSettingsChanged>(this);
|
|
EventManager::unsubscribe<EventProviderChanged>(this);
|
|
EventManager::unsubscribe<EventPatternEvaluating>(this);
|
|
EventManager::unsubscribe<EventPatternExecuted>(this);
|
|
}
|
|
|
|
void ViewPatternData::drawContent() {
|
|
if (ImGui::Begin(View::toWindowName("hex.builtin.view.pattern_data.name").c_str(), &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
|
|
// Draw the pattern tree if the provider is valid
|
|
if (ImHexApi::Provider::isValid()) {
|
|
// Make sure the runtime has finished evaluating and produced valid patterns
|
|
auto &runtime = ContentRegistry::PatternLanguage::getRuntime();
|
|
if (!runtime.arePatternsValid()) {
|
|
this->m_patternDrawer.draw({ });
|
|
} else {
|
|
// If the runtime has finished evaluating, draw the patterns
|
|
if (TRY_LOCK(ContentRegistry::PatternLanguage::getRuntimeLock())) {
|
|
this->m_patternDrawer.draw(runtime.getPatterns(), &runtime);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
ImGui::End();
|
|
}
|
|
|
|
}
|