razor: razor.c@340d92912f49 (annotated)

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

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--