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