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