OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

download: add ref count to cache init/exit and have all threads call init.

Browse Source 
this ensures that the etag cache is ready to use before a download request is made, avoiding a rare race condition.
This commit is contained in:
ITotalJustice
2025-08-31 01:57:09 +01:00
parent 62f48353ba
commit 876be3b7b6
1 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sphaira/source/download.cpp
View File

@@ -82,24 +82,28 @@ struct Cache {
bool init() { bool init() {
SCOPED_MUTEX(&m_mutex); SCOPED_MUTEX(&m_mutex);
if (m_json) { if (!m_json) {
return true; auto json_in = yyjson_read_file(JSON_PATH, YYJSON_READ_NOFLAG, nullptr, nullptr);
if (json_in) {
log_write("loading old json doc\n");
m_json = yyjson_doc_mut_copy(json_in, nullptr);
yyjson_doc_free(json_in);
m_root = yyjson_mut_doc_get_root(m_json);
} else {
log_write("creating new json doc\n");
m_json = yyjson_mut_doc_new(nullptr);
m_root = yyjson_mut_obj(m_json);
yyjson_mut_doc_set_root(m_json, m_root);
}
} }
auto json_in = yyjson_read_file(JSON_PATH, YYJSON_READ_NOFLAG, nullptr, nullptr); if (!m_json) {
if (json_in) { return false;
log_write("loading old json doc\n");
m_json = yyjson_doc_mut_copy(json_in, nullptr);
yyjson_doc_free(json_in);
m_root = yyjson_mut_doc_get_root(m_json);
} else {
log_write("creating new json doc\n");
m_json = yyjson_mut_doc_new(nullptr);
m_root = yyjson_mut_obj(m_json);
yyjson_mut_doc_set_root(m_json, m_root);
} }
return m_json && m_root; m_init_ref_count++;
log_write("[ETAG] init: %u\n", m_init_ref_count);
return true;
} }
void exit() { void exit() {
@@ -109,14 +113,20 @@ struct Cache {
return; return;
} }
m_init_ref_count--;
if (m_init_ref_count) {
return;
}
// note: this takes 20ms // note: this takes 20ms
if (!yyjson_mut_write_file(JSON_PATH, m_json, YYJSON_WRITE_NOFLAG, nullptr, nullptr)) { if (!yyjson_mut_write_file(JSON_PATH, m_json, YYJSON_WRITE_NOFLAG, nullptr, nullptr)) {
log_write("failed to write etag json: %s\n", JSON_PATH.s); log_write("[ETAG] failed to write etag json: %s\n", JSON_PATH.s);
} }
yyjson_mut_doc_free(m_json); yyjson_mut_doc_free(m_json);
m_json = nullptr; m_json = nullptr;
m_root = nullptr; m_root = nullptr;
log_write("[ETAG] exit\n");
} }
void get(const fs::FsPath& path, curl::Header& header) { void get(const fs::FsPath& path, curl::Header& header) {
@@ -255,6 +265,7 @@ private:
yyjson_mut_doc* m_json{}; yyjson_mut_doc* m_json{};
yyjson_mut_val* m_root{}; yyjson_mut_val* m_root{};
std::unordered_map<std::string, Value> m_cache{}; std::unordered_map<std::string, Value> m_cache{};
u32 m_init_ref_count{};
}; };
struct ThreadEntry { struct ThreadEntry {
@@ -1029,6 +1040,12 @@ void my_unlock(CURL *handle, curl_lock_data data, void *useptr) {
void ThreadEntry::ThreadFunc(void* p) { void ThreadEntry::ThreadFunc(void* p) {
auto data = static_cast<ThreadEntry*>(p); auto data = static_cast<ThreadEntry*>(p);
if (!g_cache.init()) {
log_write("failed to init json cache\n");
}
ON_SCOPE_EXIT(g_cache.exit());
while (g_running) { while (g_running) {
auto rc = waitSingle(waiterForUEvent(&data->m_uevent), UINT64_MAX); auto rc = waitSingle(waiterForUEvent(&data->m_uevent), UINT64_MAX);
// log_write("woke up\n"); // log_write("woke up\n");
@@ -1058,11 +1075,6 @@ void ThreadEntry::ThreadFunc(void* p) {
void ThreadQueue::ThreadFunc(void* p) { void ThreadQueue::ThreadFunc(void* p) {
auto data = static_cast<ThreadQueue*>(p); auto data = static_cast<ThreadQueue*>(p);
if (!g_cache.init()) {
log_write("failed to init json cache\n");
}
ON_SCOPE_EXIT(g_cache.exit());
while (g_running) { while (g_running) {
auto rc = waitSingle(waiterForUEvent(&data->m_uevent), UINT64_MAX); auto rc = waitSingle(waiterForUEvent(&data->m_uevent), UINT64_MAX);
log_write("[thread queue] woke up\n"); log_write("[thread queue] woke up\n");