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