hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-11-16 23:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

asyncResourceGatherer: trace logs and exit behaviour (#414)

Browse source 
* asyncResourceGatherer: add trace logs

useful for debugging label updates

* label: remove unused onAssetCallbackTimer

* asyncResourceGatherer: fix crashes on exit
This commit is contained in:
Maximilian Seidler 2024-07-10 12:05:18 +02:00 committed by GitHub
parent 944caff79f
commit e5f0b56d07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/renderer/AsyncResourceGatherer.cpp
View file

@ -385,6 +385,8 @@ void CAsyncResourceGatherer::asyncAssetSpinLock() {
// process requests // process requests
for (auto& r : requests) { for (auto& r : requests) {
Debug::log(TRACE, "Processing requested resourceID {}", r.id);
if (r.type == TARGET_TEXT) { if (r.type == TARGET_TEXT) {
renderText(r); renderText(r);
} else if (r.type == TARGET_IMAGE) { } else if (r.type == TARGET_IMAGE) {
@ -399,11 +401,11 @@ void CAsyncResourceGatherer::asyncAssetSpinLock() {
g_pHyprlock->addTimer(std::chrono::milliseconds(0), timerCallback, new STimerCallbackData{r.callback, r.callbackData}); g_pHyprlock->addTimer(std::chrono::milliseconds(0), timerCallback, new STimerCallbackData{r.callback, r.callbackData});
} }
} }
dmas.clear();
} }
void CAsyncResourceGatherer::requestAsyncAssetPreload(const SPreloadRequest& request) { void CAsyncResourceGatherer::requestAsyncAssetPreload(const SPreloadRequest& request) {
Debug::log(TRACE, "Requesting label resource {}", request.id);
std::lock_guard<std::mutex> lg(asyncLoopState.requestsMutex); std::lock_guard<std::mutex> lg(asyncLoopState.requestsMutex);
asyncLoopState.requests.push_back(request); asyncLoopState.requests.push_back(request);
asyncLoopState.pending = true; asyncLoopState.pending = true;
@ -416,13 +418,14 @@ void CAsyncResourceGatherer::unloadAsset(SPreloadedAsset* asset) {
void CAsyncResourceGatherer::notify() { void CAsyncResourceGatherer::notify() {
std::lock_guard<std::mutex> lg(asyncLoopState.requestsMutex); std::lock_guard<std::mutex> lg(asyncLoopState.requestsMutex);
asyncLoopState.requests.clear();
asyncLoopState.pending = true; asyncLoopState.pending = true;
asyncLoopState.requestsCV.notify_all(); asyncLoopState.requestsCV.notify_all();
} }
void CAsyncResourceGatherer::await() { void CAsyncResourceGatherer::await() {
if (asyncLoopThread.joinable())
asyncLoopThread.join();
if (initialGatherThread.joinable()) if (initialGatherThread.joinable())
initialGatherThread.join(); initialGatherThread.join();
if (asyncLoopThread.joinable())
asyncLoopThread.join();
} }

5
src/renderer/widgets/Label.cpp
View file

@ -147,11 +147,6 @@ bool CLabel::draw(const SRenderData& data) {
return false; return false;
} }
static void onAssetCallbackTimer(std::shared_ptr<CTimer> self, void* data) {
const auto PLABEL = (CLabel*)data;
PLABEL->renderSuper();
}
void CLabel::renderSuper() { void CLabel::renderSuper() {
g_pHyprlock->renderOutput(outputStringPort); g_pHyprlock->renderOutput(outputStringPort);
} }