razor.c
author Dan Winship <danw@gnome.org>
Wed Feb 06 12:37:49 2008 -0500 (2008-02-06)
changeset 112 812340a13ec2
parent 108 340d92912f49
child 113 e408ff1d4a4d
permissions -rw-r--r--
fix dependencies
     1 #define _GNU_SOURCE
     2 
     3 #include <stdlib.h>
     4 #include <stddef.h>
     5 #include <stdint.h>
     6 #include <stdio.h>
     7 #include <string.h>
     8 #include <sys/types.h>
     9 #include <sys/stat.h>
    10 #include <sys/mman.h>
    11 #include <unistd.h>
    12 #include <fcntl.h>
    13 #include <errno.h>
    14 #include <ctype.h>
    15 #include <fnmatch.h>
    16 
    17 #include "razor.h"
    18 #include "razor-internal.h"
    19 
    20 struct array {
    21 	void *data;
    22 	int size, alloc;
    23 };
    24 
    25 struct razor_set_section {
    26 	uint32_t type;
    27 	uint32_t offset;
    28 	uint32_t size;
    29 };
    30 
    31 struct razor_set_header {
    32 	uint32_t magic;
    33 	uint32_t version;
    34 	struct razor_set_section sections[0];
    35 };
    36 
    37 #define RAZOR_MAGIC 0x7a7a7a7a
    38 #define RAZOR_VERSION 1
    39 
    40 #define RAZOR_ENTRY_LAST	0x80000000ul
    41 #define RAZOR_IMMEDIATE		0x80000000ul
    42 #define RAZOR_ENTRY_MASK	0x00fffffful
    43 
    44 #define RAZOR_STRING_POOL	0
    45 #define RAZOR_PACKAGES		1
    46 #define RAZOR_PROPERTIES	2
    47 #define RAZOR_FILES		3
    48 #define RAZOR_PACKAGE_POOL	4
    49 #define RAZOR_PROPERTY_POOL	5
    50 #define RAZOR_FILE_POOL		6
    51 
    52 struct razor_package {
    53 	uint32_t name;
    54 	uint32_t version;
    55 	uint32_t properties;
    56 	uint32_t files;
    57 };
    58 
    59 struct razor_property {
    60 	uint32_t name;
    61 	uint32_t relation;
    62 	uint32_t version;
    63 	uint32_t packages;
    64 };
    65 
    66 struct razor_entry {
    67 	uint32_t name;
    68 	uint32_t start;
    69 	uint32_t packages;
    70 };
    71 
    72 struct razor_set {
    73 	struct array string_pool;
    74  	struct array packages;
    75  	struct array properties;
    76  	struct array files;
    77 	struct array package_pool;
    78  	struct array property_pool;
    79  	struct array file_pool;
    80 	struct razor_set_header *header;
    81 };
    82 
    83 struct import_entry {
    84 	uint32_t package;
    85 	char *name;
    86 };
    87 
    88 struct import_directory {
    89 	uint32_t name, count;
    90 	struct array files;
    91 	struct array packages;
    92 	struct import_directory *last;
    93 };
    94 
    95 struct hashtable {
    96 	struct array buckets;
    97 	struct array *pool;
    98 };
    99 
   100 struct razor_importer {
   101 	struct razor_set *set;
   102 	struct hashtable table;
   103 	struct razor_package *package;
   104 	struct array properties;
   105 	struct array files;
   106 };
   107 
   108 static void
   109 array_init(struct array *array)
   110 {
   111 	memset(array, 0, sizeof *array);
   112 }
   113 
   114 static void
   115 array_release(struct array *array)
   116 {
   117 	free(array->data);
   118 }
   119 
   120 static void *
   121 array_add(struct array *array, int size)
   122 {
   123 	int alloc;
   124 	void *data, *p;
   125 
   126 	if (array->alloc > 0)
   127 		alloc = array->alloc;
   128 	else
   129 		alloc = 16;
   130 
   131 	while (alloc < array->size + size)
   132 		alloc *= 2;
   133 
   134 	if (array->alloc < alloc) {
   135 		data = realloc(array->data, alloc);
   136 		if (data == NULL)
   137 			return 0;
   138 		array->data = data;
   139 		array->alloc = alloc;
   140 	}
   141 
   142 	p = array->data + array->size;
   143 	array->size += size;
   144 
   145 	return p;
   146 }
   147 
   148 static void *
   149 zalloc(size_t size)
   150 {
   151 	void *p;
   152 
   153 	p = malloc(size);
   154 	memset(p, 0, size);
   155 
   156 	return p;
   157 }
   158 
   159 struct razor_set_section razor_sections[] = {
   160 	{ RAZOR_STRING_POOL,	offsetof(struct razor_set, string_pool) },
   161 	{ RAZOR_PACKAGES,	offsetof(struct razor_set, packages) },
   162 	{ RAZOR_PROPERTIES,	offsetof(struct razor_set, properties) },
   163 	{ RAZOR_FILES,		offsetof(struct razor_set, files) },
   164 	{ RAZOR_PACKAGE_POOL,	offsetof(struct razor_set, package_pool) },
   165 	{ RAZOR_PROPERTY_POOL,	offsetof(struct razor_set, property_pool) },
   166 	{ RAZOR_FILE_POOL,	offsetof(struct razor_set, file_pool) },
   167 };
   168 
   169 struct razor_set *
   170 razor_set_create(void)
   171 {
   172 	return zalloc(sizeof(struct razor_set));
   173 }
   174 
   175 struct razor_set *
   176 razor_set_open(const char *filename)
   177 {
   178 	struct razor_set *set;
   179 	struct razor_set_section *s;
   180 	struct stat stat;
   181 	struct array *array;
   182 	int fd;
   183 
   184 	set = zalloc(sizeof *set);
   185 	fd = open(filename, O_RDONLY);
   186 	if (fstat(fd, &stat) < 0)
   187 		return NULL;
   188 	set->header = mmap(NULL, stat.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
   189 	if (set->header == MAP_FAILED) {
   190 		free(set);
   191 		return NULL;
   192 	}
   193 
   194 	for (s = set->header->sections; ~s->type; s++) {
   195 		if (s->type >= ARRAY_SIZE(razor_sections))
   196 			continue;
   197 		if (s->type != razor_sections[s->type].type)
   198 			continue;
   199 		array = (void *) set + razor_sections[s->type].offset;
   200 		array->data = (void *) set->header + s->offset;
   201 		array->size = s->size;
   202 		array->alloc = s->size;
   203 	}
   204 	close(fd);
   205 
   206 	return set;
   207 }
   208 
   209 void
   210 razor_set_destroy(struct razor_set *set)
   211 {
   212 	unsigned int size;
   213 	struct array *a;
   214 	int i;
   215 
   216 	if (set->header) {
   217 		for (i = 0; set->header->sections[i].type; i++)
   218 			;
   219 		size = set->header->sections[i].type;
   220 		munmap(set->header, size);
   221 	} else {
   222 		for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   223 			a = (void *) set + razor_sections[i].offset;
   224 			free(a->data);
   225 		}
   226 	}
   227 
   228 	free(set);
   229 }
   230 
   231 int
   232 razor_set_write(struct razor_set *set, const char *filename)
   233 {
   234 	char data[4096];
   235 	struct razor_set_header *header = (struct razor_set_header *) data;
   236 	struct array *a;
   237 	uint32_t offset;
   238 	int i, fd;
   239 
   240 	memset(data, 0, sizeof data);
   241 	header->magic = RAZOR_MAGIC;
   242 	header->version = RAZOR_VERSION;
   243 	offset = sizeof data;
   244 
   245 	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   246 		if (razor_sections[i].type != i)
   247 			continue;
   248 		a = (void *) set + razor_sections[i].offset;
   249 		header->sections[i].type = i;
   250 		header->sections[i].offset = offset;
   251 		header->sections[i].size = a->size;
   252 		offset += ALIGN(a->size, 4096);
   253 	}
   254 
   255 	header->sections[i].type = ~0;
   256 	header->sections[i].offset = 0;
   257 	header->sections[i].size = 0;
   258 
   259 	fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
   260 	if (fd < 0)
   261 		return -1;
   262 
   263 	razor_write(fd, data, sizeof data);
   264 	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   265 		if (razor_sections[i].type != i)
   266 			continue;
   267 		a = (void *) set + razor_sections[i].offset;
   268 		razor_write(fd, a->data, ALIGN(a->size, 4096));
   269 	}
   270 
   271 	close(fd);
   272 
   273 	return 0;
   274 }
   275 
   276 static unsigned int
   277 hash_string(const char *key)
   278 {
   279 	const char *p;
   280 	unsigned int hash = 0;
   281 
   282 	for (p = key; *p; p++)
   283 		hash = (hash * 617) ^ *p;
   284 
   285 	return hash;
   286 }
   287 
   288 static uint32_t
   289 hashtable_lookup(struct hashtable *table, const char *key)
   290 {
   291 	unsigned int mask, start, i;
   292 	uint32_t *b;
   293 	char *pool;
   294 
   295 	pool = table->pool->data;
   296 	mask = table->buckets.alloc - 1;
   297 	start = hash_string(key) * sizeof(uint32_t);
   298 
   299 	for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
   300 		b = table->buckets.data + ((start + i) & mask);
   301 
   302 		if (*b == 0)
   303 			return 0;
   304 
   305 		if (strcmp(key, &pool[*b]) == 0)
   306 			return *b;
   307 	}
   308 
   309 	return 0;
   310 }
   311 
   312 static uint32_t
   313 add_to_string_pool(struct hashtable *table, const char *key)
   314 {
   315 	int len;
   316 	char *p;
   317 
   318 	len = strlen(key) + 1;
   319 	p = array_add(table->pool, len);
   320 	memcpy(p, key, len);
   321 
   322 	return p - (char *) table->pool->data;
   323 }
   324 
   325 static uint32_t
   326 add_to_property_pool(struct array *pool, struct array *properties)
   327 {
   328 	uint32_t *p;
   329 
   330 	if (properties->size == 0)
   331 		return ~0;
   332 	else if (properties->size == sizeof *p)
   333 		return *(uint32_t *) properties->data | RAZOR_IMMEDIATE;
   334 
   335 	p = array_add(pool, properties->size);
   336 	memcpy(p, properties->data, properties->size);
   337 	p[properties->size / sizeof *p - 1] |= RAZOR_IMMEDIATE;
   338 
   339 	return p - (uint32_t *) pool->data;
   340 }
   341 
   342 static void
   343 do_insert(struct hashtable *table, uint32_t value)
   344 {
   345 	unsigned int mask, start, i;
   346 	uint32_t *b;
   347 	const char *key;
   348 
   349 	key = (char *) table->pool->data + value;
   350 	mask = table->buckets.alloc - 1;
   351 	start = hash_string(key) * sizeof(uint32_t);
   352 
   353 	for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
   354 		b = table->buckets.data + ((start + i) & mask);
   355 		if (*b == 0) {
   356 			*b = value;
   357 			break;
   358 		}
   359 	}
   360 }
   361 
   362 static uint32_t
   363 hashtable_insert(struct hashtable *table, const char *key)
   364 {
   365 	uint32_t value, *buckets, *b, *end;
   366 	int alloc;
   367 
   368 	alloc = table->buckets.alloc;
   369 	array_add(&table->buckets, 4 * sizeof *buckets);
   370 	if (alloc != table->buckets.alloc) {
   371 		end = table->buckets.data + alloc;
   372 		memset(end, 0, table->buckets.alloc - alloc);
   373 		for (b = table->buckets.data; b < end; b++) {
   374 			value = *b;
   375 			if (value != 0) {
   376 				*b = 0;
   377 				do_insert(table, value);
   378 			}
   379 		}
   380 	}
   381 
   382 	value = add_to_string_pool(table, key);
   383 	do_insert (table, value);
   384 
   385 	return value;
   386 }
   387 
   388 static void
   389 hashtable_init(struct hashtable *table, struct array *pool)
   390 {
   391 	array_init(&table->buckets);
   392 	table->pool = pool;
   393 }
   394 
   395 static void
   396 hashtable_release(struct hashtable *table)
   397 {
   398 	array_release(&table->buckets);
   399 }
   400 
   401 static uint32_t
   402 hashtable_tokenize(struct hashtable *table, const char *string)
   403 {
   404 	uint32_t token;
   405 
   406 	if (string == NULL)
   407 		string = "";
   408 
   409 	token = hashtable_lookup(table, string);
   410 	if (token != 0)
   411 		return token;
   412 
   413 	return hashtable_insert(table, string);
   414 }
   415 
   416 void
   417 razor_importer_begin_package(struct razor_importer *importer,
   418 			     const char *name, const char *version)
   419 {
   420 	struct razor_package *p;
   421 
   422 	p = array_add(&importer->set->packages, sizeof *p);
   423 	p->name = hashtable_tokenize(&importer->table, name);
   424 	p->version = hashtable_tokenize(&importer->table, version);
   425 
   426 	importer->package = p;
   427 	array_init(&importer->properties);
   428 }
   429 
   430 void
   431 razor_importer_finish_package(struct razor_importer *importer)
   432 {
   433 	struct razor_package *p;
   434 
   435 	p = importer->package;
   436 	p->properties = add_to_property_pool(&importer->set->property_pool,
   437 					     &importer->properties);
   438 
   439 	array_release(&importer->properties);
   440 }
   441 
   442 void
   443 razor_importer_add_property(struct razor_importer *importer,
   444 			    const char *name,
   445 			    enum razor_version_relation relation,
   446 			    const char *version,
   447 			    enum razor_property_type type)
   448 {
   449 	struct razor_property *p;
   450 	uint32_t *r;
   451 
   452 	p = array_add(&importer->set->properties, sizeof *p);
   453 	p->name = hashtable_tokenize(&importer->table, name) | (type << 30);
   454 	p->relation = relation;
   455 	p->version = hashtable_tokenize(&importer->table, version);
   456 	p->packages = importer->package -
   457 		(struct razor_package *) importer->set->packages.data;
   458 
   459 	r = array_add(&importer->properties, sizeof *r);
   460 	*r = p - (struct razor_property *) importer->set->properties.data;
   461 }
   462 
   463 void
   464 razor_importer_add_file(struct razor_importer *importer, const char *name)
   465 {
   466 	struct import_entry *e;
   467 
   468 	e = array_add(&importer->files, sizeof *e);
   469 
   470 	e->package = importer->package -
   471 		(struct razor_package *) importer->set->packages.data;
   472 	e->name = strdup(name);
   473 }
   474 
   475 struct razor_importer *
   476 razor_importer_new(void)
   477 {
   478 	struct razor_importer *importer;
   479 
   480 	importer = zalloc(sizeof *importer);
   481 	importer->set = razor_set_create();
   482 	hashtable_init(&importer->table, &importer->set->string_pool);
   483 
   484 	return importer;
   485 }
   486 
   487 /* Destroy an importer without creating the set. */
   488 void
   489 razor_importer_destroy(struct razor_importer *importer)
   490 {
   491 	/* FIXME: write this */
   492 }
   493 
   494 
   495 typedef int (*compare_with_data_func_t)(const void *p1,
   496 					const void *p,
   497 					void *data);
   498 
   499 struct qsort_context {
   500 	size_t size;
   501 	compare_with_data_func_t compare;
   502 	void *data;
   503 };
   504 
   505 static void
   506 qsort_swap(void *p1, void *p2, size_t size)
   507 {
   508 	char buffer[size];
   509 
   510 	memcpy(buffer, p1, size);
   511 	memcpy(p1, p2, size);
   512 	memcpy(p2, buffer, size);
   513 }
   514 
   515 static void
   516 __qsort_with_data(void *base, size_t nelem, uint32_t *map,
   517 		  struct qsort_context *ctx)
   518 {
   519 	void *p, *start, *end, *pivot;
   520 	uint32_t *mp, *mstart, *mend, tmp;
   521 	int left, right, result;
   522 	size_t size = ctx->size;
   523 
   524 	p = base;
   525 	start = base;
   526 	end = base + nelem * size;
   527 	mp = map;
   528 	mstart = map;
   529 	mend = map + nelem;
   530 	pivot = base + (random() % nelem) * size;
   531 
   532 	while (p < end) {
   533 		result = ctx->compare(p, pivot, ctx->data);
   534 		if (result < 0) {
   535 			qsort_swap(p, start, size);
   536 			tmp = *mp;
   537 			*mp = *mstart;
   538 			*mstart = tmp;
   539 			if (start == pivot)
   540 				pivot = p;
   541 			start += size;
   542 			mstart++;
   543 			p += size;
   544 			mp++;
   545 		} else if (result == 0) {
   546 			p += size;
   547 			mp++;
   548 		} else {
   549  			end -= size;
   550 			mend--;
   551 			qsort_swap(p, end, size);
   552 			tmp = *mp;
   553 			*mp = *mend;
   554 			*mend = tmp;
   555 			if (end == pivot)
   556 				pivot = p;
   557 		}
   558 	}
   559 
   560 	left = (start - base) / size;
   561 	right = (base + nelem * size - end) / size;
   562 	if (left > 1)
   563 		__qsort_with_data(base, left, map, ctx);
   564 	if (right > 1)
   565 		__qsort_with_data(end, right, mend, ctx);
   566 }
   567 
   568 uint32_t *
   569 qsort_with_data(void *base, size_t nelem, size_t size,
   570 		compare_with_data_func_t compare, void *data)
   571 {
   572 	struct qsort_context ctx;
   573 	uint32_t *map;
   574 	int i;
   575 
   576 	if (nelem == 0)
   577 		return NULL;
   578 
   579 	ctx.size = size;
   580 	ctx.compare = compare;
   581 	ctx.data = data;
   582 
   583 	map = malloc(nelem * sizeof (uint32_t));
   584 	for (i = 0; i < nelem; i++)
   585 		map[i] = i;
   586 
   587 	__qsort_with_data(base, nelem, map, &ctx);
   588 
   589 	return map;
   590 }
   591 
   592 static int
   593 versioncmp(const char *s1, const char *s2)
   594 {
   595 	const char *p1, *p2;
   596 	long n1, n2;
   597 	int res;
   598 
   599 	n1 = strtol(s1, (char **) &p1, 0);
   600 	n2 = strtol(s2, (char **) &p2, 0);
   601 
   602 	/* Epoch; if one but not the other has an epoch set, default
   603 	 * the epoch-less version to 0. */
   604 	res = (*p1 == ':') - (*p2 == ':');
   605 	if (res < 0) {
   606 		n1 = 0;
   607 		p1 = s1;
   608 		p2++;
   609 	} else if (res > 0) {
   610 		p1++;
   611 		n2 = 0;
   612 		p2 = s2;
   613 	}
   614 
   615 	if (n1 != n2)
   616 		return n1 - n2;
   617 	while (*p1 && *p2) {
   618 		if (*p1 != *p2)
   619 			return *p1 - *p2;
   620 		p1++;
   621 		p2++;
   622 		if (isdigit(*p1) && isdigit(*p2))
   623 			return versioncmp(p1, p2);
   624 	}
   625 
   626 	return *p1 - *p2;
   627 }
   628 
   629 static int
   630 compare_packages(const void *p1, const void *p2, void *data)
   631 {
   632 	const struct razor_package *pkg1 = p1, *pkg2 = p2;
   633 	struct razor_set *set = data;
   634 	char *pool = set->string_pool.data;
   635 
   636 	if (pkg1->name == pkg2->name)
   637 		return versioncmp(&pool[pkg1->version], &pool[pkg2->version]);
   638 	else
   639 		return strcmp(&pool[pkg1->name], &pool[pkg2->name]);
   640 }
   641 
   642 static int
   643 compare_properties(const void *p1, const void *p2, void *data)
   644 {
   645 	const struct razor_property *prop1 = p1, *prop2 = p2;
   646 	struct razor_set *set = data;
   647 	char *pool = set->string_pool.data;
   648 
   649 	if (prop1->name == prop2->name) {
   650 		if (prop1->relation == prop2->relation)
   651 			return versioncmp(&pool[prop1->version],
   652 					  &pool[prop2->version]);
   653 		else
   654 			return prop1->relation - prop2->relation;
   655 	} else if ((prop1->name & RAZOR_ENTRY_MASK) == (prop2->name & RAZOR_ENTRY_MASK))
   656 		return (prop1->name >> 30) - (prop2->name >> 30);
   657 	else
   658 		return strcmp(&pool[prop1->name & RAZOR_ENTRY_MASK],
   659 			      &pool[prop2->name & RAZOR_ENTRY_MASK]);
   660 }
   661 
   662 static uint32_t *
   663 uniqueify_properties(struct razor_set *set)
   664 {
   665 	struct razor_property *rp, *up, *rp_end;
   666 	struct array *pkgs, *p;
   667 	uint32_t *map, *rmap, *r;
   668 	int i, count, unique;
   669 
   670 	count = set->properties.size / sizeof(struct razor_property);
   671 	map = qsort_with_data(set->properties.data,
   672 			      count,
   673 			      sizeof(struct razor_property),
   674 			      compare_properties,
   675 			      set);
   676 
   677 	rp_end = set->properties.data + set->properties.size;
   678 	rmap = malloc(count * sizeof *map);
   679 	pkgs = zalloc(count * sizeof *pkgs);
   680 	for (rp = set->properties.data, up = rp, i = 0; rp < rp_end; rp++, i++) {
   681 		if (rp->name != up->name || rp->relation != up->relation ||
   682 		    rp->version != up->version) {
   683 			up++;
   684 			up->name = rp->name;
   685 			up->relation = rp->relation;
   686 			up->version = rp->version;
   687 		}
   688 
   689 		unique = up - (struct razor_property *) set->properties.data;
   690 		rmap[map[i]] = unique;
   691 		r = array_add(&pkgs[unique], sizeof *r);
   692 		*r = rp->packages;
   693 	}
   694 	free(map);
   695 
   696 	up++;
   697 	set->properties.size = (void *) up - set->properties.data;
   698 	rp_end = up;
   699 	for (rp = set->properties.data, p = pkgs; rp < rp_end; rp++, p++) {
   700 		if (p->size / sizeof *r == 1) {
   701 			r = p->data;
   702 			rp->packages = *r | RAZOR_IMMEDIATE;
   703 		} else {
   704 			rp->packages =
   705 				add_to_property_pool(&set->package_pool, p);
   706 		}
   707 		array_release(p);
   708 	}
   709 
   710 	free(pkgs);
   711 
   712 	return rmap;
   713 }
   714 
   715 static void
   716 remap_links(struct array *links, uint32_t *map)
   717 {
   718 	uint32_t *p, *end;
   719 
   720 	end = links->data + links->size;
   721 	for (p = links->data; p < end; p++)
   722 		*p = map[*p & RAZOR_ENTRY_MASK] | (*p & ~RAZOR_ENTRY_MASK);
   723 }
   724 
   725 static int
   726 compare_filenames(const void *p1, const void *p2, void *data)
   727 {
   728 	const struct import_entry *e1 = p1;
   729 	const struct import_entry *e2 = p2;
   730 
   731 	return strcmp(e1->name, e2->name);
   732 }
   733 
   734 static void
   735 count_entries(struct import_directory *d)
   736 {
   737 	struct import_directory *p, *end;
   738 
   739 	p = d->files.data;
   740 	end = d->files.data + d->files.size;
   741 	d->count = 0;
   742 	while (p < end) {
   743 		count_entries(p);
   744 		d->count += p->count + 1;
   745 		p++;
   746 	}		
   747 }
   748 
   749 static void
   750 serialize_files(struct razor_set *set,
   751 		struct import_directory *d, struct array *array)
   752 {
   753 	struct import_directory *p, *end;
   754 	struct razor_entry *e = NULL;
   755 	uint32_t s, *r;
   756 
   757 	p = d->files.data;
   758 	end = d->files.data + d->files.size;
   759 	s = array->size / sizeof *e + d->files.size / sizeof *p;
   760 	while (p < end) {
   761 		e = array_add(array, sizeof *e);
   762 		e->name = p->name;
   763 		e->start = p->count > 0 ? s : 0;
   764 		s += p->count;
   765 
   766 		if (p->packages.size == 0) {
   767 			e->packages = ~0;
   768 		} else if (p->packages.size / sizeof *r == 1) {
   769 			r = p->packages.data;
   770 			e->packages = *r | RAZOR_IMMEDIATE;
   771 		} else {
   772 			e->packages = add_to_property_pool(&set->package_pool,
   773 							   &p->packages);
   774 		}
   775 		array_release(&p->packages);
   776 		p++;
   777 	}		
   778 	if (e != NULL)
   779 		e->name |= RAZOR_ENTRY_LAST;
   780 
   781 	p = d->files.data;
   782 	end = d->files.data + d->files.size;
   783 	while (p < end) {
   784 		serialize_files(set, p, array);
   785 		p++;
   786 	}
   787 }
   788 
   789 static void
   790 remap_property_package_links(struct array *properties, uint32_t *rmap)
   791 {
   792 	struct razor_property *p, *end;
   793 
   794 	end = properties->data + properties->size;
   795 	for (p = properties->data; p < end; p++)
   796 		if (p->packages & RAZOR_IMMEDIATE)
   797 			p->packages = rmap[p->packages & RAZOR_ENTRY_MASK] |
   798 				RAZOR_IMMEDIATE;
   799 }
   800 
   801 static void
   802 build_file_tree(struct razor_importer *importer)
   803 {
   804 	int count, i, length;
   805 	struct import_entry *filenames;
   806 	char *f, *end;
   807 	uint32_t name, *r;
   808 	char dirname[256];
   809 	struct import_directory *d, root;
   810 	struct razor_entry *e;
   811 
   812 	count = importer->files.size / sizeof (struct import_entry);
   813 	qsort_with_data(importer->files.data,
   814 			count,
   815 			sizeof (struct import_entry),
   816 			compare_filenames,
   817 			NULL);
   818 
   819 	root.name = hashtable_tokenize(&importer->table, "");
   820 	array_init(&root.files);
   821 	array_init(&root.packages);
   822 	root.last = NULL;
   823 
   824 	filenames = importer->files.data;
   825 	for (i = 0; i < count; i++) {
   826 		f = filenames[i].name;
   827 		if (*f != '/')
   828 			continue;
   829 		f++;
   830 
   831 		d = &root;
   832 		while (*f) {
   833 			end = strchr(f, '/');
   834 			if (end == NULL)
   835 				end = f + strlen(f);
   836 			length = end - f;
   837 			memcpy(dirname, f, length);
   838 			dirname[length] ='\0';
   839 			name = hashtable_tokenize(&importer->table, dirname);
   840 			if (d->last == NULL || d->last->name != name) {
   841 				d->last = array_add(&d->files, sizeof *d);
   842 				d->last->name = name;
   843 				d->last->last = NULL;
   844 				array_init(&d->last->files);
   845 				array_init(&d->last->packages);
   846 			}
   847 			d = d->last;				
   848 			f = end + 1;
   849 			if (*end == '\0')
   850 				break;
   851 		}
   852 
   853 		r = array_add(&d->packages, sizeof *r);
   854 		*r = filenames[i].package;
   855 		free(filenames[i].name);
   856 	}
   857 
   858 	count_entries(&root);
   859 	array_init(&importer->set->files);
   860 
   861 	e = array_add(&importer->set->files, sizeof *e);
   862 	e->name = root.name | RAZOR_ENTRY_LAST;
   863 	e->start = 1;
   864 	e->packages = ~0;
   865 
   866 	serialize_files(importer->set, &root, &importer->set->files);
   867 
   868 	array_release(&importer->files);
   869 }
   870 
   871 static void
   872 build_package_file_lists(struct razor_set *set, uint32_t *rmap)
   873 {
   874 	struct razor_package *p, *packages;
   875 	struct array *pkgs;
   876 	struct razor_entry *e, *end;
   877 	uint32_t *r, *q;
   878 	int i, count;
   879 
   880 	count = set->packages.size / sizeof *p;
   881 	pkgs = zalloc(count * sizeof *pkgs);
   882 
   883 	end = set->files.data + set->files.size;
   884 	for (e = set->files.data; e < end; e++) {
   885 		if (e->packages == ~0) {
   886 			continue;
   887 		} else if (e->packages & RAZOR_IMMEDIATE) {
   888 			e->packages = rmap[e->packages & RAZOR_ENTRY_MASK] |
   889 				RAZOR_IMMEDIATE;
   890 			r = &e->packages;
   891 		} else {
   892 			r = (uint32_t *) set->package_pool.data + e->packages;
   893 		}
   894 
   895 		while (1) {
   896 			q = array_add(&pkgs[*r & RAZOR_ENTRY_MASK], sizeof *q);
   897 			*q = e - (struct razor_entry *) set->files.data;
   898 			if (*r++ & RAZOR_IMMEDIATE)
   899 				break;
   900 		}
   901 	}
   902 
   903 	packages = set->packages.data;
   904 	for (i = 0; i < count; i++) {
   905 		packages[i].files =
   906 			add_to_property_pool(&set->file_pool, &pkgs[i]);
   907 		array_release(&pkgs[i]);
   908 	}
   909 	free(pkgs);
   910 }
   911 
   912 struct razor_set *
   913 razor_importer_finish(struct razor_importer *importer)
   914 {
   915 	struct razor_set *set;
   916 	uint32_t *map, *rmap;
   917 	int i, count;
   918 
   919 	map = uniqueify_properties(importer->set);
   920 	remap_links(&importer->set->property_pool, map);
   921 	free(map);
   922 
   923 	count = importer->set->packages.size / sizeof(struct razor_package);
   924 	map = qsort_with_data(importer->set->packages.data,
   925 			      count,
   926 			      sizeof(struct razor_package),
   927 			      compare_packages,
   928 			      importer->set);
   929 
   930 	rmap = malloc(count * sizeof *rmap);
   931 	for (i = 0; i < count; i++)
   932 		rmap[map[i]] = i;
   933 	free(map);
   934 
   935 	build_file_tree(importer);
   936 	remap_links(&importer->set->package_pool, rmap);
   937 	build_package_file_lists(importer->set, rmap);
   938 	remap_property_package_links(&importer->set->properties, rmap);
   939 	free(rmap);
   940 
   941 	set = importer->set;
   942 	hashtable_release(&importer->table);
   943 	free(importer);
   944 
   945 	return set;
   946 }
   947 
   948 struct razor_package_iterator {
   949 	struct razor_set *set;
   950 	struct razor_package *package, *end;
   951 	uint32_t *index;
   952 	int last;
   953 };
   954 
   955 struct razor_package_iterator *
   956 razor_package_iterator_create_with_index(struct razor_set *set,
   957 					 uint32_t *index)
   958 {
   959 	struct razor_package_iterator *pi;
   960 
   961 	pi = zalloc(sizeof *pi);
   962 	pi->set = set;
   963 	pi->end = set->packages.data + set->packages.size;
   964 	pi->package = set->packages.data;
   965 	pi->index = index;
   966 
   967 	return pi;
   968 }
   969 
   970 struct razor_package_iterator *
   971 razor_package_iterator_create(struct razor_set *set)
   972 {
   973 	return razor_package_iterator_create_with_index(set, NULL);
   974 }
   975 
   976 struct razor_package_iterator *
   977 razor_package_iterator_create_for_property(struct razor_set *set,
   978 					   struct razor_property *property)
   979 {
   980 	uint32_t *index;
   981 
   982 	if (property->packages & RAZOR_IMMEDIATE)
   983 		index = &property->packages;
   984 	else
   985 		index = (uint32_t *)
   986 			set->package_pool.data + property->packages;
   987 
   988 	return razor_package_iterator_create_with_index(set, index);
   989 }
   990 
   991 int
   992 razor_package_iterator_next(struct razor_package_iterator *pi,
   993 			    struct razor_package **package,
   994 			    const char **name, const char **version)
   995 {
   996 	char *pool;
   997 	int valid;
   998 	struct razor_package *p, *packages;
   999 
  1000 	if (pi->index) {
  1001 		packages = pi->set->packages.data;
  1002 		p = &packages[*pi->index & RAZOR_ENTRY_MASK];
  1003 		valid = !pi->last;
  1004 		pi->last = (*pi->index++ & RAZOR_IMMEDIATE) != 0;
  1005 	} else {
  1006 		p = pi->package++;
  1007 		valid = p < pi->end;
  1008 	}			
  1009 
  1010 	if (valid) {
  1011 		pool = pi->set->string_pool.data;
  1012 		*package = p;
  1013 		*name = &pool[p->name & RAZOR_ENTRY_MASK];
  1014 		*version = &pool[p->version];
  1015 	} else {
  1016 		*package = NULL;
  1017 	}
  1018 
  1019 	return valid;
  1020 }
  1021 
  1022 void
  1023 razor_package_iterator_destroy(struct razor_package_iterator *pi)
  1024 {
  1025 	free(pi);
  1026 }
  1027 
  1028 struct razor_package *
  1029 razor_set_get_package(struct razor_set *set, const char *package)
  1030 {
  1031 	struct razor_package_iterator *pi;
  1032 	struct razor_package *p;
  1033 	const char *name, *version;
  1034 
  1035 	pi = razor_package_iterator_create(set);
  1036 	while (razor_package_iterator_next(pi, &p, &name, &version)) {
  1037 		if (strcmp(package, name) == 0)
  1038 			break;
  1039 	}
  1040 	razor_package_iterator_destroy(pi);
  1041 
  1042 	return p;
  1043 }
  1044 
  1045 struct razor_property_iterator {
  1046 	struct razor_set *set;
  1047 	struct razor_property *property, *end;
  1048 	uint32_t *index;
  1049 	int last;
  1050 };
  1051 
  1052 struct razor_property_iterator *
  1053 razor_property_iterator_create(struct razor_set *set,
  1054 			       struct razor_package *package)
  1055 {
  1056 	struct razor_property_iterator *pi;
  1057 
  1058 	pi = zalloc(sizeof *pi);
  1059 	pi->set = set;
  1060 	pi->end = set->properties.data + set->properties.size;
  1061 	pi->property = set->properties.data;
  1062 
  1063 	if (package)
  1064 		pi->index = (uint32_t *)
  1065 			set->property_pool.data + package->properties;
  1066 
  1067 	return pi;
  1068 }
  1069 
  1070 int
  1071 razor_property_iterator_next(struct razor_property_iterator *pi,
  1072 			     struct razor_property **property,
  1073 			     const char **name,
  1074 			     enum razor_version_relation *relation,
  1075 			     const char **version,
  1076 			     enum razor_property_type *type)
  1077 {
  1078 	char *pool;
  1079 	int valid;
  1080 	struct razor_property *p, *properties;
  1081 
  1082 	if (pi->index) {
  1083 		properties = pi->set->properties.data;
  1084 		p = &properties[*pi->index & RAZOR_ENTRY_MASK];
  1085 		valid = !pi->last;
  1086 		pi->last = (*pi->index++ & RAZOR_IMMEDIATE) != 0;
  1087 	} else {
  1088 		p = pi->property++;
  1089 		valid = p < pi->end;
  1090 	}			
  1091 
  1092 	if (valid) {
  1093 		pool = pi->set->string_pool.data;
  1094 		*property = p;
  1095 		*name = &pool[p->name & RAZOR_ENTRY_MASK];
  1096 		*relation = p->relation;
  1097 		*version = &pool[p->version];
  1098 		*type = p->name >> 30;
  1099 	} else {
  1100 		*property = NULL;
  1101 	}
  1102 
  1103 	return valid;
  1104 }
  1105 
  1106 void
  1107 razor_property_iterator_destroy(struct razor_property_iterator *pi)
  1108 {
  1109 	free(pi);
  1110 }
  1111 
  1112 static struct razor_entry *
  1113 find_entry(struct razor_set *set, struct razor_entry *dir, const char *pattern)
  1114 {
  1115 	struct razor_entry *e;
  1116 	const char *n, *pool = set->string_pool.data;
  1117 	int len;
  1118 
  1119 	e = (struct razor_entry *) set->files.data + dir->start;
  1120 	do {
  1121 		n = pool + (e->name & RAZOR_ENTRY_MASK);
  1122 		if (strcmp(pattern + 1, n) == 0)
  1123 			return e;
  1124 		len = strlen(n);
  1125 		if (e->start != 0 && strncmp(pattern + 1, n, len) == 0 &&
  1126 		    pattern[len + 1] == '/') {
  1127 			return find_entry(set, e, pattern + len + 1);
  1128 		}
  1129 	} while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
  1130 
  1131 	return NULL;
  1132 }
  1133 
  1134 static void
  1135 list_dir(struct razor_set *set, struct razor_entry *dir,
  1136 	 const char *prefix, const char *pattern)
  1137 {
  1138 	struct razor_entry *e;
  1139 	const char *n, *pool = set->string_pool.data;
  1140 
  1141 	e = (struct razor_entry *) set->files.data + dir->start;
  1142 	do {
  1143 		n = pool + (e->name & RAZOR_ENTRY_MASK);
  1144 		if (pattern && pattern[0] && fnmatch(pattern, n, 0) != 0)
  1145 			continue;
  1146 		printf("%s/%s%s\n", prefix, n, e->start > 0 ? "/" : "");
  1147 	} while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
  1148 }
  1149 
  1150 void
  1151 razor_set_list_files(struct razor_set *set, const char *pattern)
  1152 {
  1153 	struct razor_entry *e;
  1154 	char buffer[512], *p, *base;
  1155 
  1156 	if (pattern == NULL)
  1157 		pattern = "/";
  1158 
  1159 	strcpy(buffer, pattern);
  1160 	e = find_entry(set, set->files.data, buffer);
  1161 	if (e && e->start > 0) {
  1162 		base = NULL;
  1163 	} else {
  1164 		p = strrchr(buffer, '/');
  1165 		if (p) {
  1166 			*p = '\0';
  1167 			base = p + 1;
  1168 		} else {
  1169 			base = NULL;
  1170 		}
  1171 	}
  1172 	e = find_entry(set, set->files.data, buffer);
  1173 	if (e->start != 0)
  1174 		list_dir(set, e, buffer, base);
  1175 }
  1176 
  1177 struct razor_package_iterator *
  1178 razor_package_iterator_create_for_file(struct razor_set *set,
  1179 				       const char *filename)
  1180 {
  1181 	struct razor_entry *entry;
  1182 	uint32_t *index;
  1183 
  1184 	entry = find_entry(set, set->files.data, filename);
  1185 	if (entry == NULL)
  1186 		return NULL;
  1187 	
  1188 	if (entry->packages & RAZOR_IMMEDIATE)
  1189 		index = &entry->packages;
  1190 	else
  1191 		index = (uint32_t *)
  1192 			set->package_pool.data + entry->packages;
  1193 
  1194 	return razor_package_iterator_create_with_index(set, index);
  1195 }
  1196 
  1197 static uint32_t *
  1198 list_package_files(struct razor_set *set, uint32_t *r,
  1199 		   struct razor_entry *dir, uint32_t end,
  1200 		   char *prefix)
  1201 {
  1202 	struct razor_entry *e, *f, *entries;
  1203 	uint32_t next, file;
  1204 	char *pool;
  1205 	int len;
  1206 	
  1207 	entries = (struct razor_entry *) set->files.data;
  1208 	pool = set->string_pool.data;
  1209 
  1210 	e = entries + dir->start;
  1211 	do {
  1212 		if (entries + (*r & RAZOR_ENTRY_MASK) == e) {
  1213 			printf("%s/%s\n", prefix,
  1214 			       pool + (e->name & RAZOR_ENTRY_MASK));
  1215 			if (*r & RAZOR_ENTRY_LAST)
  1216 				return NULL;
  1217 			r++;
  1218 			if ((*r & RAZOR_ENTRY_MASK) >= end)
  1219 				return r;
  1220 		}
  1221 	} while (!((e++)->name & RAZOR_ENTRY_LAST));
  1222 
  1223 	e = entries + dir->start;
  1224 	do {
  1225 		if (e->start == 0)
  1226 			continue;
  1227 
  1228 		if (e->name & RAZOR_ENTRY_LAST)
  1229 			next = end;
  1230 		else {
  1231 			f = e + 1; 
  1232 			while (f->start == 0 && !(f->name & RAZOR_ENTRY_LAST))
  1233 				f++;
  1234 			if (f->start == 0)
  1235 				next = end;
  1236 			else
  1237 				next = f->start;
  1238 		}
  1239 
  1240 		file = *r & RAZOR_ENTRY_MASK;
  1241 		if (e->start <= file && file < next) {
  1242 			len = strlen(prefix);
  1243 			prefix[len] = '/';
  1244 			strcpy(prefix + len + 1,
  1245 			       pool + (e->name & RAZOR_ENTRY_MASK));
  1246 			r = list_package_files(set, r, e, next, prefix);
  1247 			prefix[len] = '\0';
  1248 		}
  1249 	} while (!((e++)->name & RAZOR_ENTRY_LAST) && r != NULL);
  1250 
  1251 	return r;
  1252 }
  1253 
  1254 void
  1255 razor_set_list_package_files(struct razor_set *set, const char *name)
  1256 {
  1257 	struct razor_package *package;
  1258 	uint32_t *r, end;
  1259 	char buffer[512];
  1260 
  1261 	package = razor_set_get_package(set, name);
  1262 
  1263 	r = (uint32_t *) set->file_pool.data + package->files;
  1264 	end = set->files.size / sizeof (struct razor_entry);
  1265 	buffer[0] = '\0';
  1266 	list_package_files(set, r, set->files.data, end, buffer);
  1267 }
  1268 
  1269 static void
  1270 razor_set_validate(struct razor_set *set, struct array *unsatisfied)
  1271 {
  1272 	struct razor_property *r, *p, *end;
  1273 	uint32_t *u;
  1274 	char *pool;
  1275 
  1276 	end = set->properties.data + set->properties.size;
  1277 	pool = set->string_pool.data;
  1278 	
  1279 	for (r = set->properties.data, p = r; r < end; r++) {
  1280 		if (r->name >> 30 != RAZOR_PROPERTY_REQUIRES)
  1281 			continue;
  1282 
  1283 		if ((r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK)) {
  1284 			p = r;
  1285 			while (p < end && p->name == r->name)
  1286 				p++;
  1287 		}
  1288 
  1289 		/* If there is more than one version of a provides,
  1290 		 * seek to the end for the highest version. */
  1291 		/* FIXME: This doesn't work if we have a series of
  1292 		 * requires a = 1, provides a = 1, requires a = 2,
  1293 		 * provides a = 2, as the kernel and kernel-devel
  1294 		 * does.*/
  1295 		while (p + 1 < end && p->name == (p + 1)->name)
  1296 			p++;
  1297 
  1298 		/* FIXME: We need to track property flags (<, <=, =
  1299 		 * etc) to properly determine if a requires is
  1300 		 * satisfied.  The current code doesn't track that the
  1301 		 * requires a = 1 isn't satisfied by a = 2 provides. */
  1302 
  1303 		if (p == end ||
  1304 		    (p->name >> 30) != RAZOR_PROPERTY_PROVIDES ||
  1305 		    (r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK) ||
  1306 		    versioncmp(&pool[r->version], &pool[p->version]) > 0) {
  1307 			/* FIXME: We ignore file requires for now. */
  1308 			if (pool[r->name & RAZOR_ENTRY_MASK] == '/')
  1309 				continue;
  1310 			u = array_add(unsatisfied, sizeof *u);
  1311 			*u = r - (struct razor_property *) set->properties.data;
  1312 		}
  1313 	}
  1314 }
  1315 
  1316 void
  1317 razor_set_list_unsatisfied(struct razor_set *set)
  1318 {
  1319 	struct array unsatisfied;
  1320 	struct razor_property *properties, *r;
  1321 	uint32_t *u, *end;
  1322 	char *pool;
  1323 
  1324 	array_init(&unsatisfied);
  1325 	razor_set_validate(set, &unsatisfied);
  1326 
  1327 	end = unsatisfied.data + unsatisfied.size;
  1328 	properties = set->properties.data;
  1329 	pool = set->string_pool.data;
  1330 
  1331 	for (u = unsatisfied.data; u < end; u++) {
  1332 		r = properties + *u;
  1333 		if (pool[r->version] == '\0')
  1334 			printf("%ss not satisfied\n",
  1335 			       &pool[r->name & RAZOR_ENTRY_MASK]);
  1336 		else
  1337 			printf("%s-%s not satisfied\n",
  1338 			       &pool[r->name & RAZOR_ENTRY_MASK],
  1339 			       &pool[r->version]);
  1340 	}
  1341 
  1342 	array_release(&unsatisfied);
  1343 }
  1344 
  1345 #define UPSTREAM_SOURCE 0x80000000ul
  1346 #define INDEX_MASK 0x00fffffful
  1347 
  1348 struct source {
  1349 	struct razor_set *set;
  1350 	uint32_t *property_map;
  1351 };
  1352 
  1353 struct razor_merger {
  1354 	struct razor_set *set;
  1355 	struct hashtable table;
  1356 	struct source source1;
  1357 	struct source source2;
  1358 };
  1359 
  1360 static struct razor_merger *
  1361 razor_merger_create(struct razor_set *set1, struct razor_set *set2)
  1362 {
  1363 	struct razor_merger *merger;
  1364 	int count;
  1365 	size_t size;
  1366 
  1367 	merger = zalloc(sizeof *merger);
  1368 	merger->set = razor_set_create();
  1369 	hashtable_init(&merger->table, &merger->set->string_pool);
  1370 
  1371 	count = set1->properties.size / sizeof (struct razor_property);
  1372 	size = count * sizeof merger->source1.property_map[0];
  1373 	merger->source1.property_map = zalloc(size);
  1374 	merger->source1.set = set1;
  1375 
  1376 	count = set2->properties.size / sizeof (struct razor_property);
  1377 	size = count * sizeof merger->source2.property_map[0];
  1378 	merger->source2.property_map = zalloc(size);
  1379 	merger->source2.set = set2;
  1380 
  1381 	return merger;
  1382 }
  1383 
  1384 static void
  1385 add_package(struct razor_merger *merger,
  1386 	    struct razor_package *package, struct source *source,
  1387 	    uint32_t flags)
  1388 {
  1389 	char *pool;
  1390 	uint32_t *r;
  1391 	struct razor_package *p;
  1392 
  1393 	pool = source->set->string_pool.data;
  1394 	p = array_add(&merger->set->packages, sizeof *p);
  1395 	p->name = hashtable_tokenize(&merger->table, &pool[package->name]);
  1396 	p->name |= flags;
  1397 	p->version = hashtable_tokenize(&merger->table,
  1398 					&pool[package->version]);
  1399 	p->properties = package->properties;
  1400 
  1401 	if (package->properties & RAZOR_IMMEDIATE)
  1402 		r = &package->properties;
  1403 	else
  1404 		r = (uint32_t *)
  1405 			source->set->property_pool.data + package->properties;
  1406 	while (1) {
  1407 		source->property_map[*r & RAZOR_ENTRY_MASK] = 1;
  1408 		if (*r++ & RAZOR_IMMEDIATE)
  1409 			break;
  1410 	}
  1411 }
  1412 
  1413 
  1414 /* Build the new package list sorted by merging the two package lists.
  1415  * Build new string pool as we go. */
  1416 static void
  1417 merge_packages(struct razor_merger *merger, struct array *packages)
  1418 {
  1419 	struct razor_package *upstream_packages, *p, *s, *send;
  1420 	struct source *source1, *source2;
  1421 	char *spool, *upool;
  1422 	uint32_t *u, *uend;
  1423 	int cmp;
  1424 
  1425 	source1 = &merger->source1;
  1426 	source2 = &merger->source2;
  1427 	upstream_packages = source2->set->packages.data;
  1428 
  1429 	u = packages->data;
  1430 	uend = packages->data + packages->size;
  1431 	upool = source2->set->string_pool.data;
  1432 
  1433 	s = source1->set->packages.data;
  1434 	send = source1->set->packages.data + source1->set->packages.size;
  1435 	spool = source1->set->string_pool.data;
  1436 
  1437 	while (s < send) {
  1438 		p = upstream_packages + *u;
  1439 
  1440 		if (u < uend)
  1441 			cmp = strcmp(&spool[s->name], &upool[p->name]);
  1442 		if (u >= uend || cmp < 0) {
  1443 			add_package(merger, s, source1, 0);
  1444 			s++;
  1445 		} else if (cmp == 0) {
  1446 			add_package(merger, p, source2, UPSTREAM_SOURCE);
  1447 			s++;
  1448 			u++;
  1449 		} else {
  1450 			add_package(merger, p, source2, UPSTREAM_SOURCE);
  1451 			u++;
  1452 		}
  1453 	}
  1454 }
  1455 
  1456 static uint32_t
  1457 add_property(struct razor_merger *merger,
  1458 	     const char *name, enum razor_version_relation relation,
  1459 	     const char *version, int type)
  1460 {
  1461 	struct razor_property *p;
  1462 
  1463 	p = array_add(&merger->set->properties, sizeof *p);
  1464 	p->name = hashtable_tokenize(&merger->table, name) | (type << 30);
  1465 	p->relation = relation;
  1466 	p->version = hashtable_tokenize(&merger->table, version);
  1467 
  1468 	return p - (struct razor_property *) merger->set->properties.data;
  1469 }
  1470 
  1471 static void
  1472 merge_properties(struct razor_merger *merger)
  1473 {
  1474 	struct razor_property *p1, *p2;
  1475 	struct razor_set *set1, *set2;
  1476 	uint32_t *map1, *map2;
  1477 	int i, j, cmp, count1, count2;
  1478 	char *pool1, *pool2;
  1479 
  1480 	set1 = merger->source1.set;
  1481 	set2 = merger->source2.set;
  1482 	map1 = merger->source1.property_map;
  1483 	map2 = merger->source2.property_map;
  1484 
  1485 	i = 0;
  1486 	j = 0;
  1487 	pool1 = set1->string_pool.data;
  1488 	pool2 = set2->string_pool.data;
  1489 
  1490 	count1 = set1->properties.size / sizeof *p1;
  1491 	count2 = set2->properties.size / sizeof *p2;
  1492 	while (i < count1 || j < count2) {
  1493 		if (i < count1 && map1[i] == 0) {
  1494 			i++;
  1495 			continue;
  1496 		}
  1497 		if (j < count2 && map2[j] == 0) {
  1498 			j++;
  1499 			continue;
  1500 		}
  1501 		p1 = (struct razor_property *) set1->properties.data + i;
  1502 		p2 = (struct razor_property *) set2->properties.data + j;
  1503 		if (i < count1 && j < count2)
  1504 			cmp = strcmp(&pool1[p1->name & RAZOR_ENTRY_MASK],
  1505 				     &pool2[p2->name & RAZOR_ENTRY_MASK]);
  1506 		else if (i < count1)
  1507 			cmp = -1;
  1508 		else
  1509 			cmp = 1;
  1510 		if (cmp == 0)
  1511 			cmp = p1->relation - p2->relation;
  1512 		if (cmp == 0)
  1513 			cmp = versioncmp(&pool1[p1->version],
  1514 					 &pool2[p2->version]);
  1515 		if (cmp < 0) {
  1516 			map1[i++] = add_property(merger,
  1517 						 &pool1[p1->name & RAZOR_ENTRY_MASK],
  1518 						 p1->relation,
  1519 						 &pool1[p1->version],
  1520 						 (p1->name >> 30));
  1521 		} else if (cmp > 0) {
  1522 			map2[j++] = add_property(merger,
  1523 						 &pool2[p2->name & RAZOR_ENTRY_MASK],
  1524 						 p2->relation,
  1525 						 &pool2[p2->version],
  1526 						 (p2->name >> 30));
  1527 		} else  {
  1528 			map1[i++] = map2[j++] = add_property(merger,
  1529 							     &pool1[p1->name & RAZOR_ENTRY_MASK],
  1530 							     p1->relation,
  1531 							     &pool1[p1->version],
  1532 							     (p1->name >> 30));
  1533 		}
  1534 	}
  1535 }
  1536 
  1537 static uint32_t
  1538 emit_properties(struct array *source_pool, uint32_t index,
  1539 		uint32_t *map, struct array *pool)
  1540 {
  1541 	uint32_t r, *p, *q;
  1542 
  1543 	r = pool->size / sizeof *q;
  1544 	p = (uint32_t *) source_pool->data + index;
  1545 	while (1) {
  1546 		q = array_add(pool, sizeof *q);
  1547 		*q = map[*p & RAZOR_ENTRY_MASK] | (*p & ~RAZOR_ENTRY_MASK);
  1548 		if (*p++ & RAZOR_ENTRY_LAST)
  1549 			break;
  1550 	}
  1551 
  1552 	return r;
  1553 }
  1554 	
  1555 /* Rebuild property->packages maps.  We can't just remap these, as a
  1556  * property may have lost or gained a number of packages.  Allocate an
  1557  * array per property and loop through the packages and add them to
  1558  * the arrays for their properties. */
  1559 static void
  1560 rebuild_package_lists(struct razor_set *set)
  1561 {
  1562 	struct array *pkgs, *a;
  1563 	struct razor_package *pkg, *pkg_end;
  1564 	struct razor_property *prop, *prop_end;
  1565 	uint32_t *r, *q, *pool;
  1566 	int count;
  1567 
  1568 	count = set->properties.size / sizeof (struct razor_property);
  1569 	pkgs = zalloc(count * sizeof *pkgs);
  1570 	pkg_end = set->packages.data + set->packages.size;
  1571 	pool = set->property_pool.data;
  1572 
  1573 	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
  1574 		for (r = &pool[pkg->properties]; ; r++) {
  1575 			q = array_add(&pkgs[*r & RAZOR_ENTRY_MASK], sizeof *q);
  1576 			*q = pkg - (struct razor_package *) set->packages.data;
  1577 			if (*r & RAZOR_IMMEDIATE)
  1578 				break;
  1579 		}
  1580 	}
  1581 
  1582 	prop_end = set->properties.data + set->properties.size;
  1583 	a = pkgs;
  1584 	for (prop = set->properties.data; prop < prop_end; prop++, a++) {
  1585 		if (a->size / sizeof *r == 1) {
  1586 			r = a->data;
  1587 			prop->packages = *r | RAZOR_IMMEDIATE;
  1588 		} else {
  1589 			prop->packages =
  1590 				add_to_property_pool(&set->property_pool, a);
  1591 		}
  1592 		array_release(a);
  1593 	}
  1594 	free(pkgs);
  1595 }
  1596 
  1597 struct razor_set *
  1598 razor_merger_finish(struct razor_merger *merger)
  1599 {
  1600 	struct razor_set *result;
  1601 
  1602 	result = merger->set;
  1603 	hashtable_release(&merger->table);
  1604 	free(merger);
  1605 
  1606 	return result;
  1607 }
  1608 
  1609 /* Add packages from 'upstream' to 'set'.  The packages to add are
  1610  * specified by the 'packages' array, which is a sorted list of
  1611  * package indexes.  Returns a newly allocated package set.  Does not
  1612  * enforce validity of the resulting package set.
  1613  *
  1614  * This looks more complicated than it is.  An easy way to merge two
  1615  * package sets would be to just use a razor_importer, but that
  1616  * requires resorting, and is thus O(n log n).  We can do this in a
  1617  * linear sweep, but it gets a little more complicated.
  1618  */
  1619 struct razor_set *
  1620 razor_set_add(struct razor_set *set, struct razor_set *upstream,
  1621 	      struct array *packages)
  1622 {
  1623 	struct razor_merger *merger;
  1624 	struct razor_package *p, *pend;
  1625 
  1626 	merger = razor_merger_create(set, upstream);
  1627 
  1628 	merge_packages(merger, packages);
  1629 
  1630 	/* As we built the package list, we filled out a bitvector of
  1631 	 * the properties that are referenced by the packages in the
  1632 	 * new set.  Now we do a parallel loop through the properties
  1633 	 * and emit those marked in the bit vector to the new set.  In
  1634 	 * the process, we update the bit vector to actually map from
  1635 	 * indices in the old property list to indices in the new
  1636 	 * property list for both sets. */
  1637 
  1638 	merge_properties(merger);
  1639 
  1640 	/* Now we loop through the packages again and emit the
  1641 	 * property lists, remapped to point to the new properties. */
  1642 
  1643 	pend = merger->set->packages.data + merger->set->packages.size;
  1644 	for (p = merger->set->packages.data; p < pend; p++) {
  1645 		struct source *src;
  1646 
  1647 		if (p->name & UPSTREAM_SOURCE)
  1648 			src = &merger->source2;
  1649 		else
  1650 			src = &merger->source1;
  1651 
  1652 		p->properties = emit_properties(&src->set->property_pool,
  1653 						p->properties,
  1654 						src->property_map,
  1655 						&merger->set->property_pool);
  1656 		p->name &= INDEX_MASK;
  1657 	}
  1658 
  1659 	rebuild_package_lists(merger->set);
  1660 
  1661 	return razor_merger_finish(merger);
  1662 }
  1663 
  1664 void
  1665 razor_set_satisfy(struct razor_set *set, struct array *unsatisfied,
  1666 		  struct razor_set *upstream, struct array *list)
  1667 {
  1668 	struct razor_property *requires, *r;
  1669 	struct razor_property *p, *pend;
  1670 	uint32_t *u, *end, *pkg, *package_pool;
  1671 	char *pool, *upool;
  1672 
  1673 	end = unsatisfied->data + unsatisfied->size;
  1674 	requires = set->properties.data;
  1675 	pool = set->string_pool.data;
  1676 
  1677 	p = upstream->properties.data;
  1678 	pend = upstream->properties.data + upstream->properties.size;
  1679 	upool = upstream->string_pool.data;
  1680 	package_pool = upstream->package_pool.data;
  1681 
  1682 	for (u = unsatisfied->data; u < end; u++) {
  1683 		r = requires + *u;
  1684 
  1685 		while (p < pend &&
  1686 		       strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
  1687 			      &upool[p->name & RAZOR_ENTRY_MASK]) > 0 &&
  1688 		       (p->name >> 30) != RAZOR_PROPERTY_PROVIDES)
  1689 			p++;
  1690 		/* If there is more than one version of a provides,
  1691 		 * seek to the end for the highest version. */
  1692 		while (p + 1 < pend && p->name == (p + 1)->name)
  1693 			p++;
  1694 
  1695 		if (p == pend ||
  1696 		    strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
  1697 			   &upool[p->name & RAZOR_ENTRY_MASK]) != 0 ||
  1698 		    versioncmp(&pool[r->version], &upool[p->version]) > 0) {
  1699 			/* Do we need to track unsatisfiable requires
  1700 			 * as we go, or should we just do a
  1701 			 * razor_set_validate() at the end? */
  1702 		} else {
  1703 			pkg = array_add(list, sizeof *pkg);
  1704 			/* We just pull in the first package that provides */
  1705 			if (p->packages & RAZOR_IMMEDIATE)
  1706 				*pkg = p->packages & RAZOR_ENTRY_MASK;
  1707 			else
  1708 				*pkg = package_pool[p->packages];
  1709 		}
  1710 	}	
  1711 }
  1712 
  1713 static void
  1714 find_packages(struct razor_set *set,
  1715 	      int count, const char **package_names, struct array *list)
  1716 {
  1717 	struct razor_package_iterator *pi;
  1718 	struct razor_package *p, *packages;
  1719 	const char *name, *version;
  1720 	uint32_t *r;
  1721 	int i;
  1722 
  1723 	packages = (struct razor_package *) set->packages.data;
  1724 	pi = razor_package_iterator_create(set);
  1725 
  1726 	while (razor_package_iterator_next(pi, &p, &name, &version)) {
  1727 		for (i = 0; i < count; i++) {
  1728 			if (strcmp(name, package_names[i]) == 0) {
  1729 				r = array_add(list, sizeof *r);
  1730 				*r = p - packages;
  1731 				break;
  1732 			}
  1733 		}
  1734 	}
  1735 
  1736 	razor_package_iterator_destroy(pi);
  1737 }
  1738 
  1739 static void
  1740 find_all_packages(struct razor_set *set,
  1741 		  struct razor_set *upstream, struct array *list)
  1742 {
  1743 	struct razor_package *p, *u, *pend, *uend;
  1744 	uint32_t *r;
  1745 	char *pool, *upool;
  1746 
  1747 	pend = set->packages.data + set->packages.size;
  1748 	pool = set->string_pool.data;
  1749 	u = upstream->packages.data;
  1750 	uend = upstream->packages.data + upstream->packages.size;
  1751 	upool = upstream->string_pool.data;
  1752 
  1753 	for (p = set->packages.data; p < pend; p++) {
  1754 		while (u < uend && strcmp(&pool[p->name], &upool[u->name]) > 0)
  1755 			u++;
  1756 		if (strcmp(&pool[p->name], &upool[u->name]) == 0) {
  1757 			r = array_add(list, sizeof *r);
  1758 			*r = u - (struct razor_package *) upstream->packages.data;
  1759 		}
  1760 	}
  1761 }
  1762 
  1763 struct razor_set *
  1764 razor_set_update(struct razor_set *set, struct razor_set *upstream,
  1765 		 int count, const char **packages)
  1766 {
  1767 	struct razor_set *new;
  1768 	struct razor_package *upackages;
  1769 	struct array list, unsatisfied;
  1770 	char *pool;
  1771 	uint32_t *u, *end;
  1772 	int total = 0;
  1773 
  1774 	array_init(&list);
  1775 	if (count > 0)
  1776 		find_packages(upstream, count, packages, &list);
  1777 	else
  1778 		find_all_packages(set, upstream, &list);
  1779 
  1780 	end = list.data + list.size;
  1781 	upackages = upstream->packages.data;
  1782 	pool = upstream->string_pool.data;
  1783 	total += list.size / sizeof *u;
  1784 
  1785 	while (list.size > 0) {
  1786 		new = razor_set_add(set, upstream, &list);
  1787 		array_release(&list);
  1788 		razor_set_destroy(set);
  1789 		set = new;
  1790 
  1791 		array_init(&unsatisfied);
  1792 		razor_set_validate(new, &unsatisfied);
  1793 		array_init(&list);
  1794 		razor_set_satisfy(new, &unsatisfied, upstream, &list);
  1795 		array_release(&unsatisfied);
  1796 
  1797 		end = list.data + list.size;
  1798 		upackages = upstream->packages.data;
  1799 		pool = upstream->string_pool.data;
  1800 		total += list.size / sizeof *u;
  1801 	}
  1802 
  1803 	array_release(&list);
  1804 
  1805 	return set;
  1806 }
  1807 
  1808 /* The diff order matters.  We should sort the packages so that a
  1809  * REMOVE of a package comes before the INSTALL, and so that all
  1810  * requires for a package have been installed before the package.
  1811  **/
  1812 
  1813 void
  1814 razor_set_diff(struct razor_set *set, struct razor_set *upstream,
  1815 	       razor_package_callback_t callback, void *data)
  1816 {
  1817 	struct razor_package_iterator *pi1, *pi2;
  1818 	struct razor_package *p1, *p2;
  1819 	const char *name1, *name2, *version1, *version2;
  1820 	int res;
  1821 
  1822 	pi1 = razor_package_iterator_create(set);
  1823 	pi2 = razor_package_iterator_create(upstream);
  1824 
  1825 	razor_package_iterator_next(pi1, &p1, &name1, &version1);
  1826 	razor_package_iterator_next(pi2, &p2, &name2, &version2);
  1827 
  1828 	while (p1 || p2) {
  1829 		if (p1 && p2) {
  1830 			res = strcmp(name1, name2);
  1831 			if (res == 0)
  1832 				res = versioncmp(version1, version2);
  1833 		} else {
  1834 			res = 0;
  1835 		}
  1836 
  1837 		if (p2 == NULL || res < 0)
  1838 			callback(name1, version1, NULL, data);
  1839 		else if (p1 == NULL || res > 0)
  1840 			callback(name2, NULL, version2, data);
  1841 
  1842 		if (p1 != NULL && res <= 0)
  1843 			razor_package_iterator_next(pi1, &p1,
  1844 						    &name1, &version1);
  1845 		if (p2 != NULL && res >= 0)
  1846 			razor_package_iterator_next(pi2, &p2,
  1847 						    &name2, &version2);
  1848 	}
  1849 
  1850 	razor_package_iterator_destroy(pi1);
  1851 	razor_package_iterator_destroy(pi2);
  1852 }