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

xbps_unpack_binary_pkg: use posix_fadvise(2).

Browse Source
This commit is contained in:
Juan RP
2012-12-15 09:51:44 +01:00
parent e1fc085915
commit 5dab658d09
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/package_unpack.c
View File

@ -583,7 +583,7 @@ xbps_unpack_binary_pkg(struct xbps_handle *xhp, prop_dictionary_t pkg_repod)
struct archive *ar = NULL; struct archive *ar = NULL;
const char *pkgname, *version, *pkgver; const char *pkgname, *version, *pkgver;
char *bpkg; char *bpkg;
int rv = 0; int pkg_fd, rv = 0;
assert(prop_object_type(pkg_repod) == PROP_TYPE_DICTIONARY); assert(prop_object_type(pkg_repod) == PROP_TYPE_DICTIONARY);
@ -614,7 +614,8 @@ xbps_unpack_binary_pkg(struct xbps_handle *xhp, prop_dictionary_t pkg_repod)
archive_read_support_compression_xz(ar); archive_read_support_compression_xz(ar);
archive_read_support_format_tar(ar); archive_read_support_format_tar(ar);
if (archive_read_open_filename(ar, bpkg, ARCHIVE_READ_BLOCKSIZE) != 0) { pkg_fd = open(bpkg, O_RDONLY|O_CLOEXEC);
if (pkg_fd == -1) {
rv = archive_errno(ar); rv = archive_errno(ar);
xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL, xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL,
rv, pkgname, version, rv, pkgname, version,
@ -624,7 +625,10 @@ xbps_unpack_binary_pkg(struct xbps_handle *xhp, prop_dictionary_t pkg_repod)
archive_read_free(ar); archive_read_free(ar);
return rv; return rv;
} }
archive_read_open_fd(ar, pkg_fd, ARCHIVE_READ_BLOCKSIZE);
free(bpkg); free(bpkg);
posix_fadvise(pkg_fd, 0, 0, POSIX_FADV_SEQUENTIAL);
/* /*
* Extract archive files. * Extract archive files.
*/ */
@ -635,6 +639,8 @@ xbps_unpack_binary_pkg(struct xbps_handle *xhp, prop_dictionary_t pkg_repod)
pkgver, strerror(rv)); pkgver, strerror(rv));
goto out; goto out;
} }
posix_fadvise(pkg_fd, 0, 0, POSIX_FADV_DONTNEED);
/* /*
* Set package state to unpacked. * Set package state to unpacked.
*/ */
@ -646,9 +652,9 @@ xbps_unpack_binary_pkg(struct xbps_handle *xhp, prop_dictionary_t pkg_repod)
pkgver, strerror(rv)); pkgver, strerror(rv));
} }
out: out:
if (ar) { close(pkg_fd);
archive_read_close(ar); if (ar)
archive_read_free(ar); archive_read_free(ar);
}
return rv; return rv;
} }