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