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