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

transaction_files.c: port to uthash

Browse Source
This commit is contained in:
Duncan Overbruck 2020-02-22 15:15:11 +01:00 committed by Juan RP
parent 657a717855
commit 64f96ec940
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/transaction_files.c
View File

@ -31,6 +31,7 @@
#include <string.h> #include <string.h>
#include "xbps_api_impl.h" #include "xbps_api_impl.h"
#include "uthash.h"
enum type { enum type {
TYPE_LINK = 1, TYPE_LINK = 1,
@ -40,8 +41,7 @@ enum type {
}; };
struct item { struct item {
struct item *hnext; char *file;
const char *file;
size_t len; size_t len;
struct { struct {
const char *pkgname; const char *pkgname;
@ -56,51 +56,32 @@ struct item {
bool removepkg; bool removepkg;
} old, new; } old, new;
bool deleted; bool deleted;
UT_hash_handle hh;
}; };
#define ITHSIZE 1024 /* hash table to look up files by path */
#define ITHMASK (ITHSIZE - 1) static struct item *hashtab = NULL;
static struct item *ItemHash[ITHSIZE]; /* list of files to be sorted using qsort */
static struct item **items = NULL;
static struct item **items;
static size_t itemsidx = 0; static size_t itemsidx = 0;
static size_t itemssz = 0; static size_t itemssz = 0;
static int
itemhash(const char *file)
{
int hv = 0xA1B5F342;
int i;
assert(file);
/* XXX: runtime error: left shift of negative value -1581911230 */
for (i = 0; file[i]; ++i)
hv = (hv << 5) ^ (hv >> 23) ^ file[i];
return hv & ITHMASK;
}
static struct item * static struct item *
lookupItem(const char *file) lookupItem(const char *file)
{ {
struct item *item; struct item *item = NULL;
assert(file); assert(file);
for (item = ItemHash[itemhash(file+1)]; item; item = item->hnext) { HASH_FIND_STR(hashtab, file, item);
if (strcmp(file, item->file+1) == 0)
return item; return item;
}
return NULL;
} }
static struct item * static struct item *
addItem(const char *file) addItem(const char *file)
{ {
struct item **itemp; struct item *item = calloc(1, sizeof (struct item));
struct item *item = calloc(sizeof(*item), 1);
if (item == NULL) if (item == NULL)
return NULL; return NULL;
@ -117,15 +98,17 @@ addItem(const char *file)
} }
items[itemsidx++] = item; items[itemsidx++] = item;
itemp = &ItemHash[itemhash(file+1)];
item->hnext = *itemp;
if ((item->file = xbps_xasprintf(".%s", file)) == NULL) { if ((item->file = xbps_xasprintf(".%s", file)) == NULL) {
free(item); free(item);
return NULL; return NULL;
} }
item->len = strlen(file); item->len = strlen(item->file);
assert(item->file);
*itemp = item; /*
* File paths are stored relative, but looked up absolute.
* Skip the leading . (dot) and substract it from the length.
*/
HASH_ADD_KEYPTR(hh, hashtab, item->file+1, item->len-1, item);
return item; return item;
} }