Preferences: Memory size limit

Memory used for RAM storage of media along with navigation history so it can be restored instantly.

8 files changed, 107 insertions, 4 deletions

diff --git a/src/app.c b/src/app.c
index 1ea33dd4..e2e16252 100644
--- a/src/app.c
+++ b/src/app.c
@@ -210,6 +210,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "smoothscroll arg:%d\n", d->prefs.smoothScrolling);
     appendFormat_String(str, "imageloadscroll arg:%d\n", d->prefs.loadImageInsteadOfScrolling);
     appendFormat_String(str, "cachesize.set arg:%d\n", d->prefs.maxCacheSize);
+    appendFormat_String(str, "memorysize.set arg:%d\n", d->prefs.maxMemorySize);
     appendFormat_String(str, "decodeurls arg:%d\n", d->prefs.decodeUserVisibleURLs);
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     /* TODO: Set up an array of booleans in Prefs and do these in a loop. */
@@ -991,6 +992,33 @@ void trimCache_App(void) {
     iRelease(docs);
 }
 
+void trimMemory_App(void) {
+    iApp *d = &app_;
+    size_t memorySize = 0;
+    const size_t limit = d->prefs.maxMemorySize * 1000000;
+    iObjectList *docs = listDocuments_App(NULL);
+    iForEach(ObjectList, i, docs) {
+        memorySize += memorySize_History(history_DocumentWidget(i.object));
+    }
+    init_ObjectListIterator(&i, docs);
+    iBool wasPruned = iFalse;
+    while (memorySize > limit) {
+        iDocumentWidget *doc = i.object;
+        const size_t pruned = pruneLeastImportantMemory_History(history_DocumentWidget(doc));
+        if (pruned) {
+            memorySize -= pruned;
+            wasPruned = iTrue;
+        }
+        next_ObjectListIterator(&i);
+        if (!i.value) {
+            if (!wasPruned) break;
+            wasPruned = iFalse;
+            init_ObjectListIterator(&i, docs);
+        }
+    }
+    iRelease(docs);    
+}
+
 iLocalDef iBool isWaitingAllowed_App_(iApp *d) {
     if (!isEmpty_Periodic(&d->periodic)) {
         return iFalse;
@@ -1577,7 +1605,9 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         postCommandf_App("searchurl address:%s",
                          cstrText_InputWidget(findChild_Widget(d, "prefs.searchurl")));
         postCommandf_App("cachesize.set arg:%d",
-                         toInt_String(text_InputWidget(findChild_Widget(d, "prefs.cachesize"))));        
+                         toInt_String(text_InputWidget(findChild_Widget(d, "prefs.cachesize"))));
+        postCommandf_App("memorysize.set arg:%d",
+                         toInt_String(text_InputWidget(findChild_Widget(d, "prefs.memorysize"))));
         postCommandf_App("ca.file path:%s",
                          cstrText_InputWidget(findChild_Widget(d, "prefs.ca.file")));
         postCommandf_App("ca.path path:%s",
@@ -2139,6 +2169,13 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "memorysize.set")) {
+        d->prefs.maxMemorySize = arg_Command(cmd);
+        if (d->prefs.maxMemorySize <= 0) {
+            d->prefs.maxMemorySize = 0;
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "searchurl")) {
         iString *url = &d->prefs.searchUrl;
         setCStr_String(url, suffixPtr_Command(cmd, "address"));
@@ -2417,6 +2454,8 @@ iBool handleCommand_App(const char *cmd) {
             iTrue);
         setText_InputWidget(findChild_Widget(dlg, "prefs.cachesize"),
                             collectNewFormat_String("%d", d->prefs.maxCacheSize));
+        setText_InputWidget(findChild_Widget(dlg, "prefs.memorysize"),
+                            collectNewFormat_String("%d", d->prefs.maxMemorySize));
         setToggle_Widget(findChild_Widget(dlg, "prefs.decodeurls"), d->prefs.decodeUserVisibleURLs);
         setText_InputWidget(findChild_Widget(dlg, "prefs.searchurl"), &d->prefs.searchUrl);
         setText_InputWidget(findChild_Widget(dlg, "prefs.ca.file"), &d->prefs.caFile);
diff --git a/src/app.h b/src/app.h
index 918cd396..2dd5198d 100644
--- a/src/app.h
+++ b/src/app.h
@@ -96,6 +96,7 @@ iObjectList *       listDocuments_App   (const iRoot *rootOrNull); /* NULL for a
 iStringSet *        listOpenURLs_App    (void); /* all tabs */
 iDocumentWidget *   newTab_App          (const iDocumentWidget *duplicateOf, iBool switchToNew);
 void                trimCache_App       (void);
+void                trimMemory_App      (void);
 
 iDocumentWidget *   document_Root       (iRoot *);
 
diff --git a/src/history.c b/src/history.c
index fdd0ff55..740830e9 100644
--- a/src/history.c
+++ b/src/history.c
@@ -366,6 +366,17 @@ size_t cacheSize_History(const iHistory *d) {
     return cached;
 }
 
+size_t memorySize_History(const iHistory *d) {
+    size_t bytes = 0;
+    lock_Mutex(d->mtx);
+    iConstForEach(Array, i, &d->recent) {
+        const iRecentUrl *url = i.value;
+        bytes += memorySize_RecentUrl(url);
+    }
+    unlock_Mutex(d->mtx);
+    return bytes;
+}
+
 void clearCache_History(iHistory *d) {
     lock_Mutex(d->mtx);
     iForEach(Array, i, &d->recent) {
@@ -374,6 +385,7 @@ void clearCache_History(iHistory *d) {
             delete_GmResponse(url->cachedResponse);
             url->cachedResponse = NULL;
         }
+        iReleasePtr(&url->cachedDoc); /* release all cached documents and media as well */
     }
     unlock_Mutex(d->mtx);
 }
@@ -387,7 +399,7 @@ size_t pruneLeastImportant_History(iHistory *d) {
     lock_Mutex(d->mtx);
     iConstForEach(Array, i, &d->recent) {
         const iRecentUrl *url = i.value;
-        if (url->cachedResponse || url->cachedDoc) {
+        if (url->cachedResponse) {
             const double urlScore =
                 cacheSize_RecentUrl(url) *
                 pow(secondsSince_Time(&now, &url->cachedResponse->when) / 60.0, 1.25);
@@ -408,6 +420,40 @@ size_t pruneLeastImportant_History(iHistory *d) {
     return delta;
 }
 
+size_t pruneLeastImportantMemory_History(iHistory *d) {
+    size_t delta  = 0;
+    size_t chosen = iInvalidPos;
+    double score  = 0.0f;
+    iTime now;
+    initCurrent_Time(&now);
+    lock_Mutex(d->mtx);
+    iConstForEach(Array, i, &d->recent) {
+        const iRecentUrl *url = i.value;
+        if (d->recentPos == size_Array(&d->recent) - index_ArrayConstIterator(&i) - 1) {
+            continue; /* Not the current navigation position. */
+        }
+        if (url->cachedDoc) {
+            const double urlScore =
+                memorySize_RecentUrl(url) *
+                (url->cachedResponse
+                     ? pow(secondsSince_Time(&now, &url->cachedResponse->when) / 60.0, 1.25)
+                     : 1.0);
+            if (urlScore > score) {
+                chosen = index_ArrayConstIterator(&i);
+                score  = urlScore;
+            }
+        }
+    }
+    if (chosen != iInvalidPos) {
+        iRecentUrl *url = at_Array(&d->recent, chosen);
+        const size_t before = memorySize_RecentUrl(url);
+        iReleasePtr(&url->cachedDoc);
+        delta = before - memorySize_RecentUrl(url);
+    }
+    unlock_Mutex(d->mtx);
+    return delta;
+}
+
 const iStringArray *searchContents_History(const iHistory *d, const iRegExp *pattern) {
     iStringArray *urls = iClob(new_StringArray());
     lock_Mutex(d->mtx);
diff --git a/src/history.h b/src/history.h
index ccc19d27..eb35b1df 100644
--- a/src/history.h
+++ b/src/history.h
@@ -66,8 +66,10 @@ iBool       goForward_History           (iHistory *);
 iRecentUrl *recentUrl_History           (iHistory *, size_t pos);
 iRecentUrl *mostRecentUrl_History       (iHistory *);
 iRecentUrl *findUrl_History             (iHistory *, const iString *url);
-void        clearCache_History          (iHistory *);
-size_t      pruneLeastImportant_History (iHistory *);
+
+void        clearCache_History                  (iHistory *);
+size_t      pruneLeastImportant_History         (iHistory *);
+size_t      pruneLeastImportantMemory_History   (iHistory *);
 
 iBool       atLatest_History            (const iHistory *);
 iBool       atOldest_History            (const iHistory *);
@@ -83,6 +85,7 @@ const iRecentUrl *
 const iGmResponse *
             cachedResponse_History      (const iHistory *);
 size_t      cacheSize_History           (const iHistory *);
+size_t      memorySize_History          (const iHistory *);
 
 iString *   debugInfo_History           (const iHistory *);
 iMemInfo    memoryUsage_History         (const iHistory *);
diff --git a/src/prefs.c b/src/prefs.c
index 385dee78..f1842e9a 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -46,6 +46,7 @@ void init_Prefs(iPrefs *d) {
     d->openArchiveIndexPages = iTrue;
     d->decodeUserVisibleURLs = iTrue;
     d->maxCacheSize      = 10;
+    d->maxMemorySize     = 200;
     d->font              = nunito_TextFont;
     d->headingFont       = nunito_TextFont;
     d->monospaceGemini   = iFalse;
diff --git a/src/prefs.h b/src/prefs.h
index 7185c8f9..655ec949 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -66,6 +66,7 @@ struct Impl_Prefs {
     iString          caPath;
     iBool            decodeUserVisibleURLs;
     int              maxCacheSize; /* MB */
+    int              maxMemorySize; /* MB */
     iString          geminiProxy;
     iString          gopherProxy;
     iString          httpProxy;
diff --git a/src/ui/root.c b/src/ui/root.c
index 23a7d670..52bc7364 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -698,6 +698,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 iInputWidget *url = findWidget_Root("url");
                 const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
                 trimCache_App();
+                trimMemory_App();
                 visitUrl_Visited(visited_App(), withSpacesEncoded_String(urlStr), 0); /* TODO: internal URI normalization */
                 postCommand_App("visited.changed"); /* sidebar will update */
                 setText_InputWidget(url, urlStr);
diff --git a/src/ui/util.c b/src/ui/util.c
index 6eef544b..6c6e62a5 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1834,6 +1834,17 @@ iWidget *makePreferences_Widget(void) {
                                      resizeToParentHeight_WidgetFlag);
             setContentPadding_InputWidget(cache, 0, width_Widget(unit) - 4 * gap_UI);
         }
+        /* Memory size. */ {
+            iInputWidget *mem = new_InputWidget(4);
+            setSelectAllOnFocus_InputWidget(mem, iTrue);
+            addPrefsInputWithHeading_(headings, values, "prefs.memorysize", iClob(mem));
+            iWidget *unit =
+                addChildFlags_Widget(as_Widget(mem),
+                                     iClob(new_LabelWidget("${mb}", NULL)),
+                                     frameless_WidgetFlag | moveToParentRightEdge_WidgetFlag |
+                                         resizeToParentHeight_WidgetFlag);
+            setContentPadding_InputWidget(mem, 0, width_Widget(unit) - 4 * gap_UI);
+        }
         makeTwoColumnHeading_("${heading.prefs.certs}", headings, values);
         addPrefsInputWithHeading_(headings, values, "prefs.ca.file", iClob(new_InputWidget(0)));
         addPrefsInputWithHeading_(headings, values, "prefs.ca.path", iClob(new_InputWidget(0)));