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