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