librazor/merger.c
author ali <j.a.harlow@letterboxes.org>
Thu Jul 09 00:01:18 2009 +0100 (2009-07-09)
changeset 379 590b9e4d837d
parent 369 f8c27fe9fe63
child 394 afe520f454bd
permissions -rw-r--r--
Release version 0.1
krh@248
     1
/*
krh@248
     2
 * Copyright (C) 2008  Kristian Høgsberg <krh@redhat.com>
krh@248
     3
 * Copyright (C) 2008  Red Hat, Inc
ali@369
     4
 * Copyright (C) 2009  J. Ali Harlow <ali@juiblex.co.uk>
krh@248
     5
 *
krh@248
     6
 * This program is free software; you can redistribute it and/or modify
krh@248
     7
 * it under the terms of the GNU General Public License as published by
krh@248
     8
 * the Free Software Foundation; either version 2 of the License, or
krh@248
     9
 * (at your option) any later version.
krh@248
    10
 *
krh@248
    11
 * This program is distributed in the hope that it will be useful,
krh@248
    12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
krh@248
    13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
krh@248
    14
 * GNU General Public License for more details.
krh@248
    15
 *
krh@248
    16
 * You should have received a copy of the GNU General Public License along
krh@248
    17
 * with this program; if not, write to the Free Software Foundation, Inc.,
krh@248
    18
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
krh@248
    19
 */
krh@248
    20
krh@248
    21
#include <string.h>
ali@369
    22
#include <assert.h>
krh@248
    23
#include "razor-internal.h"
krh@248
    24
#include "razor.h"
krh@248
    25
krh@248
    26
#define UPSTREAM_SOURCE 0x80
krh@248
    27
krh@248
    28
struct source {
krh@248
    29
	struct razor_set *set;
krh@248
    30
	uint32_t *property_map;
krh@248
    31
	uint32_t *file_map;
krh@248
    32
};
krh@248
    33
krh@248
    34
struct razor_merger {
ali@369
    35
	int committed;
krh@248
    36
	struct razor_set *set;
krh@248
    37
	struct hashtable table;
ali@348
    38
	struct hashtable file_table;
krh@248
    39
	struct source source1;
krh@248
    40
	struct source source2;
krh@248
    41
};
krh@248
    42
krh@248
    43
struct razor_merger *
krh@248
    44
razor_merger_create(struct razor_set *set1, struct razor_set *set2)
krh@248
    45
{
krh@248
    46
	struct razor_merger *merger;
krh@248
    47
	int count;
krh@248
    48
	size_t size;
krh@248
    49
krh@248
    50
	merger = zalloc(sizeof *merger);
krh@248
    51
	merger->set = razor_set_create();
krh@248
    52
	hashtable_init(&merger->table, &merger->set->string_pool);
ali@348
    53
	hashtable_init(&merger->file_table, &merger->set->file_string_pool);
krh@248
    54
krh@248
    55
	merger->source1.set = set1;
krh@248
    56
	count = set1->properties.size / sizeof (struct razor_property);
krh@248
    57
	size = count * sizeof merger->source1.property_map[0];
krh@248
    58
	merger->source1.property_map = zalloc(size);
krh@248
    59
	count = set1->files.size / sizeof (struct razor_entry);
krh@248
    60
	size = count * sizeof merger->source1.file_map[0];
krh@248
    61
	merger->source1.file_map = zalloc(size);
krh@248
    62
krh@248
    63
	merger->source2.set = set2;
krh@248
    64
	count = set2->properties.size / sizeof (struct razor_property);
krh@248
    65
	size = count * sizeof merger->source2.property_map[0];
krh@248
    66
	merger->source2.property_map = zalloc(size);
krh@248
    67
	count = set2->files.size / sizeof (struct razor_entry);
krh@248
    68
	size = count * sizeof merger->source2.file_map[0];
krh@248
    69
	merger->source2.file_map = zalloc(size);
krh@248
    70
krh@248
    71
	return merger;
krh@248
    72
}
krh@248
    73
krh@248
    74
void
krh@248
    75
razor_merger_add_package(struct razor_merger *merger,
krh@248
    76
			 struct razor_package *package)
krh@248
    77
{
ali@372
    78
	char *pool, *s;
krh@248
    79
	struct list *r;
krh@248
    80
	struct razor_package *p;
krh@248
    81
	struct razor_set *set1;
krh@248
    82
	struct source *source;
ali@372
    83
	uint32_t flags, *prefix;
ali@372
    84
	struct array install_prefixes;
krh@248
    85
ali@369
    86
	assert(merger->committed == 0);
ali@369
    87
krh@248
    88
	set1 = merger->source1.set;
krh@248
    89
	if (set1->packages.data <= (void *) package &&
krh@248
    90
	    (void *) package < set1->packages.data + set1->packages.size) {
krh@248
    91
		source = &merger->source1;
krh@248
    92
		flags = 0;
krh@248
    93
	} else {
krh@248
    94
		source = &merger->source2;
krh@248
    95
		flags = UPSTREAM_SOURCE;
krh@248
    96
	}
krh@248
    97
krh@248
    98
	pool = source->set->string_pool.data;
krh@248
    99
	p = array_add(&merger->set->packages, sizeof *p);
krh@248
   100
	p->name = hashtable_tokenize(&merger->table, &pool[package->name]);
krh@248
   101
	p->flags = flags;
krh@248
   102
	p->version = hashtable_tokenize(&merger->table,
krh@248
   103
					&pool[package->version]);
krh@248
   104
	p->arch = hashtable_tokenize(&merger->table,
krh@248
   105
				     &pool[package->arch]);
krh@248
   106
krh@248
   107
	p->properties = package->properties;
krh@248
   108
	r = list_first(&package->properties, &source->set->property_pool);
krh@248
   109
	while (r) {
krh@248
   110
		source->property_map[r->data] = 1;
krh@248
   111
		r = list_next(r);
krh@248
   112
	}
krh@248
   113
krh@248
   114
	p->files = package->files;
krh@248
   115
	r = list_first(&package->files, &source->set->file_pool);
krh@248
   116
	while (r) {
krh@248
   117
		source->file_map[r->data] = 1;
krh@248
   118
		r = list_next(r);
krh@248
   119
	}
ali@369
   120
ali@372
   121
	array_init(&install_prefixes);
ali@372
   122
	r = list_first(&package->install_prefixes, &source->set->prefix_pool);
ali@372
   123
	while (r) {
ali@372
   124
		s = (char *)source->set->string_pool.data + r->data;
ali@372
   125
		prefix = array_add(&install_prefixes, sizeof *prefix);
ali@372
   126
		*prefix = hashtable_tokenize(&merger->table, s);
ali@372
   127
		r = list_next(r);
ali@372
   128
	}
ali@372
   129
	list_set_array(&p->install_prefixes, &merger->set->prefix_pool,
ali@372
   130
                       &install_prefixes, 0);
ali@372
   131
	array_release(&install_prefixes);
ali@372
   132
ali@369
   133
	p->preun.program = hashtable_tokenize(&merger->table,
ali@369
   134
					      &pool[package->preun.program]);
ali@369
   135
	p->preun.body = hashtable_tokenize(&merger->table,
ali@369
   136
					   &pool[package->preun.body]);
ali@369
   137
	p->postun.program = hashtable_tokenize(&merger->table,
ali@369
   138
					       &pool[package->postun.program]);
ali@369
   139
	p->postun.body = hashtable_tokenize(&merger->table,
ali@369
   140
					    &pool[package->postun.body]);
krh@248
   141
}
krh@248
   142
krh@248
   143
static uint32_t
krh@248
   144
add_property(struct razor_merger *merger,
krh@248
   145
	     const char *name, uint32_t flags, const char *version)
krh@248
   146
{
krh@248
   147
	struct razor_property *p;
krh@248
   148
krh@248
   149
	p = array_add(&merger->set->properties, sizeof *p);
krh@248
   150
	p->name = hashtable_tokenize(&merger->table, name);
krh@248
   151
	p->flags = flags;
krh@248
   152
	p->version = hashtable_tokenize(&merger->table, version);
krh@248
   153
krh@248
   154
	return p - (struct razor_property *) merger->set->properties.data;
krh@248
   155
}
krh@248
   156
krh@248
   157
static void
krh@248
   158
merge_properties(struct razor_merger *merger)
krh@248
   159
{
krh@248
   160
	struct razor_property *p1, *p2;
krh@248
   161
	struct razor_set *set1, *set2;
krh@248
   162
	uint32_t *map1, *map2;
krh@248
   163
	int i, j, cmp, count1, count2;
krh@248
   164
	char *pool1, *pool2;
krh@248
   165
krh@248
   166
	set1 = merger->source1.set;
krh@248
   167
	set2 = merger->source2.set;
krh@248
   168
	map1 = merger->source1.property_map;
krh@248
   169
	map2 = merger->source2.property_map;
krh@248
   170
krh@248
   171
	i = 0;
krh@248
   172
	j = 0;
krh@248
   173
	pool1 = set1->string_pool.data;
krh@248
   174
	pool2 = set2->string_pool.data;
krh@248
   175
krh@248
   176
	count1 = set1->properties.size / sizeof *p1;
krh@248
   177
	count2 = set2->properties.size / sizeof *p2;
krh@248
   178
	while (i < count1 || j < count2) {
krh@248
   179
		if (i < count1 && map1[i] == 0) {
krh@248
   180
			i++;
krh@248
   181
			continue;
krh@248
   182
		}
krh@248
   183
		if (j < count2 && map2[j] == 0) {
krh@248
   184
			j++;
krh@248
   185
			continue;
krh@248
   186
		}
krh@248
   187
		p1 = (struct razor_property *) set1->properties.data + i;
krh@248
   188
		p2 = (struct razor_property *) set2->properties.data + j;
krh@248
   189
		if (i < count1 && j < count2)
krh@248
   190
			cmp = strcmp(&pool1[p1->name], &pool2[p2->name]);
krh@248
   191
		else if (i < count1)
krh@248
   192
			cmp = -1;
krh@248
   193
		else
krh@248
   194
			cmp = 1;
krh@248
   195
		if (cmp == 0)
krh@248
   196
			cmp = p1->flags - p2->flags;
krh@248
   197
		if (cmp == 0)
krh@248
   198
			cmp = razor_versioncmp(&pool1[p1->version],
krh@248
   199
					       &pool2[p2->version]);
krh@248
   200
		if (cmp < 0) {
krh@248
   201
			map1[i++] = add_property(merger,
krh@248
   202
						 &pool1[p1->name],
krh@248
   203
						 p1->flags,
krh@248
   204
						 &pool1[p1->version]);
krh@248
   205
		} else if (cmp > 0) {
krh@248
   206
			map2[j++] = add_property(merger,
krh@248
   207
						 &pool2[p2->name],
krh@248
   208
						 p2->flags,
krh@248
   209
						 &pool2[p2->version]);
krh@248
   210
		} else  {
krh@248
   211
			map1[i++] = map2[j++] =
krh@248
   212
				add_property(merger,
krh@248
   213
					     &pool1[p1->name],
krh@248
   214
					     p1->flags,
krh@248
   215
					     &pool1[p1->version]);
krh@248
   216
		}
krh@248
   217
	}
krh@248
   218
}
krh@248
   219
krh@248
   220
static void
krh@248
   221
emit_properties(struct list_head *properties, struct array *source_pool,
krh@248
   222
		uint32_t *map, struct array *pool)
krh@248
   223
{
krh@248
   224
	uint32_t r;
krh@248
   225
	struct list *p, *q;
krh@248
   226
krh@248
   227
	r = pool->size / sizeof *q;
krh@248
   228
	p = list_first(properties, source_pool);
krh@248
   229
	while (p) {
krh@248
   230
		q = array_add(pool, sizeof *q);
krh@248
   231
		q->data = map[p->data];
krh@248
   232
		q->flags = p->flags;
krh@248
   233
		p = list_next(p);
krh@248
   234
	}
krh@248
   235
krh@248
   236
	list_set_ptr(properties, r);
krh@248
   237
}
krh@248
   238
krh@248
   239
static uint32_t
krh@248
   240
add_file(struct razor_merger *merger, const char *name)
krh@248
   241
{
krh@248
   242
	struct razor_entry *e;
krh@248
   243
krh@248
   244
	e = array_add(&merger->set->files, sizeof *e);
ali@348
   245
	e->name = hashtable_tokenize(&merger->file_table, name);
krh@248
   246
	e->flags = 0;
krh@248
   247
	e->start = 0;
krh@248
   248
krh@248
   249
	return e - (struct razor_entry *)merger->set->files.data;
krh@248
   250
}
krh@248
   251
krh@248
   252
/* FIXME. Blah */
krh@248
   253
static int
krh@248
   254
fix_file_map(uint32_t *map,
krh@248
   255
	     struct razor_entry *files,
krh@248
   256
	     struct razor_entry *top)
krh@248
   257
{
krh@248
   258
	uint32_t e;
krh@248
   259
	int found_file = 0;
krh@248
   260
ali@359
   261
	e = top - files;
krh@248
   262
	do {
ali@359
   263
		if (files[e].start &&
ali@359
   264
		    fix_file_map(map, files, &files[files[e].start]))
ali@359
   265
			map[e] = 1;
krh@248
   266
		if (map[e])
krh@248
   267
			found_file = 1;
krh@248
   268
	} while (!(files[e++].flags & RAZOR_ENTRY_LAST));
krh@248
   269
krh@248
   270
	return found_file;
krh@248
   271
}
krh@248
   272
krh@248
   273
struct merge_directory {
krh@248
   274
	uint32_t merged, dir1, dir2;
krh@248
   275
};
krh@248
   276
krh@248
   277
static void
krh@248
   278
merge_one_directory(struct razor_merger *merger, struct merge_directory *md)
krh@248
   279
{
krh@248
   280
	struct razor_entry *root1, *root2, *mroot, *e1, *e2;
krh@248
   281
	struct razor_set *set1, *set2;
krh@248
   282
	struct array merge_stack;
krh@248
   283
	struct merge_directory *child_md, *end_md;
krh@248
   284
	uint32_t *map1, *map2, start, last;
krh@248
   285
	int cmp;
krh@248
   286
	char *pool1, *pool2;
krh@248
   287
krh@248
   288
	set1 = merger->source1.set;
krh@248
   289
	set2 = merger->source2.set;
krh@248
   290
	map1 = merger->source1.file_map;
krh@248
   291
	map2 = merger->source2.file_map;
krh@313
   292
	pool1 = set1->file_string_pool.data;
krh@313
   293
	pool2 = set2->file_string_pool.data;
krh@248
   294
	root1 = (struct razor_entry *) set1->files.data;
krh@248
   295
	root2 = (struct razor_entry *) set2->files.data;
krh@248
   296
krh@248
   297
	array_init(&merge_stack);
krh@248
   298
krh@248
   299
	start = merger->set->files.size / sizeof (struct razor_entry);
ali@359
   300
	last = 0xFFFFFFFF;
ali@359
   301
	e1 = md->dir1 != 0xFFFFFFFF ? root1 + md->dir1 : NULL;
ali@359
   302
	e2 = md->dir2 != 0xFFFFFFFF ? root2 + md->dir2 : NULL;
krh@248
   303
	while (e1 || e2) {
krh@248
   304
		if (!e2 && !map1[e1 - root1]) {
krh@248
   305
			if ((e1++)->flags & RAZOR_ENTRY_LAST)
krh@248
   306
				e1 = NULL;
krh@248
   307
			continue;
krh@248
   308
		}
krh@248
   309
		if (!e1 && !map2[e2 - root2]) {
krh@248
   310
			if ((e2++)->flags & RAZOR_ENTRY_LAST)
krh@248
   311
				e2 = NULL;
krh@248
   312
			continue;
krh@248
   313
		}
krh@248
   314
		if (e1 && !map1[e1 - root1] &&
krh@314
   315
		    e2 && !map2[e2 - root2]) {
krh@248
   316
			if ((e1++)->flags & RAZOR_ENTRY_LAST)
krh@248
   317
				e1 = NULL;
krh@248
   318
			if ((e2++)->flags & RAZOR_ENTRY_LAST)
krh@248
   319
				e2 = NULL;
krh@248
   320
			continue;
krh@248
   321
		}
krh@248
   322
krh@248
   323
		if (!e1)
krh@248
   324
			cmp = 1;
krh@248
   325
		else if (!e2)
krh@248
   326
			cmp = -1;
krh@248
   327
		else {
krh@248
   328
			cmp = strcmp (&pool1[e1->name],
krh@248
   329
				      &pool2[e2->name]);
krh@248
   330
		}
krh@248
   331
krh@248
   332
		if (cmp < 0) {
krh@248
   333
			if (map1[e1 - root1]) {
krh@248
   334
				map1[e1 - root1] = last =
krh@248
   335
					add_file(merger, &pool1[e1->name]);
krh@248
   336
				if (e1->start) {
krh@248
   337
					child_md = array_add(&merge_stack, sizeof (struct merge_directory));
krh@248
   338
					child_md->merged = last;
krh@248
   339
					child_md->dir1 = e1->start;
ali@359
   340
					child_md->dir2 = 0xFFFFFFFF;
krh@248
   341
				}
krh@248
   342
			}
krh@248
   343
			if ((e1++)->flags & RAZOR_ENTRY_LAST)
krh@248
   344
				e1 = NULL;
krh@248
   345
		} else if (cmp > 0) {
krh@248
   346
			if (map2[e2 - root2]) {
krh@248
   347
				map2[e2 - root2] = last =
krh@248
   348
					add_file(merger, &pool2[e2->name]);
krh@248
   349
				if (e2->start) {
krh@248
   350
					child_md = array_add(&merge_stack, sizeof (struct merge_directory));
krh@248
   351
					child_md->merged = last;
ali@359
   352
					child_md->dir1 = 0xFFFFFFFF;
krh@248
   353
					child_md->dir2 = e2->start;
krh@248
   354
				}
krh@248
   355
			}
krh@248
   356
			if ((e2++)->flags & RAZOR_ENTRY_LAST)
krh@248
   357
				e2 = NULL;
krh@248
   358
		} else {
krh@248
   359
			map1[e1 - root1] = map2[e2- root2] = last =
krh@248
   360
				add_file(merger, &pool1[e1->name]);
krh@248
   361
			if (e1->start || e2->start) {
krh@248
   362
				child_md = array_add(&merge_stack, sizeof (struct merge_directory));
krh@248
   363
				child_md->merged = last;
ali@359
   364
				child_md->dir1 = e1->start ? e1->start : 0xFFFFFFFF;
ali@359
   365
				child_md->dir2 = e2->start ? e2->start : 0xFFFFFFFF;
krh@248
   366
			}
krh@248
   367
			if ((e1++)->flags & RAZOR_ENTRY_LAST)
krh@248
   368
				e1 = NULL;
krh@248
   369
			if ((e2++)->flags & RAZOR_ENTRY_LAST)
krh@248
   370
				e2 = NULL;
krh@248
   371
		}
krh@248
   372
	}
krh@248
   373
krh@248
   374
	mroot = (struct razor_entry *)merger->set->files.data;
ali@359
   375
	if (last != 0xFFFFFFFF) {
krh@248
   376
		mroot[last].flags = RAZOR_ENTRY_LAST;
krh@248
   377
		mroot[md->merged].start = start;
ali@359
   378
	}
krh@248
   379
krh@248
   380
	end_md = merge_stack.data + merge_stack.size;
krh@248
   381
	for (child_md = merge_stack.data; child_md < end_md; child_md++)
krh@248
   382
		merge_one_directory(merger, child_md);
krh@248
   383
	array_release(&merge_stack);
krh@248
   384
}
krh@248
   385
krh@248
   386
static void
krh@248
   387
merge_files(struct razor_merger *merger)
krh@248
   388
{
krh@248
   389
	struct razor_entry *root;
krh@248
   390
	struct merge_directory md;
krh@248
   391
	uint32_t *map1, *map2;
krh@248
   392
krh@248
   393
	map1 = merger->source1.file_map;
krh@248
   394
	map2 = merger->source2.file_map;
krh@248
   395
krh@248
   396
	md.merged = 0;
krh@248
   397
krh@248
   398
	if (merger->source1.set->files.size) {
krh@248
   399
		root = (struct razor_entry *) merger->source1.set->files.data;
krh@248
   400
		if (root->start)
krh@248
   401
			fix_file_map(map1, root, root);
krh@248
   402
		md.dir1 = 0;
ali@359
   403
	} else {
ali@359
   404
		md.dir1 = 0xFFFFFFFF;
ali@359
   405
	}
krh@248
   406
krh@248
   407
	if (merger->source2.set->files.size) {
krh@248
   408
		root = (struct razor_entry *) merger->source2.set->files.data;
krh@248
   409
		if (root->start)
krh@248
   410
			fix_file_map(map2, root, root);
krh@248
   411
		md.dir2 = 0;
ali@359
   412
	} else {
ali@359
   413
		md.dir2 = 0xFFFFFFFF;
ali@359
   414
	}
ali@359
   415
ali@359
   416
	/* Remove the unnamed root which razor_set_create() added */
ali@359
   417
	array_release(&merger->set->files);
ali@359
   418
	array_init(&merger->set->files);
krh@248
   419
krh@248
   420
	merge_one_directory(merger, &md);
krh@248
   421
}
krh@248
   422
krh@248
   423
static void
krh@248
   424
emit_files(struct list_head *files, struct array *source_pool,
krh@248
   425
	   uint32_t *map, struct array *pool)
krh@248
   426
{
krh@248
   427
	uint32_t r;
krh@248
   428
	struct list *p, *q;
krh@248
   429
krh@248
   430
	r = pool->size / sizeof *q;
krh@248
   431
	p = list_first(files, source_pool);
krh@248
   432
	while (p) {
krh@248
   433
		q = array_add(pool, sizeof *q);
krh@248
   434
		q->data = map[p->data];
krh@248
   435
		q->flags = p->flags;
krh@248
   436
		p = list_next(p);
krh@248
   437
	}
krh@248
   438
krh@248
   439
	list_set_ptr(files, r);
krh@248
   440
}
krh@248
   441
krh@248
   442
/* Rebuild property->packages maps.  We can't just remap these, as a
krh@248
   443
 * property may have lost or gained a number of packages.  Allocate an
krh@248
   444
 * array per property and loop through the packages and add them to
krh@248
   445
 * the arrays for their properties. */
krh@248
   446
static void
krh@248
   447
rebuild_property_package_lists(struct razor_set *set)
krh@248
   448
{
krh@248
   449
	struct array *pkgs, *a;
krh@248
   450
	struct razor_package *pkg, *pkg_end;
krh@248
   451
	struct razor_property *prop, *prop_end;
krh@248
   452
	struct list *r;
krh@248
   453
	uint32_t *q;
krh@248
   454
	int count;
krh@248
   455
krh@248
   456
	count = set->properties.size / sizeof (struct razor_property);
krh@248
   457
	pkgs = zalloc(count * sizeof *pkgs);
krh@248
   458
	pkg_end = set->packages.data + set->packages.size;
krh@248
   459
krh@248
   460
	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
krh@248
   461
		r = list_first(&pkg->properties, &set->property_pool);
krh@248
   462
		while (r) {
krh@248
   463
			q = array_add(&pkgs[r->data], sizeof *q);
krh@248
   464
			*q = pkg - (struct razor_package *) set->packages.data;
krh@248
   465
			r = list_next(r);
krh@248
   466
		}
krh@248
   467
	}
krh@248
   468
krh@248
   469
	prop_end = set->properties.data + set->properties.size;
krh@248
   470
	a = pkgs;
krh@248
   471
	for (prop = set->properties.data; prop < prop_end; prop++, a++) {
krh@248
   472
		list_set_array(&prop->packages, &set->package_pool, a, 0);
krh@248
   473
		array_release(a);
krh@248
   474
	}
krh@248
   475
	free(pkgs);
krh@248
   476
}
krh@248
   477
krh@248
   478
static void
krh@248
   479
rebuild_file_package_lists(struct razor_set *set)
krh@248
   480
{
krh@248
   481
	struct array *pkgs, *a;
krh@248
   482
	struct razor_package *pkg, *pkg_end;
krh@248
   483
	struct razor_entry *entry, *entry_end;
krh@248
   484
	struct list *r;
krh@248
   485
	uint32_t *q;
krh@248
   486
	int count;
krh@248
   487
krh@248
   488
	count = set->files.size / sizeof (struct razor_entry);
krh@248
   489
	pkgs = zalloc(count * sizeof *pkgs);
krh@248
   490
	pkg_end = set->packages.data + set->packages.size;
krh@248
   491
krh@248
   492
	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
krh@248
   493
		r = list_first(&pkg->files, &set->file_pool);
krh@248
   494
		while (r) {
krh@248
   495
			q = array_add(&pkgs[r->data], sizeof *q);
krh@248
   496
			*q = pkg - (struct razor_package *) set->packages.data;
krh@248
   497
			r = list_next(r);
krh@248
   498
		}
krh@248
   499
	}
krh@248
   500
krh@248
   501
	entry_end = set->files.data + set->files.size;
krh@248
   502
	a = pkgs;
krh@248
   503
	for (entry = set->files.data; entry < entry_end; entry++, a++) {
krh@248
   504
		list_set_array(&entry->packages, &set->package_pool, a, 0);
krh@248
   505
		array_release(a);
krh@248
   506
	}
krh@248
   507
	free(pkgs);
krh@248
   508
}
krh@248
   509
krh@248
   510
struct razor_set *
ali@369
   511
razor_merger_commit(struct razor_merger *merger)
krh@248
   512
{
krh@248
   513
	struct razor_package *p, *pend;
krh@248
   514
krh@248
   515
	/* As we built the package list, we filled out a bitvector of
krh@248
   516
	 * the properties that are referenced by the packages in the
krh@248
   517
	 * new set.  Now we do a parallel loop through the properties
krh@248
   518
	 * and emit those marked in the bit vector to the new set.  In
krh@248
   519
	 * the process, we update the bit vector to actually map from
krh@248
   520
	 * indices in the old property list to indices in the new
krh@248
   521
	 * property list for both sets. */
krh@248
   522
krh@248
   523
	merge_properties(merger);
krh@248
   524
	merge_files(merger);
krh@248
   525
krh@248
   526
	/* Now we loop through the packages again and emit the
krh@248
   527
	 * property lists, remapped to point to the new properties. */
krh@248
   528
krh@248
   529
	pend = merger->set->packages.data + merger->set->packages.size;
krh@248
   530
	for (p = merger->set->packages.data; p < pend; p++) {
krh@248
   531
		struct source *src;
krh@248
   532
krh@248
   533
		if (p->flags & UPSTREAM_SOURCE)
krh@248
   534
			src = &merger->source2;
krh@248
   535
		else
krh@248
   536
			src = &merger->source1;
krh@248
   537
krh@248
   538
		emit_properties(&p->properties,
krh@248
   539
				&src->set->property_pool,
krh@248
   540
				src->property_map,
krh@248
   541
				&merger->set->property_pool);
krh@248
   542
		emit_files(&p->files,
krh@248
   543
			   &src->set->file_pool,
krh@248
   544
			   src->file_map,
krh@248
   545
			   &merger->set->file_pool);
krh@248
   546
		p->flags &= ~UPSTREAM_SOURCE;
krh@248
   547
	}
krh@248
   548
krh@248
   549
	rebuild_property_package_lists(merger->set);
krh@248
   550
	rebuild_file_package_lists(merger->set);
krh@248
   551
ali@369
   552
	merger->committed = 1;
ali@369
   553
ali@369
   554
	return merger->set;
ali@369
   555
}
ali@369
   556
ali@369
   557
void
ali@369
   558
razor_merger_package_add_script(struct razor_merger *merger,
ali@369
   559
				struct razor_package *package,
ali@369
   560
				enum razor_property_flags script,
ali@369
   561
				const char *program, const char *body)
ali@369
   562
{
ali@369
   563
	uint32_t p, b;
ali@369
   564
	char *pool;
ali@369
   565
	struct razor_set *set = merger->set;
ali@369
   566
	assert ((void *)package >= set->packages.data && \
ali@369
   567
	    (void *)package < set->packages.data + set->packages.size);
ali@369
   568
ali@369
   569
	p = hashtable_tokenize(&merger->table, program);
ali@369
   570
	b = hashtable_tokenize(&merger->table, body);
ali@369
   571
ali@369
   572
	pool = merger->set->string_pool.data;
ali@369
   573
ali@369
   574
	switch (script) {
ali@369
   575
	case RAZOR_PROPERTY_PREUN:
ali@369
   576
		assert(pool[package->preun.program] == '\0');
ali@369
   577
		assert(pool[package->preun.body] == '\0');
ali@369
   578
		package->preun.program = p;
ali@369
   579
		package->preun.body = b;
ali@369
   580
		break;
ali@369
   581
	case RAZOR_PROPERTY_POSTUN:
ali@369
   582
		assert(pool[package->postun.program] == '\0');
ali@369
   583
		assert(pool[package->postun.body] == '\0');
ali@369
   584
		package->postun.program = p;
ali@369
   585
		package->postun.body = b;
ali@369
   586
		break;
ali@369
   587
	default:
ali@369
   588
		break;
ali@369
   589
	}
ali@369
   590
}
ali@369
   591
ali@369
   592
void razor_merger_destroy(struct razor_merger *merger)
ali@369
   593
{
krh@248
   594
	hashtable_release(&merger->table);
ali@348
   595
	hashtable_release(&merger->file_table);
krh@248
   596
	free(merger);
krh@248
   597
}