bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a likely_pkg hint argument to sync_db_read

Browse source 
In most (all?) cases, we will process all files for a given sync database
entry sequentially. The code currently does an _alpm_pkg_find() for every
file in the database, but we had the "current" package readily available.
Shift some local variables around a bit to expose this to sync_db_read() and
use it if the package is the correct one.

On my system, this cuts calls to _alpm_pkg_find() from 20,769 to 10,349
calls during a -Qu operation, and results in a ~30% speedup of the same
operation (0.35 sec -> 0.27 sec). This benefit should be apparent anywhere
we read in the full contents of the sync databases.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-01-21 10:11:59 -06:00
parent c86ff120c8
commit 3863e48788
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/libalpm/be_sync.c
View file

@ -142,13 +142,15 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
} }
/* Forward decl so I don't reorganize the whole file right now */ /* Forward decl so I don't reorganize the whole file right now */
static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry); static int sync_db_read(pmdb_t *db, struct archive *archive,
struct archive_entry *entry, pmpkg_t *likely_pkg);
static int sync_db_populate(pmdb_t *db) static int sync_db_populate(pmdb_t *db)
{ {
int count = 0; int count = 0;
struct archive *archive; struct archive *archive;
struct archive_entry *entry; struct archive_entry *entry;
pmpkg_t *pkg = NULL;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
@ -169,12 +171,12 @@ static int sync_db_populate(pmdb_t *db)
while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
const struct stat *st; const struct stat *st;
const char *name;
pmpkg_t *pkg;
st = archive_entry_stat(entry); st = archive_entry_stat(entry);
if(S_ISDIR(st->st_mode)) { if(S_ISDIR(st->st_mode)) {
const char *name;
pkg = _alpm_pkg_new(); pkg = _alpm_pkg_new();
if(pkg == NULL) { if(pkg == NULL) {
archive_read_finish(archive); archive_read_finish(archive);
@ -208,7 +210,7 @@ static int sync_db_populate(pmdb_t *db)
count++; count++;
} else { } else {
/* we have desc, depends or deltas - parse it */ /* we have desc, depends or deltas - parse it */
sync_db_read(db, archive, entry); sync_db_read(db, archive, entry, pkg);
} }
} }
@ -236,10 +238,11 @@ static int sync_db_populate(pmdb_t *db)
f = alpm_list_add(f, linedup); \ f = alpm_list_add(f, linedup); \
} while(1) /* note the while(1) and not (0) */ } while(1) /* note the while(1) and not (0) */
static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry) static int sync_db_read(pmdb_t *db, struct archive *archive,
struct archive_entry *entry, pmpkg_t *likely_pkg)
{ {
const char *entryname = NULL; const char *entryname = NULL, *filename;
char *filename, *pkgname, *p, *q; char *pkgname, *p, *q;
pmpkg_t *pkg; pmpkg_t *pkg;
struct archive_read_buffer buf; struct archive_read_buffer buf;
@ -268,13 +271,17 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr
STRDUP(pkgname, entryname, RET_ERR(PM_ERR_MEMORY, -1)); STRDUP(pkgname, entryname, RET_ERR(PM_ERR_MEMORY, -1));
p = pkgname + strlen(pkgname); p = pkgname + strlen(pkgname);
for(q = --p; *q && *q != '/'; q--); for(q = --p; *q && *q != '/'; q--);
STRDUP(filename, q+1, RET_ERR(PM_ERR_MEMORY, -1)); filename = q + 1;
for(p = --q; *p && *p != '-'; p--); for(p = --q; *p && *p != '-'; p--);
for(q = --p; *q && *q != '-'; q--); for(q = --p; *q && *q != '-'; q--);
*q = '\0'; *q = '\0';
/* package is already in db due to parsing of directory name */ /* package is already in db due to parsing of directory name */
if(likely_pkg && strcmp(likely_pkg->name, pkgname) == 0) {
pkg = likely_pkg;
} else {
pkg = _alpm_pkg_find(db->pkgcache, pkgname); pkg = _alpm_pkg_find(db->pkgcache, pkgname);
}
if(pkg == NULL) { if(pkg == NULL) {
_alpm_log(PM_LOG_DEBUG, "package %s not found in %s sync database", _alpm_log(PM_LOG_DEBUG, "package %s not found in %s sync database",
pkgname, db->treename); pkgname, db->treename);
@ -366,7 +373,6 @@ static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entr
error: error:
FREE(pkgname); FREE(pkgname);
FREE(filename);
/* TODO: return 0 always? */ /* TODO: return 0 always? */
return(0); return(0);
} }