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