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

author	Dan Winship <danw@gnome.org>
	Wed Feb 06 13:02:50 2008 -0500 (2008-02-06)
changeset 114	1d54922ff920
parent 113	e408ff1d4a4d
child 115	26edeea5c95a
permissions	-rw-r--r--