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.

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

Optimize IOLoginData::saveItems by reducing number of allocations #3176

Merged
merged 2 commits into from
Sep 17, 2021
Merged
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions src/iologindata.cpp
Original file line number Diff line number Diff line change
@@ -591,7 +591,8 @@ bool IOLoginData::saveItems(const Player* player, const ItemBlockList& itemList,
std::ostringstream ss;

using ContainerBlock = std::pair<Container*, int32_t>;
std::list<ContainerBlock> queue;
std::vector<ContainerBlock> containers;
containers.reserve(32);

int32_t runningId = 100;

@@ -613,22 +614,21 @@ bool IOLoginData::saveItems(const Player* player, const ItemBlockList& itemList,
}

if (Container* container = item->getContainer()) {
queue.emplace_back(container, runningId);
containers.emplace_back(container, runningId);
}
}

while (!queue.empty()) {
const ContainerBlock& cb = queue.front();
for (size_t i = 0; i < containers.size(); i++) {
const ContainerBlock& cb = containers[i];
ranisalt marked this conversation as resolved.
Show resolved Hide resolved
Container* container = cb.first;
int32_t parentId = cb.second;
queue.pop_front();

for (Item* item : container->getItemList()) {
++runningId;

Container* subContainer = item->getContainer();
if (subContainer) {
queue.emplace_back(subContainer, runningId);
containers.emplace_back(subContainer, runningId);
}

propWriteStream.clear();