Skip to content

Memory hog: Update checks never release memory to the system #2438

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

Open
lewisgoddard wants to merge 1 commit into
base: main
Choose a base branch
from
+55 −39
Open

Memory hog: Update checks never release memory to the system #2438

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
94 changes: 55 additions & 39 deletions src/Core/FlatpakBackend.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
* Authored by: David Hewitt <davidmhewitt@gmail.com>
*/

[CCode (cheader_filename = "malloc.h")]
extern int malloc_trim (size_t pad);

public class AppCenterCore.FlatpakPackage : Package {
public weak Flatpak.Installation installation { public get; construct; }

Expand Down Expand Up @@ -129,6 +132,10 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
private static GLib.FileMonitor user_installation_changed_monitor;
private static GLib.FileMonitor system_installation_changed_monitor;

private uint installation_changed_timeout_id = 0;
private bool update_check_running = false;
private bool update_check_pending = false;

private uint total_operations;
private int current_operation;

Expand Down Expand Up @@ -295,21 +302,7 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
warning ("Couldn't user create Installation File Monitor : %s", e.message);
}

user_installation_changed_monitor.changed.connect (() => {
if (!working) {
debug ("Flatpak user installation changed.");

// Clear the installed state of all packages as something may have changed we weren't
// aware of
foreach (var package in package_list.values) {
if (package.state != Package.State.NOT_INSTALLED || package.installed) {
package.clear_installed ();
}
}

trigger_update_check.begin ();
}
});
user_installation_changed_monitor.changed.connect (() => queue_installation_changed_check ());
} else {
warning ("Couldn't create user Installation File Monitor due to no installation");
}
Expand All @@ -321,24 +314,10 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
warning ("Couldn't create system Installation File Monitor : %s", e.message);
}

system_installation_changed_monitor.changed.connect (() => {
// Only trigger a cache refresh if we're not doing anything (i.e. its an external change)
if (!working) {
debug ("Flatpak system installation changed.");

// Clear the installed state of all packages as something may have changed we weren't
// aware of
foreach (var package in package_list.values) {
if (package.state != Package.State.NOT_INSTALLED || package.installed) {
package.clear_installed ();
}
}

// Reloads the appstream data for enabled remotes and checks what applications are
// installed/require updates
trigger_update_check.begin ();
}
});
// Only trigger a cache refresh if we're not doing anything (i.e. its an external change).
// Reloads the appstream data for enabled remotes and checks what applications are
// installed/require updates.
system_installation_changed_monitor.changed.connect (() => queue_installation_changed_check ());
} else {
warning ("Couldn't create system Installation File Monitor due to no installation");
}
Expand Down Expand Up @@ -423,15 +402,50 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
});
}

private void queue_installation_changed_check () {
if (installation_changed_timeout_id != 0) {
Source.remove (installation_changed_timeout_id);
}

installation_changed_timeout_id = Timeout.add_seconds_once (2, () => {
installation_changed_timeout_id = 0;

debug ("Flatpak installation changed (debounced); triggering update check.");

// Clear the installed state of all packages as something may have changed
// we weren't aware of
foreach (var package in package_list.values) {
if (package.state != Package.State.NOT_INSTALLED || package.installed) {
package.clear_installed ();
}
}

trigger_update_check.begin ();
});
}

private async void trigger_update_check () {
try {
yield refresh_cache (null);
} catch (Error e) {
warning ("Unable to refresh cache after external change: %s", e.message);
if (update_check_running) {
update_check_pending = true;
return;
}

reload_installed_packages ();
yield get_updates (null);
update_check_running = true;

do {
update_check_pending = false;

try {
yield refresh_cache (null);
} catch (Error e) {
warning ("Unable to refresh cache after external change: %s", e.message);
}

reload_installed_packages ();
yield get_updates (null);
} while (update_check_pending);

update_check_running = false;
}

static construct {
Expand Down Expand Up @@ -2067,6 +2081,8 @@ public class AppCenterCore.FlatpakBackend : Object, Backend {
}

fill_runtime_updates ();

malloc_trim (0);
}

private void repair_internal (Job job) {
Expand Down