razor.c
author Dan Winship <danw@gnome.org>
Fri Feb 15 15:08:38 2008 -0500 (2008-02-15)
changeset 124 feef7736a439
parent 123 4e699bd39b40
child 126 3142795705a5
permissions -rw-r--r--
misc fixes for edge cases

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