Skip to content

xbps-remove --clean-cache #661

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
Duncaen wants to merge 3 commits into
base: master
Choose a base branch
from
+35 −10
Open

xbps-remove --clean-cache #661

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e88ad64
bin/xbps-remove: fix memory leak in --clean-cache
Duncaen Dec 7, 2025
8cb883d
bin/xbps-remove: improve error handling and error messages
Duncaen Dec 7, 2025
f9cf682
bin/xbps-remove: work around multi threading issue in --clean-cache
Duncaen Dec 7, 2025
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
45 changes: 35 additions & 10 deletions bin/xbps-remove/clean-cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,39 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
DIR *dirp;
struct dirent *dp;
char *ext;
int rv = 0;
int r;

// XXX: there is no public api to load the pkgdb so force it before
// its done potentially concurrently by threads through the
// xbps_array_foreach_cb_multi call later.
(void)xbps_pkgdb_get_pkg(xhp, "foo");
// XXX: same for the repository pool...
if (uninstalled) {
(void)xbps_pkgdb_get_pkg(xhp, "foo");
} else {
(void)xbps_rpool_get_pkg(xhp, "package-that-wont-exist-so-it-loads-all-repos");
}
Comment on lines +151 to +156
Copy link

@domsim1 domsim1 Feb 13, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to make xbps_pkgdb_init and xbps_rpool_init thread-safe with pthread_mutex_t? This would eliminate the need for workarounds and make lazy initialization work safely whether called from single-threaded or multithreaded code. The performance overhead should be negligible since the mutex is only contended during the initial load.

This would also help prevent similar issues.

Happy to take a stab at implementing this if you think it's worthwhile.

Copy link
Member Author

@Duncaen Duncaen Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My plan was to remove the lazy initialization instead.

Copy link

@domsim1 domsim1 Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about that too, although it will be a breaking API change. How is something like that normally coordinated?


if (chdir(xhp->cachedir) == -1)
return -1;
if (chdir(xhp->cachedir) == -1) {
if (errno == ENOENT)
return 0;
r = -errno;
xbps_error_printf("failed to change to cache directory: %s: %s\n",
xhp->cachedir, strerror(-r));
return r;
}

if ((dirp = opendir(xhp->cachedir)) == NULL)
return 0;
dirp = opendir(".");
if (!dirp) {
r = -errno;
xbps_error_printf("failed to open cache directory: %s: %s\n",
xhp->cachedir, strerror(-r));
return r;
}

array = xbps_array_create();
if (!array)
return xbps_error_oom();

while ((dp = readdir(dirp)) != NULL) {
if ((strcmp(dp->d_name, ".") == 0) ||
(strcmp(dp->d_name, "..") == 0))
Expand All @@ -169,7 +188,10 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
xbps_dbg_printf("ignoring unknown file: %s\n", dp->d_name);
continue;
}
xbps_array_add_cstring(array, dp->d_name);
if (!xbps_array_add_cstring(array, dp->d_name)) {
xbps_object_release(array);
return xbps_error_oom();
}
}
(void)closedir(dirp);

Expand All @@ -178,8 +200,11 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
.dry = drun,
.uninstalled = uninstalled,
};
rv = xbps_array_foreach_cb_multi(xhp, array, NULL, cleaner_cb, (void*)&data);
xbps_object_release(array);
r = xbps_array_foreach_cb_multi(xhp, array, NULL, cleaner_cb, (void*)&data);
} else {
r = 0;
}
return rv;

xbps_object_release(array);
return r;
}
Loading