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