emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Acquire/release a POSIX file lock on repository archives.

Browse Source 
- xbps_repo_open() accepts a third argument (bool) to acquire a POSIX file
lock on the repository archive.
- xbps_repo_close() accepts a second argument (bool) to release a POSIX file
lock on the repository archive.

This avoids the issue of multiple xbps-rindex(8) processes being blocked
even for different repositories on the same architecture, resulting in
unnecessary contention.
This commit is contained in:
Juan RP
2014-09-05 12:26:42 +02:00
parent 551555690d
commit 013731c502
13 changed files with 70 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/xbps-rindex/index-clean.c
View File

@@ -122,29 +122,24 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
xbps_dictionary_t idx = NULL, idxmeta = NULL, idxfiles = NULL;
struct xbps_repo *repo;
struct cbdata cbd;
struct idxlock *il;
char *keyname, *pkgname;
int rv = 0;
bool flush = false;
if ((il = index_lock(xhp)) == NULL)
return EINVAL;
repo = xbps_repo_open(xhp, repodir);
repo = xbps_repo_open(xhp, repodir, true);
if (repo == NULL) {
if (errno == ENOENT)
goto out;
rv = errno;
if (rv == ENOENT)
return 0;
fprintf(stderr, "%s: cannot read repository data: %s\n",
_XBPS_RINDEX, strerror(errno));
rv = errno;
goto out;
return rv;
}
xbps_repo_open_idxfiles(repo);
idx = xbps_dictionary_copy(repo->idx);
idxmeta = xbps_dictionary_copy(repo->idxmeta);
idxfiles = xbps_dictionary_copy(repo->idxfiles);
xbps_repo_close(repo);
if (idx == NULL || idxfiles == NULL) {
fprintf(stderr, "%s: incomplete repository data file!\n", _XBPS_RINDEX);
rv = EINVAL;
@@ -207,8 +202,7 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
xbps_dictionary_count(idxfiles));
out:
index_unlock(il);
xbps_repo_close(repo, true);
if (idx)
xbps_object_release(idx);
if (idxmeta)