razor.c
author Dan Winship <danw@gnome.org>
Wed Feb 06 12:59:27 2008 -0500 (2008-02-06)
changeset 113 e408ff1d4a4d
parent 109 313b0a615c14
child 114 1d54922ff920
permissions -rw-r--r--
pad repo files with 0 bytes, not random memory

so you can do:
./razor import-yum
mv rawhide.repo rawhide.repo.orig
make
./razor import-yum
diff rawhide.repo.orig rawhide.repo

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