razor.c
author Dan Winship <danw@gnome.org>
Fri Feb 15 15:09:37 2008 -0500 (2008-02-15)
changeset 125 e56c83bda295
parent 123 4e699bd39b40
child 126 3142795705a5
permissions -rw-r--r--
redo test framework, with tests taken from yum sources

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