Skip to content

Improve performance of adding commands to PFCommandCache. #720

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 5, 2016
Merged

Improve performance of adding commands to PFCommandCache. #720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 19 additions & 10 deletions Parse/Internal/PFCommandCache.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,25 +227,34 @@ - (BFTask *)_cleanupDiskCacheWithRequiredFreeSize:(NSUInteger)requiredSize {
return [BFTask taskFromExecutor:[BFExecutor defaultExecutor] withBlock:^id{
NSUInteger size = requiredSize;

NSMutableDictionary *commandSizes = [NSMutableDictionary dictionary];
NSMutableDictionary<NSString *, NSNumber *> *commandSizes = [NSMutableDictionary dictionary];

[[PFMultiProcessFileLockController sharedController] beginLockedContentAccessForFileAtPath:self.diskCachePath];
NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:self.diskCachePath];

NSString *identifier = nil;
while ((identifier = [enumerator nextObject])) {
NSNumber *fileSize = enumerator.fileAttributes[NSFileSize];
if (fileSize) {
commandSizes[identifier] = fileSize;
size += fileSize.unsignedIntegerValue;

NSDictionary *directoryAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:self.diskCachePath error:nil];
if ([directoryAttributes[NSFileSize] unsignedLongLongValue] > self.diskCacheSize) {
NSDirectoryEnumerator<NSURL *> *enumerator = [[NSFileManager defaultManager] enumeratorAtURL:[NSURL fileURLWithPath:self.diskCachePath]
includingPropertiesForKeys:@[ NSURLFileSizeKey ]
options:NSDirectoryEnumerationSkipsSubdirectoryDescendants
errorHandler:nil];
NSURL *fileURL = nil;
while ((fileURL = [enumerator nextObject])) {
NSNumber *fileSize = nil;
if (![fileURL getResourceValue:&fileSize forKey:NSURLFileSizeKey error:nil]) {
continue;
}
if (fileSize) {
commandSizes[fileURL.path.lastPathComponent] = fileSize;
size += fileSize.unsignedIntegerValue;
}
}
}

[[PFMultiProcessFileLockController sharedController] endLockedContentAccessForFileAtPath:self.diskCachePath];

if (size > self.diskCacheSize) {
// Get identifiers and sort them to remove oldest commands first
NSArray *identifiers = [commandSizes.allKeys sortedArrayUsingSelector:@selector(compare:)];
NSArray<NSString *> *identifiers = [commandSizes.allKeys sortedArrayUsingSelector:@selector(compare:)];
for (NSString *identifier in identifiers) @autoreleasepool {
[self _removeFileForCommandWithIdentifier:identifier];
size -= [commandSizes[identifier] unsignedIntegerValue];
Expand Down