From 13e3327167cf47aa7c202ed83835bf43169ac8c1 Mon Sep 17 00:00:00 2001 From: Matt Holgate Date: Wed, 18 Jun 2014 11:10:44 +0100 Subject: Fix for bug #694405 - iOS Pdf Crash If an iOS app uses too much memory, the OS asks it to free up some space. If it doesn't do so in a timely manner, it will get a second warning before being killed by the OS. In other platforms, where malloc() return NULL in OOM, the store scavenger releases memory when mallocs fail. In iOS, mallocs usually never return NULL because the app is killed before this can happen. Therefore, we need to initiate a scavenge from the low memory notification instead. We evict the store to 50% of its current size when a memory warning occurs when it is in the foreground, and 0% when a memory warning occurs whilst it is in the background. Having said this, I didn't manage to get a background warning to occur, presumably because we don't request background execution Therefore, I think in practice the OS just kills the process. However, this will be useful if we ever add background execution. --- platform/ios/Classes/MuAppDelegate.h | 6 ++++++ platform/ios/Classes/MuAppDelegate.m | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'platform/ios/Classes') diff --git a/platform/ios/Classes/MuAppDelegate.h b/platform/ios/Classes/MuAppDelegate.h index a20233db..34074c87 100644 --- a/platform/ios/Classes/MuAppDelegate.h +++ b/platform/ios/Classes/MuAppDelegate.h @@ -2,6 +2,12 @@ #import "MuLibraryController.h" +enum +{ + // use at most 128M for resource cache + ResourceCacheMaxSize = 128<<20 // use at most 128M for resource cache +}; + @interface MuAppDelegate : NSObject { UIWindow *window; diff --git a/platform/ios/Classes/MuAppDelegate.m b/platform/ios/Classes/MuAppDelegate.m index 2c6e1df3..b88de1cb 100644 --- a/platform/ios/Classes/MuAppDelegate.m +++ b/platform/ios/Classes/MuAppDelegate.m @@ -1,8 +1,12 @@ #include "common.h" +#include "mupdf/fitz.h" #import "MuAppDelegate.h" @implementation MuAppDelegate +{ + BOOL _isInBackground; +} - (BOOL) application: (UIApplication*)application didFinishLaunchingWithOptions: (NSDictionary*)launchOptions { @@ -10,8 +14,7 @@ queue = dispatch_queue_create("com.artifex.mupdf.queue", NULL); - // use at most 128M for resource cache - ctx = fz_new_context(NULL, NULL, 128<<20); + ctx = fz_new_context(NULL, NULL, ResourceCacheMaxSize); fz_register_document_handlers(ctx); screenScale = [[UIScreen mainScreen] scale]; @@ -57,11 +60,13 @@ { printf("applicationDidEnterBackground!\n"); [[NSUserDefaults standardUserDefaults] synchronize]; + _isInBackground = YES; } - (void)applicationWillEnterForeground:(UIApplication *)application { printf("applicationWillEnterForeground!\n"); + _isInBackground = NO; } - (void)applicationDidBecomeActive:(UIApplication *)application @@ -77,7 +82,9 @@ - (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { - printf("applicationDidReceiveMemoryWarning\n"); + NSLog(@"applicationDidReceiveMemoryWarning"); + int success = fz_shrink_store(ctx, _isInBackground ? 0 : 50); + NSLog(@"fz_shrink_store: success = %d", success); } - (void) dealloc -- cgit v1.2.3