razor.c
author Dan Winship <danw@gnome.org>
Mon Feb 04 10:46:29 2008 -0500 (2008-02-04)
changeset 108 340d92912f49
parent 106 9d4d62f62735
child 109 313b0a615c14
permissions -rw-r--r--
Fix repo format on x86_64 by using uint32_t instead of unsigned long
     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 version;
    62 	uint32_t packages;
    63 };
    64 
    65 struct razor_entry {
    66 	uint32_t name;
    67 	uint32_t start;
    68 	uint32_t packages;
    69 };
    70 
    71 struct razor_set {
    72 	struct array string_pool;
    73  	struct array packages;
    74  	struct array properties;
    75  	struct array files;
    76 	struct array package_pool;
    77  	struct array property_pool;
    78  	struct array file_pool;
    79 	struct razor_set_header *header;
    80 };
    81 
    82 struct import_entry {
    83 	uint32_t package;
    84 	char *name;
    85 };
    86 
    87 struct import_directory {
    88 	uint32_t name, count;
    89 	struct array files;
    90 	struct array packages;
    91 	struct import_directory *last;
    92 };
    93 
    94 struct hashtable {
    95 	struct array buckets;
    96 	struct array *pool;
    97 };
    98 
    99 struct razor_importer {
   100 	struct razor_set *set;
   101 	struct hashtable table;
   102 	struct razor_package *package;
   103 	struct array properties;
   104 	struct array files;
   105 };
   106 
   107 static void
   108 array_init(struct array *array)
   109 {
   110 	memset(array, 0, sizeof *array);
   111 }
   112 
   113 static void
   114 array_release(struct array *array)
   115 {
   116 	free(array->data);
   117 }
   118 
   119 static void *
   120 array_add(struct array *array, int size)
   121 {
   122 	int alloc;
   123 	void *data, *p;
   124 
   125 	if (array->alloc > 0)
   126 		alloc = array->alloc;
   127 	else
   128 		alloc = 16;
   129 
   130 	while (alloc < array->size + size)
   131 		alloc *= 2;
   132 
   133 	if (array->alloc < alloc) {
   134 		data = realloc(array->data, alloc);
   135 		if (data == NULL)
   136 			return 0;
   137 		array->data = data;
   138 		array->alloc = alloc;
   139 	}
   140 
   141 	p = array->data + array->size;
   142 	array->size += size;
   143 
   144 	return p;
   145 }
   146 
   147 static void *
   148 zalloc(size_t size)
   149 {
   150 	void *p;
   151 
   152 	p = malloc(size);
   153 	memset(p, 0, size);
   154 
   155 	return p;
   156 }
   157 
   158 struct razor_set_section razor_sections[] = {
   159 	{ RAZOR_STRING_POOL,	offsetof(struct razor_set, string_pool) },
   160 	{ RAZOR_PACKAGES,	offsetof(struct razor_set, packages) },
   161 	{ RAZOR_PROPERTIES,	offsetof(struct razor_set, properties) },
   162 	{ RAZOR_FILES,		offsetof(struct razor_set, files) },
   163 	{ RAZOR_PACKAGE_POOL,	offsetof(struct razor_set, package_pool) },
   164 	{ RAZOR_PROPERTY_POOL,	offsetof(struct razor_set, property_pool) },
   165 	{ RAZOR_FILE_POOL,	offsetof(struct razor_set, file_pool) },
   166 };
   167 
   168 struct razor_set *
   169 razor_set_create(void)
   170 {
   171 	return zalloc(sizeof(struct razor_set));
   172 }
   173 
   174 struct razor_set *
   175 razor_set_open(const char *filename)
   176 {
   177 	struct razor_set *set;
   178 	struct razor_set_section *s;
   179 	struct stat stat;
   180 	struct array *array;
   181 	int fd;
   182 
   183 	set = zalloc(sizeof *set);
   184 	fd = open(filename, O_RDONLY);
   185 	if (fstat(fd, &stat) < 0)
   186 		return NULL;
   187 	set->header = mmap(NULL, stat.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
   188 	if (set->header == MAP_FAILED) {
   189 		free(set);
   190 		return NULL;
   191 	}
   192 
   193 	for (s = set->header->sections; ~s->type; s++) {
   194 		if (s->type >= ARRAY_SIZE(razor_sections))
   195 			continue;
   196 		if (s->type != razor_sections[s->type].type)
   197 			continue;
   198 		array = (void *) set + razor_sections[s->type].offset;
   199 		array->data = (void *) set->header + s->offset;
   200 		array->size = s->size;
   201 		array->alloc = s->size;
   202 	}
   203 	close(fd);
   204 
   205 	return set;
   206 }
   207 
   208 void
   209 razor_set_destroy(struct razor_set *set)
   210 {
   211 	unsigned int size;
   212 	struct array *a;
   213 	int i;
   214 
   215 	if (set->header) {
   216 		for (i = 0; set->header->sections[i].type; i++)
   217 			;
   218 		size = set->header->sections[i].type;
   219 		munmap(set->header, size);
   220 	} else {
   221 		for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   222 			a = (void *) set + razor_sections[i].offset;
   223 			free(a->data);
   224 		}
   225 	}
   226 
   227 	free(set);
   228 }
   229 
   230 int
   231 razor_set_write(struct razor_set *set, const char *filename)
   232 {
   233 	char data[4096];
   234 	struct razor_set_header *header = (struct razor_set_header *) data;
   235 	struct array *a;
   236 	uint32_t offset;
   237 	int i, fd;
   238 
   239 	memset(data, 0, sizeof data);
   240 	header->magic = RAZOR_MAGIC;
   241 	header->version = RAZOR_VERSION;
   242 	offset = sizeof data;
   243 
   244 	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   245 		if (razor_sections[i].type != i)
   246 			continue;
   247 		a = (void *) set + razor_sections[i].offset;
   248 		header->sections[i].type = i;
   249 		header->sections[i].offset = offset;
   250 		header->sections[i].size = a->size;
   251 		offset += ALIGN(a->size, 4096);
   252 	}
   253 
   254 	header->sections[i].type = ~0;
   255 	header->sections[i].offset = 0;
   256 	header->sections[i].size = 0;
   257 
   258 	fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
   259 	if (fd < 0)
   260 		return -1;
   261 
   262 	razor_write(fd, data, sizeof data);
   263 	for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
   264 		if (razor_sections[i].type != i)
   265 			continue;
   266 		a = (void *) set + razor_sections[i].offset;
   267 		razor_write(fd, a->data, ALIGN(a->size, 4096));
   268 	}
   269 
   270 	close(fd);
   271 
   272 	return 0;
   273 }
   274 
   275 static unsigned int
   276 hash_string(const char *key)
   277 {
   278 	const char *p;
   279 	unsigned int hash = 0;
   280 
   281 	for (p = key; *p; p++)
   282 		hash = (hash * 617) ^ *p;
   283 
   284 	return hash;
   285 }
   286 
   287 static uint32_t
   288 hashtable_lookup(struct hashtable *table, const char *key)
   289 {
   290 	unsigned int mask, start, i;
   291 	uint32_t *b;
   292 	char *pool;
   293 
   294 	pool = table->pool->data;
   295 	mask = table->buckets.alloc - 1;
   296 	start = hash_string(key) * sizeof(uint32_t);
   297 
   298 	for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
   299 		b = table->buckets.data + ((start + i) & mask);
   300 
   301 		if (*b == 0)
   302 			return 0;
   303 
   304 		if (strcmp(key, &pool[*b]) == 0)
   305 			return *b;
   306 	}
   307 
   308 	return 0;
   309 }
   310 
   311 static uint32_t
   312 add_to_string_pool(struct hashtable *table, const char *key)
   313 {
   314 	int len;
   315 	char *p;
   316 
   317 	len = strlen(key) + 1;
   318 	p = array_add(table->pool, len);
   319 	memcpy(p, key, len);
   320 
   321 	return p - (char *) table->pool->data;
   322 }
   323 
   324 static uint32_t
   325 add_to_property_pool(struct array *pool, struct array *properties)
   326 {
   327 	uint32_t *p;
   328 
   329 	if (properties->size == 0)
   330 		return ~0;
   331 	else if (properties->size == sizeof *p)
   332 		return *(uint32_t *) properties->data | RAZOR_IMMEDIATE;
   333 
   334 	p = array_add(pool, properties->size);
   335 	memcpy(p, properties->data, properties->size);
   336 	p[properties->size / sizeof *p - 1] |= RAZOR_IMMEDIATE;
   337 
   338 	return p - (uint32_t *) pool->data;
   339 }
   340 
   341 static void
   342 do_insert(struct hashtable *table, uint32_t value)
   343 {
   344 	unsigned int mask, start, i;
   345 	uint32_t *b;
   346 	const char *key;
   347 
   348 	key = (char *) table->pool->data + value;
   349 	mask = table->buckets.alloc - 1;
   350 	start = hash_string(key) * sizeof(uint32_t);
   351 
   352 	for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
   353 		b = table->buckets.data + ((start + i) & mask);
   354 		if (*b == 0) {
   355 			*b = value;
   356 			break;
   357 		}
   358 	}
   359 }
   360 
   361 static uint32_t
   362 hashtable_insert(struct hashtable *table, const char *key)
   363 {
   364 	uint32_t value, *buckets, *b, *end;
   365 	int alloc;
   366 
   367 	alloc = table->buckets.alloc;
   368 	array_add(&table->buckets, 4 * sizeof *buckets);
   369 	if (alloc != table->buckets.alloc) {
   370 		end = table->buckets.data + alloc;
   371 		memset(end, 0, table->buckets.alloc - alloc);
   372 		for (b = table->buckets.data; b < end; b++) {
   373 			value = *b;
   374 			if (value != 0) {
   375 				*b = 0;
   376 				do_insert(table, value);
   377 			}
   378 		}
   379 	}
   380 
   381 	value = add_to_string_pool(table, key);
   382 	do_insert (table, value);
   383 
   384 	return value;
   385 }
   386 
   387 static void
   388 hashtable_init(struct hashtable *table, struct array *pool)
   389 {
   390 	array_init(&table->buckets);
   391 	table->pool = pool;
   392 }
   393 
   394 static void
   395 hashtable_release(struct hashtable *table)
   396 {
   397 	array_release(&table->buckets);
   398 }
   399 
   400 static uint32_t
   401 hashtable_tokenize(struct hashtable *table, const char *string)
   402 {
   403 	uint32_t token;
   404 
   405 	if (string == NULL)
   406 		string = "";
   407 
   408 	token = hashtable_lookup(table, string);
   409 	if (token != 0)
   410 		return token;
   411 
   412 	return hashtable_insert(table, string);
   413 }
   414 
   415 void
   416 razor_importer_begin_package(struct razor_importer *importer,
   417 			     const char *name, const char *version)
   418 {
   419 	struct razor_package *p;
   420 
   421 	p = array_add(&importer->set->packages, sizeof *p);
   422 	p->name = hashtable_tokenize(&importer->table, name);
   423 	p->version = hashtable_tokenize(&importer->table, version);
   424 
   425 	importer->package = p;
   426 	array_init(&importer->properties);
   427 }
   428 
   429 void
   430 razor_importer_finish_package(struct razor_importer *importer)
   431 {
   432 	struct razor_package *p;
   433 
   434 	p = importer->package;
   435 	p->properties = add_to_property_pool(&importer->set->property_pool,
   436 					     &importer->properties);
   437 
   438 	array_release(&importer->properties);
   439 }
   440 
   441 void
   442 razor_importer_add_property(struct razor_importer *importer,
   443 			    const char *name, const char *version,
   444 			    enum razor_property_type type)
   445 {
   446 	struct razor_property *p;
   447 	uint32_t *r;
   448 
   449 	p = array_add(&importer->set->properties, sizeof *p);
   450 	p->name = hashtable_tokenize(&importer->table, name) | (type << 30);
   451 	p->version = hashtable_tokenize(&importer->table, version);
   452 	p->packages = importer->package -
   453 		(struct razor_package *) importer->set->packages.data;
   454 
   455 	r = array_add(&importer->properties, sizeof *r);
   456 	*r = p - (struct razor_property *) importer->set->properties.data;
   457 }
   458 
   459 void
   460 razor_importer_add_file(struct razor_importer *importer, const char *name)
   461 {
   462 	struct import_entry *e;
   463 
   464 	e = array_add(&importer->files, sizeof *e);
   465 
   466 	e->package = importer->package -
   467 		(struct razor_package *) importer->set->packages.data;
   468 	e->name = strdup(name);
   469 }
   470 
   471 struct razor_importer *
   472 razor_importer_new(void)
   473 {
   474 	struct razor_importer *importer;
   475 
   476 	importer = zalloc(sizeof *importer);
   477 	importer->set = razor_set_create();
   478 	hashtable_init(&importer->table, &importer->set->string_pool);
   479 
   480 	return importer;
   481 }
   482 
   483 /* Destroy an importer without creating the set. */
   484 void
   485 razor_importer_destroy(struct razor_importer *importer)
   486 {
   487 	/* FIXME: write this */
   488 }
   489 
   490 
   491 typedef int (*compare_with_data_func_t)(const void *p1,
   492 					const void *p,
   493 					void *data);
   494 
   495 struct qsort_context {
   496 	size_t size;
   497 	compare_with_data_func_t compare;
   498 	void *data;
   499 };
   500 
   501 static void
   502 qsort_swap(void *p1, void *p2, size_t size)
   503 {
   504 	char buffer[size];
   505 
   506 	memcpy(buffer, p1, size);
   507 	memcpy(p1, p2, size);
   508 	memcpy(p2, buffer, size);
   509 }
   510 
   511 static void
   512 __qsort_with_data(void *base, size_t nelem, uint32_t *map,
   513 		  struct qsort_context *ctx)
   514 {
   515 	void *p, *start, *end, *pivot;
   516 	uint32_t *mp, *mstart, *mend, tmp;
   517 	int left, right, result;
   518 	size_t size = ctx->size;
   519 
   520 	p = base;
   521 	start = base;
   522 	end = base + nelem * size;
   523 	mp = map;
   524 	mstart = map;
   525 	mend = map + nelem;
   526 	pivot = base + (random() % nelem) * size;
   527 
   528 	while (p < end) {
   529 		result = ctx->compare(p, pivot, ctx->data);
   530 		if (result < 0) {
   531 			qsort_swap(p, start, size);
   532 			tmp = *mp;
   533 			*mp = *mstart;
   534 			*mstart = tmp;
   535 			if (start == pivot)
   536 				pivot = p;
   537 			start += size;
   538 			mstart++;
   539 			p += size;
   540 			mp++;
   541 		} else if (result == 0) {
   542 			p += size;
   543 			mp++;
   544 		} else {
   545  			end -= size;
   546 			mend--;
   547 			qsort_swap(p, end, size);
   548 			tmp = *mp;
   549 			*mp = *mend;
   550 			*mend = tmp;
   551 			if (end == pivot)
   552 				pivot = p;
   553 		}
   554 	}
   555 
   556 	left = (start - base) / size;
   557 	right = (base + nelem * size - end) / size;
   558 	if (left > 1)
   559 		__qsort_with_data(base, left, map, ctx);
   560 	if (right > 1)
   561 		__qsort_with_data(end, right, mend, ctx);
   562 }
   563 
   564 uint32_t *
   565 qsort_with_data(void *base, size_t nelem, size_t size,
   566 		compare_with_data_func_t compare, void *data)
   567 {
   568 	struct qsort_context ctx;
   569 	uint32_t *map;
   570 	int i;
   571 
   572 	if (nelem == 0)
   573 		return NULL;
   574 
   575 	ctx.size = size;
   576 	ctx.compare = compare;
   577 	ctx.data = data;
   578 
   579 	map = malloc(nelem * sizeof (uint32_t));
   580 	for (i = 0; i < nelem; i++)
   581 		map[i] = i;
   582 
   583 	__qsort_with_data(base, nelem, map, &ctx);
   584 
   585 	return map;
   586 }
   587 
   588 static int
   589 versioncmp(const char *s1, const char *s2)
   590 {
   591 	const char *p1, *p2;
   592 	long n1, n2;
   593 	int res;
   594 
   595 	n1 = strtol(s1, (char **) &p1, 0);
   596 	n2 = strtol(s2, (char **) &p2, 0);
   597 
   598 	/* Epoch; if one but not the other has an epoch set, default
   599 	 * the epoch-less version to 0. */
   600 	res = (*p1 == ':') - (*p2 == ':');
   601 	if (res < 0) {
   602 		n1 = 0;
   603 		p1 = s1;
   604 		p2++;
   605 	} else if (res > 0) {
   606 		p1++;
   607 		n2 = 0;
   608 		p2 = s2;
   609 	}
   610 
   611 	if (n1 != n2)
   612 		return n1 - n2;
   613 	while (*p1 && *p2) {
   614 		if (*p1 != *p2)
   615 			return *p1 - *p2;
   616 		p1++;
   617 		p2++;
   618 		if (isdigit(*p1) && isdigit(*p2))
   619 			return versioncmp(p1, p2);
   620 	}
   621 
   622 	return *p1 - *p2;
   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 uint32_t *
   656 uniqueify_properties(struct razor_set *set)
   657 {
   658 	struct razor_property *rp, *up, *rp_end;
   659 	struct array *pkgs, *p;
   660 	uint32_t *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, uint32_t *map)
   708 {
   709 	uint32_t *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 	uint32_t 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, uint32_t *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 	uint32_t 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, uint32_t *rmap)
   864 {
   865 	struct razor_package *p, *packages;
   866 	struct array *pkgs;
   867 	struct razor_entry *e, *end;
   868 	uint32_t *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 = (uint32_t *) 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 	uint32_t *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 	uint32_t *index;
   943 	int last;
   944 };
   945 
   946 struct razor_package_iterator *
   947 razor_package_iterator_create_with_index(struct razor_set *set,
   948 					 uint32_t *index)
   949 {
   950 	struct razor_package_iterator *pi;
   951 
   952 	pi = zalloc(sizeof *pi);
   953 	pi->set = set;
   954 	pi->end = set->packages.data + set->packages.size;
   955 	pi->package = set->packages.data;
   956 	pi->index = index;
   957 
   958 	return pi;
   959 }
   960 
   961 struct razor_package_iterator *
   962 razor_package_iterator_create(struct razor_set *set)
   963 {
   964 	return razor_package_iterator_create_with_index(set, NULL);
   965 }
   966 
   967 struct razor_package_iterator *
   968 razor_package_iterator_create_for_property(struct razor_set *set,
   969 					   struct razor_property *property)
   970 {
   971 	uint32_t *index;
   972 
   973 	if (property->packages & RAZOR_IMMEDIATE)
   974 		index = &property->packages;
   975 	else
   976 		index = (uint32_t *)
   977 			set->package_pool.data + property->packages;
   978 
   979 	return razor_package_iterator_create_with_index(set, index);
   980 }
   981 
   982 int
   983 razor_package_iterator_next(struct razor_package_iterator *pi,
   984 			    struct razor_package **package,
   985 			    const char **name, const char **version)
   986 {
   987 	char *pool;
   988 	int valid;
   989 	struct razor_package *p, *packages;
   990 
   991 	if (pi->index) {
   992 		packages = pi->set->packages.data;
   993 		p = &packages[*pi->index & RAZOR_ENTRY_MASK];
   994 		valid = !pi->last;
   995 		pi->last = (*pi->index++ & RAZOR_IMMEDIATE) != 0;
   996 	} else {
   997 		p = pi->package++;
   998 		valid = p < pi->end;
   999 	}			
  1000 
  1001 	if (valid) {
  1002 		pool = pi->set->string_pool.data;
  1003 		*package = p;
  1004 		*name = &pool[p->name & RAZOR_ENTRY_MASK];
  1005 		*version = &pool[p->version];
  1006 	} else {
  1007 		*package = NULL;
  1008 	}
  1009 
  1010 	return valid;
  1011 }
  1012 
  1013 void
  1014 razor_package_iterator_destroy(struct razor_package_iterator *pi)
  1015 {
  1016 	free(pi);
  1017 }
  1018 
  1019 struct razor_package *
  1020 razor_set_get_package(struct razor_set *set, const char *package)
  1021 {
  1022 	struct razor_package_iterator *pi;
  1023 	struct razor_package *p;
  1024 	const char *name, *version;
  1025 
  1026 	pi = razor_package_iterator_create(set);
  1027 	while (razor_package_iterator_next(pi, &p, &name, &version)) {
  1028 		if (strcmp(package, name) == 0)
  1029 			break;
  1030 	}
  1031 	razor_package_iterator_destroy(pi);
  1032 
  1033 	return p;
  1034 }
  1035 
  1036 struct razor_property_iterator {
  1037 	struct razor_set *set;
  1038 	struct razor_property *property, *end;
  1039 	uint32_t *index;
  1040 	int last;
  1041 };
  1042 
  1043 struct razor_property_iterator *
  1044 razor_property_iterator_create(struct razor_set *set,
  1045 			       struct razor_package *package)
  1046 {
  1047 	struct razor_property_iterator *pi;
  1048 
  1049 	pi = zalloc(sizeof *pi);
  1050 	pi->set = set;
  1051 	pi->end = set->properties.data + set->properties.size;
  1052 	pi->property = set->properties.data;
  1053 
  1054 	if (package)
  1055 		pi->index = (uint32_t *)
  1056 			set->property_pool.data + package->properties;
  1057 
  1058 	return pi;
  1059 }
  1060 
  1061 int
  1062 razor_property_iterator_next(struct razor_property_iterator *pi,
  1063 			     struct razor_property **property,
  1064 			     const char **name, const char **version,
  1065 			     enum razor_property_type *type)
  1066 {
  1067 	char *pool;
  1068 	int valid;
  1069 	struct razor_property *p, *properties;
  1070 
  1071 	if (pi->index) {
  1072 		properties = pi->set->properties.data;
  1073 		p = &properties[*pi->index & RAZOR_ENTRY_MASK];
  1074 		valid = !pi->last;
  1075 		pi->last = (*pi->index++ & RAZOR_IMMEDIATE) != 0;
  1076 	} else {
  1077 		p = pi->property++;
  1078 		valid = p < pi->end;
  1079 	}			
  1080 
  1081 	if (valid) {
  1082 		pool = pi->set->string_pool.data;
  1083 		*property = p;
  1084 		*name = &pool[p->name & RAZOR_ENTRY_MASK];
  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, const char *version, int type)
  1447 {
  1448 	struct razor_property *p;
  1449 
  1450 	p = array_add(&merger->set->properties, sizeof *p);
  1451 	p->name = hashtable_tokenize(&merger->table, name) | (type << 30);
  1452 	p->version = hashtable_tokenize(&merger->table, version);
  1453 
  1454 	return p - (struct razor_property *) merger->set->properties.data;
  1455 }
  1456 
  1457 static void
  1458 merge_properties(struct razor_merger *merger)
  1459 {
  1460 	struct razor_property *p1, *p2;
  1461 	struct razor_set *set1, *set2;
  1462 	uint32_t *map1, *map2;
  1463 	int i, j, cmp, count1, count2;
  1464 	char *pool1, *pool2;
  1465 
  1466 	set1 = merger->source1.set;
  1467 	set2 = merger->source2.set;
  1468 	map1 = merger->source1.property_map;
  1469 	map2 = merger->source2.property_map;
  1470 
  1471 	i = 0;
  1472 	j = 0;
  1473 	pool1 = set1->string_pool.data;
  1474 	pool2 = set2->string_pool.data;
  1475 
  1476 	count1 = set1->properties.size / sizeof *p1;
  1477 	count2 = set2->properties.size / sizeof *p2;
  1478 	while (i < count1 || j < count2) {
  1479 		if (i < count1 && map1[i] == 0) {
  1480 			i++;
  1481 			continue;
  1482 		}
  1483 		if (j < count2 && map2[j] == 0) {
  1484 			j++;
  1485 			continue;
  1486 		}
  1487 		p1 = (struct razor_property *) set1->properties.data + i;
  1488 		p2 = (struct razor_property *) set2->properties.data + j;
  1489 		if (i < count1 && j < count2)
  1490 			cmp = strcmp(&pool1[p1->name & RAZOR_ENTRY_MASK],
  1491 				     &pool2[p2->name & RAZOR_ENTRY_MASK]);
  1492 		else if (i < count1)
  1493 			cmp = -1;
  1494 		else
  1495 			cmp = 1;
  1496 		if (cmp == 0)
  1497 			cmp = versioncmp(&pool1[p1->version],
  1498 					 &pool2[p2->version]);
  1499 		if (cmp < 0) {
  1500 			map1[i++] = add_property(merger,
  1501 						 &pool1[p1->name & RAZOR_ENTRY_MASK],
  1502 						 &pool1[p1->version],
  1503 						 (p1->name >> 30));
  1504 		} else if (cmp > 0) {
  1505 			map2[j++] = add_property(merger,
  1506 						 &pool2[p2->name & RAZOR_ENTRY_MASK],
  1507 						 &pool2[p2->version],
  1508 						 (p2->name >> 30));
  1509 		} else  {
  1510 			map1[i++] = map2[j++] = add_property(merger,
  1511 							     &pool1[p1->name & RAZOR_ENTRY_MASK],
  1512 							     &pool1[p1->version],
  1513 							     (p1->name >> 30));
  1514 		}
  1515 	}
  1516 }
  1517 
  1518 static uint32_t
  1519 emit_properties(struct array *source_pool, uint32_t index,
  1520 		uint32_t *map, struct array *pool)
  1521 {
  1522 	uint32_t r, *p, *q;
  1523 
  1524 	r = pool->size / sizeof *q;
  1525 	p = (uint32_t *) source_pool->data + index;
  1526 	while (1) {
  1527 		q = array_add(pool, sizeof *q);
  1528 		*q = map[*p & RAZOR_ENTRY_MASK] | (*p & ~RAZOR_ENTRY_MASK);
  1529 		if (*p++ & RAZOR_ENTRY_LAST)
  1530 			break;
  1531 	}
  1532 
  1533 	return r;
  1534 }
  1535 	
  1536 /* Rebuild property->packages maps.  We can't just remap these, as a
  1537  * property may have lost or gained a number of packages.  Allocate an
  1538  * array per property and loop through the packages and add them to
  1539  * the arrays for their properties. */
  1540 static void
  1541 rebuild_package_lists(struct razor_set *set)
  1542 {
  1543 	struct array *pkgs, *a;
  1544 	struct razor_package *pkg, *pkg_end;
  1545 	struct razor_property *prop, *prop_end;
  1546 	uint32_t *r, *q, *pool;
  1547 	int count;
  1548 
  1549 	count = set->properties.size / sizeof (struct razor_property);
  1550 	pkgs = zalloc(count * sizeof *pkgs);
  1551 	pkg_end = set->packages.data + set->packages.size;
  1552 	pool = set->property_pool.data;
  1553 
  1554 	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
  1555 		for (r = &pool[pkg->properties]; ; r++) {
  1556 			q = array_add(&pkgs[*r & RAZOR_ENTRY_MASK], sizeof *q);
  1557 			*q = pkg - (struct razor_package *) set->packages.data;
  1558 			if (*r & RAZOR_IMMEDIATE)
  1559 				break;
  1560 		}
  1561 	}
  1562 
  1563 	prop_end = set->properties.data + set->properties.size;
  1564 	a = pkgs;
  1565 	for (prop = set->properties.data; prop < prop_end; prop++, a++) {
  1566 		if (a->size / sizeof *r == 1) {
  1567 			r = a->data;
  1568 			prop->packages = *r | RAZOR_IMMEDIATE;
  1569 		} else {
  1570 			prop->packages =
  1571 				add_to_property_pool(&set->property_pool, a);
  1572 		}
  1573 		array_release(a);
  1574 	}
  1575 	free(pkgs);
  1576 }
  1577 
  1578 struct razor_set *
  1579 razor_merger_finish(struct razor_merger *merger)
  1580 {
  1581 	struct razor_set *result;
  1582 
  1583 	result = merger->set;
  1584 	hashtable_release(&merger->table);
  1585 	free(merger);
  1586 
  1587 	return result;
  1588 }
  1589 
  1590 /* Add packages from 'upstream' to 'set'.  The packages to add are
  1591  * specified by the 'packages' array, which is a sorted list of
  1592  * package indexes.  Returns a newly allocated package set.  Does not
  1593  * enforce validity of the resulting package set.
  1594  *
  1595  * This looks more complicated than it is.  An easy way to merge two
  1596  * package sets would be to just use a razor_importer, but that
  1597  * requires resorting, and is thus O(n log n).  We can do this in a
  1598  * linear sweep, but it gets a little more complicated.
  1599  */
  1600 struct razor_set *
  1601 razor_set_add(struct razor_set *set, struct razor_set *upstream,
  1602 	      struct array *packages)
  1603 {
  1604 	struct razor_merger *merger;
  1605 	struct razor_package *p, *pend;
  1606 
  1607 	merger = razor_merger_create(set, upstream);
  1608 
  1609 	merge_packages(merger, packages);
  1610 
  1611 	/* As we built the package list, we filled out a bitvector of
  1612 	 * the properties that are referenced by the packages in the
  1613 	 * new set.  Now we do a parallel loop through the properties
  1614 	 * and emit those marked in the bit vector to the new set.  In
  1615 	 * the process, we update the bit vector to actually map from
  1616 	 * indices in the old property list to indices in the new
  1617 	 * property list for both sets. */
  1618 
  1619 	merge_properties(merger);
  1620 
  1621 	/* Now we loop through the packages again and emit the
  1622 	 * property lists, remapped to point to the new properties. */
  1623 
  1624 	pend = merger->set->packages.data + merger->set->packages.size;
  1625 	for (p = merger->set->packages.data; p < pend; p++) {
  1626 		struct source *src;
  1627 
  1628 		if (p->name & UPSTREAM_SOURCE)
  1629 			src = &merger->source2;
  1630 		else
  1631 			src = &merger->source1;
  1632 
  1633 		p->properties = emit_properties(&src->set->property_pool,
  1634 						p->properties,
  1635 						src->property_map,
  1636 						&merger->set->property_pool);
  1637 		p->name &= INDEX_MASK;
  1638 	}
  1639 
  1640 	rebuild_package_lists(merger->set);
  1641 
  1642 	return razor_merger_finish(merger);
  1643 }
  1644 
  1645 void
  1646 razor_set_satisfy(struct razor_set *set, struct array *unsatisfied,
  1647 		  struct razor_set *upstream, struct array *list)
  1648 {
  1649 	struct razor_property *requires, *r;
  1650 	struct razor_property *p, *pend;
  1651 	uint32_t *u, *end, *pkg, *package_pool;
  1652 	char *pool, *upool;
  1653 
  1654 	end = unsatisfied->data + unsatisfied->size;
  1655 	requires = set->properties.data;
  1656 	pool = set->string_pool.data;
  1657 
  1658 	p = upstream->properties.data;
  1659 	pend = upstream->properties.data + upstream->properties.size;
  1660 	upool = upstream->string_pool.data;
  1661 	package_pool = upstream->package_pool.data;
  1662 
  1663 	for (u = unsatisfied->data; u < end; u++) {
  1664 		r = requires + *u;
  1665 
  1666 		while (p < pend &&
  1667 		       strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
  1668 			      &upool[p->name & RAZOR_ENTRY_MASK]) > 0 &&
  1669 		       (p->name >> 30) != RAZOR_PROPERTY_PROVIDES)
  1670 			p++;
  1671 		/* If there is more than one version of a provides,
  1672 		 * seek to the end for the highest version. */
  1673 		while (p + 1 < pend && p->name == (p + 1)->name)
  1674 			p++;
  1675 
  1676 		if (p == pend ||
  1677 		    strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
  1678 			   &upool[p->name & RAZOR_ENTRY_MASK]) != 0 ||
  1679 		    versioncmp(&pool[r->version], &upool[p->version]) > 0) {
  1680 			/* Do we need to track unsatisfiable requires
  1681 			 * as we go, or should we just do a
  1682 			 * razor_set_validate() at the end? */
  1683 		} else {
  1684 			pkg = array_add(list, sizeof *pkg);
  1685 			/* We just pull in the first package that provides */
  1686 			if (p->packages & RAZOR_IMMEDIATE)
  1687 				*pkg = p->packages & RAZOR_ENTRY_MASK;
  1688 			else
  1689 				*pkg = package_pool[p->packages];
  1690 		}
  1691 	}	
  1692 }
  1693 
  1694 static void
  1695 find_packages(struct razor_set *set,
  1696 	      int count, const char **package_names, struct array *list)
  1697 {
  1698 	struct razor_package_iterator *pi;
  1699 	struct razor_package *p, *packages;
  1700 	const char *name, *version;
  1701 	uint32_t *r;
  1702 	int i;
  1703 
  1704 	packages = (struct razor_package *) set->packages.data;
  1705 	pi = razor_package_iterator_create(set);
  1706 
  1707 	while (razor_package_iterator_next(pi, &p, &name, &version)) {
  1708 		for (i = 0; i < count; i++) {
  1709 			if (strcmp(name, package_names[i]) == 0) {
  1710 				r = array_add(list, sizeof *r);
  1711 				*r = p - packages;
  1712 				break;
  1713 			}
  1714 		}
  1715 	}
  1716 
  1717 	razor_package_iterator_destroy(pi);
  1718 }
  1719 
  1720 static void
  1721 find_all_packages(struct razor_set *set,
  1722 		  struct razor_set *upstream, struct array *list)
  1723 {
  1724 	struct razor_package *p, *u, *pend, *uend;
  1725 	uint32_t *r;
  1726 	char *pool, *upool;
  1727 
  1728 	pend = set->packages.data + set->packages.size;
  1729 	pool = set->string_pool.data;
  1730 	u = upstream->packages.data;
  1731 	uend = upstream->packages.data + upstream->packages.size;
  1732 	upool = upstream->string_pool.data;
  1733 
  1734 	for (p = set->packages.data; p < pend; p++) {
  1735 		while (u < uend && strcmp(&pool[p->name], &upool[u->name]) > 0)
  1736 			u++;
  1737 		if (strcmp(&pool[p->name], &upool[u->name]) == 0) {
  1738 			r = array_add(list, sizeof *r);
  1739 			*r = u - (struct razor_package *) upstream->packages.data;
  1740 		}
  1741 	}
  1742 }
  1743 
  1744 struct razor_set *
  1745 razor_set_update(struct razor_set *set, struct razor_set *upstream,
  1746 		 int count, const char **packages)
  1747 {
  1748 	struct razor_set *new;
  1749 	struct razor_package *upackages;
  1750 	struct array list, unsatisfied;
  1751 	char *pool;
  1752 	uint32_t *u, *end;
  1753 	int total = 0;
  1754 
  1755 	array_init(&list);
  1756 	if (count > 0)
  1757 		find_packages(upstream, count, packages, &list);
  1758 	else
  1759 		find_all_packages(set, upstream, &list);
  1760 
  1761 	end = list.data + list.size;
  1762 	upackages = upstream->packages.data;
  1763 	pool = upstream->string_pool.data;
  1764 	total += list.size / sizeof *u;
  1765 
  1766 	while (list.size > 0) {
  1767 		new = razor_set_add(set, upstream, &list);
  1768 		array_release(&list);
  1769 		razor_set_destroy(set);
  1770 		set = new;
  1771 
  1772 		array_init(&unsatisfied);
  1773 		razor_set_validate(new, &unsatisfied);
  1774 		array_init(&list);
  1775 		razor_set_satisfy(new, &unsatisfied, upstream, &list);
  1776 		array_release(&unsatisfied);
  1777 
  1778 		end = list.data + list.size;
  1779 		upackages = upstream->packages.data;
  1780 		pool = upstream->string_pool.data;
  1781 		total += list.size / sizeof *u;
  1782 	}
  1783 
  1784 	array_release(&list);
  1785 
  1786 	return set;
  1787 }
  1788 
  1789 /* The diff order matters.  We should sort the packages so that a
  1790  * REMOVE of a package comes before the INSTALL, and so that all
  1791  * requires for a package have been installed before the package.
  1792  **/
  1793 
  1794 void
  1795 razor_set_diff(struct razor_set *set, struct razor_set *upstream,
  1796 	       razor_package_callback_t callback, void *data)
  1797 {
  1798 	struct razor_package_iterator *pi1, *pi2;
  1799 	struct razor_package *p1, *p2;
  1800 	const char *name1, *name2, *version1, *version2;
  1801 	int res;
  1802 
  1803 	pi1 = razor_package_iterator_create(set);
  1804 	pi2 = razor_package_iterator_create(upstream);
  1805 
  1806 	razor_package_iterator_next(pi1, &p1, &name1, &version1);
  1807 	razor_package_iterator_next(pi2, &p2, &name2, &version2);
  1808 
  1809 	while (p1 || p2) {
  1810 		if (p1 && p2) {
  1811 			res = strcmp(name1, name2);
  1812 			if (res == 0)
  1813 				res = versioncmp(version1, version2);
  1814 		} else {
  1815 			res = 0;
  1816 		}
  1817 
  1818 		if (p2 == NULL || res < 0)
  1819 			callback(name1, version1, NULL, data);
  1820 		else if (p1 == NULL || res > 0)
  1821 			callback(name2, NULL, version2, data);
  1822 
  1823 		if (p1 != NULL && res <= 0)
  1824 			razor_package_iterator_next(pi1, &p1,
  1825 						    &name1, &version1);
  1826 		if (p2 != NULL && res >= 0)
  1827 			razor_package_iterator_next(pi2, &p2,
  1828 						    &name2, &version2);
  1829 	}
  1830 
  1831 	razor_package_iterator_destroy(pi1);
  1832 	razor_package_iterator_destroy(pi2);
  1833 }