moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Use name hashes in depends to avoid strcmp calls 

Just like we did for package name comparsions, if we add a depend name_hash
field on depend struct initialization, we can use it instead of doing a
string name comparison, saving us a lot of checks in the depcmp code.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2010-12-21 15:40:04 -06:00
parent 34a78d935a
commit 735a197fc2
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libalpm/deps.c
View File

@ -322,15 +322,20 @@ static int dep_vercmp(const char *version1, pmdepmod_t mod,
int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep) int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
{ {
alpm_list_t *i; alpm_list_t *i;
const char *pkgname = alpm_pkg_get_name(pkg); const char *pkgname = pkg->name;
const char *pkgversion = alpm_pkg_get_version(pkg); const char *pkgversion = pkg->version;
int satisfy = 0; int satisfy = 0;
/* check (pkg->name, pkg->version) */ /* check (pkg->name, pkg->version) */
satisfy = (strcmp(pkgname, dep->name) == 0 if(pkg->name_hash && dep->name_hash
&& dep_vercmp(pkgversion, dep->mod, dep->version)); && pkg->name_hash != dep->name_hash) {
if(satisfy) { /* skip more expensive checks */
return(satisfy); } else {
satisfy = (strcmp(pkgname, dep->name) == 0
&& dep_vercmp(pkgversion, dep->mod, dep->version));
if(satisfy) {
return(satisfy);
}
} }
/* check provisions, format : "name=version" */ /* check provisions, format : "name=version" */
@ -380,7 +385,8 @@ pmdepend_t *_alpm_splitdep(const char *depstring)
depend->mod = PM_DEP_MOD_LE; depend->mod = PM_DEP_MOD_LE;
*ptr = '\0'; *ptr = '\0';
ptr += 2; ptr += 2;
} else if((ptr = strstr(newstr, "="))) { /* Note: we must do =,<,> checks after <=, >= checks */ } else if((ptr = strstr(newstr, "="))) {
/* Note: we must do =,<,> checks after <=, >= checks */
depend->mod = PM_DEP_MOD_EQ; depend->mod = PM_DEP_MOD_EQ;
*ptr = '\0'; *ptr = '\0';
ptr += 1; ptr += 1;
@ -396,6 +402,7 @@ pmdepend_t *_alpm_splitdep(const char *depstring)
/* no version specified - copy the name and return it */ /* no version specified - copy the name and return it */
depend->mod = PM_DEP_MOD_ANY; depend->mod = PM_DEP_MOD_ANY;
STRDUP(depend->name, newstr, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(depend->name, newstr, RET_ERR(PM_ERR_MEMORY, NULL));
depend->name_hash = _alpm_hash_sdbm(depend->name);
depend->version = NULL; depend->version = NULL;
free(newstr); free(newstr);
return(depend); return(depend);
@ -404,6 +411,7 @@ pmdepend_t *_alpm_splitdep(const char *depstring)
/* if we get here, we have a version comparator, copy the right parts /* if we get here, we have a version comparator, copy the right parts
* to the right places */ * to the right places */
STRDUP(depend->name, newstr, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(depend->name, newstr, RET_ERR(PM_ERR_MEMORY, NULL));
depend->name_hash = _alpm_hash_sdbm(depend->name);
STRDUP(depend->version, ptr, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(depend->version, ptr, RET_ERR(PM_ERR_MEMORY, NULL));
free(newstr); free(newstr);
@ -416,6 +424,7 @@ pmdepend_t *_alpm_dep_dup(const pmdepend_t *dep)
CALLOC(newdep, 1, sizeof(pmdepend_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(newdep, 1, sizeof(pmdepend_t), RET_ERR(PM_ERR_MEMORY, NULL));
STRDUP(newdep->name, dep->name, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(newdep->name, dep->name, RET_ERR(PM_ERR_MEMORY, NULL));
newdep->name_hash = dep->name_hash;
STRDUP(newdep->version, dep->version, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(newdep->version, dep->version, RET_ERR(PM_ERR_MEMORY, NULL));
newdep->mod = dep->mod; newdep->mod = dep->mod;

3
lib/libalpm/deps.h
View File

@ -29,9 +29,10 @@
/* Dependency */ /* Dependency */
struct __pmdepend_t { struct __pmdepend_t {
pmdepmod_t mod;
char *name; char *name;
char *version; char *version;
long name_hash;
pmdepmod_t mod;
}; };
/* Missing dependency */ /* Missing dependency */