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