ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AchievementManager: std::move leaderboard info in FetchBoardInfo() 

Avoids churning some allocations.
This commit is contained in:
Lioncash 2024-01-31 22:29:55 -05:00
parent 76c381e6f7
commit 184fe932ed
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Core/AchievementManager.cpp
View File

@ -1221,15 +1221,17 @@ AchievementManager::ResponseType AchievementManager::FetchBoardInfo(AchievementI
for (u32 i = 0; i < board_info.num_entries; ++i) for (u32 i = 0; i < board_info.num_entries; ++i)
{ {
const auto& org_entry = board_info.entries[i]; const auto& org_entry = board_info.entries[i];
LeaderboardEntry dest_entry = auto dest_entry = LeaderboardEntry{
LeaderboardEntry{.username = org_entry.username, .rank = org_entry.rank}; .username = org_entry.username,
.rank = org_entry.rank,
};
if (rc_runtime_format_lboard_value(dest_entry.score.data(), FORMAT_SIZE, org_entry.score, if (rc_runtime_format_lboard_value(dest_entry.score.data(), FORMAT_SIZE, org_entry.score,
board_info.format) == 0) board_info.format) == 0)
{ {
ERROR_LOG_FMT(ACHIEVEMENTS, "Failed to format leaderboard score {}.", org_entry.score); ERROR_LOG_FMT(ACHIEVEMENTS, "Failed to format leaderboard score {}.", org_entry.score);
strncpy(dest_entry.score.data(), fmt::format("{}", org_entry.score).c_str(), FORMAT_SIZE); strncpy(dest_entry.score.data(), fmt::format("{}", org_entry.score).c_str(), FORMAT_SIZE);
} }
lboard.entries[org_entry.index] = dest_entry; lboard.entries.insert_or_assign(org_entry.index, std::move(dest_entry));
} }
rc_api_destroy_fetch_leaderboard_info_response(&board_info); rc_api_destroy_fetch_leaderboard_info_response(&board_info);
} }
@ -1257,15 +1259,17 @@ AchievementManager::ResponseType AchievementManager::FetchBoardInfo(AchievementI
for (u32 i = 0; i < board_info.num_entries; ++i) for (u32 i = 0; i < board_info.num_entries; ++i)
{ {
const auto& org_entry = board_info.entries[i]; const auto& org_entry = board_info.entries[i];
LeaderboardEntry dest_entry = auto dest_entry = LeaderboardEntry{
LeaderboardEntry{.username = org_entry.username, .rank = org_entry.rank}; .username = org_entry.username,
.rank = org_entry.rank,
};
if (rc_runtime_format_lboard_value(dest_entry.score.data(), FORMAT_SIZE, org_entry.score, if (rc_runtime_format_lboard_value(dest_entry.score.data(), FORMAT_SIZE, org_entry.score,
board_info.format) == 0) board_info.format) == 0)
{ {
ERROR_LOG_FMT(ACHIEVEMENTS, "Failed to format leaderboard score {}.", org_entry.score); ERROR_LOG_FMT(ACHIEVEMENTS, "Failed to format leaderboard score {}.", org_entry.score);
strncpy(dest_entry.score.data(), fmt::format("{}", org_entry.score).c_str(), FORMAT_SIZE); strncpy(dest_entry.score.data(), fmt::format("{}", org_entry.score).c_str(), FORMAT_SIZE);
} }
lboard.entries[org_entry.index] = dest_entry; lboard.entries.insert_or_assign(org_entry.index, std::move(dest_entry));
if (org_entry.username == username) if (org_entry.username == username)
lboard.player_index = org_entry.index; lboard.player_index = org_entry.index;
} }
@ -1274,7 +1278,7 @@ AchievementManager::ResponseType AchievementManager::FetchBoardInfo(AchievementI
{ {
std::lock_guard lg{m_lock}; std::lock_guard lg{m_lock};
m_leaderboard_map[leaderboard_id] = lboard; m_leaderboard_map.insert_or_assign(leaderboard_id, std::move(lboard));
} }
return ResponseType::SUCCESS; return ResponseType::SUCCESS;