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

Limit the size of replay resource data chunks to reduce memory usage #2171

Merged
merged 1 commit into from
Sep 4, 2018
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
30 changes: 23 additions & 7 deletions gapir/cc/resource_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,29 @@ bool ResourceCache::Batch::flush(ResourceCache& cache, ReplayConnection* conn) {
if (!cache.mFallbackProvider) {
return false;
}
if (!cache.mFallbackProvider->get(mResources.data(), count, conn, ptr,
mSize)) {
return false;
}
for (auto resource : mResources) {
cache.putCache(resource, ptr);
ptr += resource.size;
size_t one_req_limit =
100 * 1024 * 1024; // limit 100MB unless there is only resource
size_t i = 0;
size_t j = 0;
size_t one_req_size = 0;
while (i < count) {
if (((i != j) && (one_req_size + mResources[j].size > one_req_limit)) ||
(j == mResources.size())) {
if (!cache.mFallbackProvider->get(&mResources[i], j - i, conn, ptr,
one_req_size)) {
return false;
}
while (i < j) {
cache.putCache(mResources[i], ptr);
ptr += mResources[i].size;
i++;
}
one_req_size = 0;
}
if (j < mResources.size()) {
one_req_size += mResources[j].size;
j++;
}
}
return true;
}
Expand Down