Mercurialrazor / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | revisions | annotate | diff | raw
librazor/merger.c
author J. Ali Harlow <ali@juiblex.co.uk>
Thu Jul 02 11:31:03 2009 +0100 (2009-07-02)
changeset 370 a3e288343fe7
parent 359 c9c90315ea24
child 372 6e93e5485947
permissions -rw-r--r--
Support empty scripts 
     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 source source1;

    40 	struct source source2;

    41 };

    42 

    43 struct razor_merger *

    44 razor_merger_create(struct razor_set *set1, struct razor_set *set2)

    45 {

    46 	struct razor_merger *merger;

    47 	int count;

    48 	size_t size;

    49 

    50 	merger = zalloc(sizeof *merger);

    51 	merger->set = razor_set_create();

    52 	hashtable_init(&merger->table, &merger->set->string_pool);

    53 	hashtable_init(&merger->file_table, &merger->set->file_string_pool);

    54 

    55 	merger->source1.set = set1;

    56 	count = set1->properties.size / sizeof (struct razor_property);

    57 	size = count * sizeof merger->source1.property_map[0];

    58 	merger->source1.property_map = zalloc(size);

    59 	count = set1->files.size / sizeof (struct razor_entry);

    60 	size = count * sizeof merger->source1.file_map[0];

    61 	merger->source1.file_map = zalloc(size);

    62 

    63 	merger->source2.set = set2;

    64 	count = set2->properties.size / sizeof (struct razor_property);

    65 	size = count * sizeof merger->source2.property_map[0];

    66 	merger->source2.property_map = zalloc(size);

    67 	count = set2->files.size / sizeof (struct razor_entry);

    68 	size = count * sizeof merger->source2.file_map[0];

    69 	merger->source2.file_map = zalloc(size);

    70 

    71 	return merger;

    72 }

    73 

    74 void

    75 razor_merger_add_package(struct razor_merger *merger,

    76 			 struct razor_package *package)

    77 {

    78 	char *pool;

    79 	struct list *r;

    80 	struct razor_package *p;

    81 	struct razor_set *set1;

    82 	struct source *source;

    83 	uint32_t flags;

    84 

    85 	assert(merger->committed == 0);

    86 

    87 	set1 = merger->source1.set;

    88 	if (set1->packages.data <= (void *) package &&

    89 	    (void *) package < set1->packages.data + set1->packages.size) {

    90 		source = &merger->source1;

    91 		flags = 0;

    92 	} else {

    93 		source = &merger->source2;

    94 		flags = UPSTREAM_SOURCE;

    95 	}

    96 

    97 	pool = source->set->string_pool.data;

    98 	p = array_add(&merger->set->packages, sizeof *p);

    99 	p->name = hashtable_tokenize(&merger->table, &pool[package->name]);

   100 	p->flags = flags;

   101 	p->version = hashtable_tokenize(&merger->table,

   102 					&pool[package->version]);

   103 	p->arch = hashtable_tokenize(&merger->table,

   104 				     &pool[package->arch]);

   105 

   106 	p->properties = package->properties;

   107 	r = list_first(&package->properties, &source->set->property_pool);

   108 	while (r) {

   109 		source->property_map[r->data] = 1;

   110 		r = list_next(r);

   111 	}

   112 

   113 	p->files = package->files;

   114 	r = list_first(&package->files, &source->set->file_pool);

   115 	while (r) {

   116 		source->file_map[r->data] = 1;

   117 		r = list_next(r);

   118 	}

   119 

   120 	p->preun.program = hashtable_tokenize(&merger->table,

   121 					      &pool[package->preun.program]);

   122 	p->preun.body = hashtable_tokenize(&merger->table,

   123 					   &pool[package->preun.body]);

   124 	p->postun.program = hashtable_tokenize(&merger->table,

   125 					       &pool[package->postun.program]);

   126 	p->postun.body = hashtable_tokenize(&merger->table,

   127 					    &pool[package->postun.body]);

   128 }

   129 

   130 static uint32_t

   131 add_property(struct razor_merger *merger,

   132 	     const char *name, uint32_t flags, const char *version)

   133 {

   134 	struct razor_property *p;

   135 

   136 	p = array_add(&merger->set->properties, sizeof *p);

   137 	p->name = hashtable_tokenize(&merger->table, name);

   138 	p->flags = flags;

   139 	p->version = hashtable_tokenize(&merger->table, version);

   140 

   141 	return p - (struct razor_property *) merger->set->properties.data;

   142 }

   143 

   144 static void

   145 merge_properties(struct razor_merger *merger)

   146 {

   147 	struct razor_property *p1, *p2;

   148 	struct razor_set *set1, *set2;

   149 	uint32_t *map1, *map2;

   150 	int i, j, cmp, count1, count2;

   151 	char *pool1, *pool2;

   152 

   153 	set1 = merger->source1.set;

   154 	set2 = merger->source2.set;

   155 	map1 = merger->source1.property_map;

   156 	map2 = merger->source2.property_map;

   157 

   158 	i = 0;

   159 	j = 0;

   160 	pool1 = set1->string_pool.data;

   161 	pool2 = set2->string_pool.data;

   162 

   163 	count1 = set1->properties.size / sizeof *p1;

   164 	count2 = set2->properties.size / sizeof *p2;

   165 	while (i < count1 || j < count2) {

   166 		if (i < count1 && map1[i] == 0) {

   167 			i++;

   168 			continue;

   169 		}

   170 		if (j < count2 && map2[j] == 0) {

   171 			j++;

   172 			continue;

   173 		}

   174 		p1 = (struct razor_property *) set1->properties.data + i;

   175 		p2 = (struct razor_property *) set2->properties.data + j;

   176 		if (i < count1 && j < count2)

   177 			cmp = strcmp(&pool1[p1->name], &pool2[p2->name]);

   178 		else if (i < count1)

   179 			cmp = -1;

   180 		else

   181 			cmp = 1;

   182 		if (cmp == 0)

   183 			cmp = p1->flags - p2->flags;

   184 		if (cmp == 0)

   185 			cmp = razor_versioncmp(&pool1[p1->version],

   186 					       &pool2[p2->version]);

   187 		if (cmp < 0) {

   188 			map1[i++] = add_property(merger,

   189 						 &pool1[p1->name],

   190 						 p1->flags,

   191 						 &pool1[p1->version]);

   192 		} else if (cmp > 0) {

   193 			map2[j++] = add_property(merger,

   194 						 &pool2[p2->name],

   195 						 p2->flags,

   196 						 &pool2[p2->version]);

   197 		} else  {

   198 			map1[i++] = map2[j++] =

   199 				add_property(merger,

   200 					     &pool1[p1->name],

   201 					     p1->flags,

   202 					     &pool1[p1->version]);

   203 		}

   204 	}

   205 }

   206 

   207 static void

   208 emit_properties(struct list_head *properties, struct array *source_pool,

   209 		uint32_t *map, struct array *pool)

   210 {

   211 	uint32_t r;

   212 	struct list *p, *q;

   213 

   214 	r = pool->size / sizeof *q;

   215 	p = list_first(properties, source_pool);

   216 	while (p) {

   217 		q = array_add(pool, sizeof *q);

   218 		q->data = map[p->data];

   219 		q->flags = p->flags;

   220 		p = list_next(p);

   221 	}

   222 

   223 	list_set_ptr(properties, r);

   224 }

   225 

   226 static uint32_t

   227 add_file(struct razor_merger *merger, const char *name)

   228 {

   229 	struct razor_entry *e;

   230 

   231 	e = array_add(&merger->set->files, sizeof *e);

   232 	e->name = hashtable_tokenize(&merger->file_table, name);

   233 	e->flags = 0;

   234 	e->start = 0;

   235 

   236 	return e - (struct razor_entry *)merger->set->files.data;

   237 }

   238 

   239 /* FIXME. Blah */

   240 static int

   241 fix_file_map(uint32_t *map,

   242 	     struct razor_entry *files,

   243 	     struct razor_entry *top)

   244 {

   245 	uint32_t e;

   246 	int found_file = 0;

   247 

   248 	e = top - files;

   249 	do {

   250 		if (files[e].start &&

   251 		    fix_file_map(map, files, &files[files[e].start]))

   252 			map[e] = 1;

   253 		if (map[e])

   254 			found_file = 1;

   255 	} while (!(files[e++].flags & RAZOR_ENTRY_LAST));

   256 

   257 	return found_file;

   258 }

   259 

   260 struct merge_directory {

   261 	uint32_t merged, dir1, dir2;

   262 };

   263 

   264 static void

   265 merge_one_directory(struct razor_merger *merger, struct merge_directory *md)

   266 {

   267 	struct razor_entry *root1, *root2, *mroot, *e1, *e2;

   268 	struct razor_set *set1, *set2;

   269 	struct array merge_stack;

   270 	struct merge_directory *child_md, *end_md;

   271 	uint32_t *map1, *map2, start, last;

   272 	int cmp;

   273 	char *pool1, *pool2;

   274 

   275 	set1 = merger->source1.set;

   276 	set2 = merger->source2.set;

   277 	map1 = merger->source1.file_map;

   278 	map2 = merger->source2.file_map;

   279 	pool1 = set1->file_string_pool.data;

   280 	pool2 = set2->file_string_pool.data;

   281 	root1 = (struct razor_entry *) set1->files.data;

   282 	root2 = (struct razor_entry *) set2->files.data;

   283 

   284 	array_init(&merge_stack);

   285 

   286 	start = merger->set->files.size / sizeof (struct razor_entry);

   287 	last = 0xFFFFFFFF;

   288 	e1 = md->dir1 != 0xFFFFFFFF ? root1 + md->dir1 : NULL;

   289 	e2 = md->dir2 != 0xFFFFFFFF ? root2 + md->dir2 : NULL;

   290 	while (e1 || e2) {

   291 		if (!e2 && !map1[e1 - root1]) {

   292 			if ((e1++)->flags & RAZOR_ENTRY_LAST)

   293 				e1 = NULL;

   294 			continue;

   295 		}

   296 		if (!e1 && !map2[e2 - root2]) {

   297 			if ((e2++)->flags & RAZOR_ENTRY_LAST)

   298 				e2 = NULL;

   299 			continue;

   300 		}

   301 		if (e1 && !map1[e1 - root1] &&

   302 		    e2 && !map2[e2 - root2]) {

   303 			if ((e1++)->flags & RAZOR_ENTRY_LAST)

   304 				e1 = NULL;

   305 			if ((e2++)->flags & RAZOR_ENTRY_LAST)

   306 				e2 = NULL;

   307 			continue;

   308 		}

   309 

   310 		if (!e1)

   311 			cmp = 1;

   312 		else if (!e2)

   313 			cmp = -1;

   314 		else {

   315 			cmp = strcmp (&pool1[e1->name],

   316 				      &pool2[e2->name]);

   317 		}

   318 

   319 		if (cmp < 0) {

   320 			if (map1[e1 - root1]) {

   321 				map1[e1 - root1] = last =

   322 					add_file(merger, &pool1[e1->name]);

   323 				if (e1->start) {

   324 					child_md = array_add(&merge_stack, sizeof (struct merge_directory));

   325 					child_md->merged = last;

   326 					child_md->dir1 = e1->start;

   327 					child_md->dir2 = 0xFFFFFFFF;

   328 				}

   329 			}

   330 			if ((e1++)->flags & RAZOR_ENTRY_LAST)

   331 				e1 = NULL;

   332 		} else if (cmp > 0) {

   333 			if (map2[e2 - root2]) {

   334 				map2[e2 - root2] = last =

   335 					add_file(merger, &pool2[e2->name]);

   336 				if (e2->start) {

   337 					child_md = array_add(&merge_stack, sizeof (struct merge_directory));

   338 					child_md->merged = last;

   339 					child_md->dir1 = 0xFFFFFFFF;

   340 					child_md->dir2 = e2->start;

   341 				}

   342 			}

   343 			if ((e2++)->flags & RAZOR_ENTRY_LAST)

   344 				e2 = NULL;

   345 		} else {

   346 			map1[e1 - root1] = map2[e2- root2] = last =

   347 				add_file(merger, &pool1[e1->name]);

   348 			if (e1->start || e2->start) {

   349 				child_md = array_add(&merge_stack, sizeof (struct merge_directory));

   350 				child_md->merged = last;

   351 				child_md->dir1 = e1->start ? e1->start : 0xFFFFFFFF;

   352 				child_md->dir2 = e2->start ? e2->start : 0xFFFFFFFF;

   353 			}

   354 			if ((e1++)->flags & RAZOR_ENTRY_LAST)

   355 				e1 = NULL;

   356 			if ((e2++)->flags & RAZOR_ENTRY_LAST)

   357 				e2 = NULL;

   358 		}

   359 	}

   360 

   361 	mroot = (struct razor_entry *)merger->set->files.data;

   362 	if (last != 0xFFFFFFFF) {

   363 		mroot[last].flags = RAZOR_ENTRY_LAST;

   364 		mroot[md->merged].start = start;

   365 	}

   366 

   367 	end_md = merge_stack.data + merge_stack.size;

   368 	for (child_md = merge_stack.data; child_md < end_md; child_md++)

   369 		merge_one_directory(merger, child_md);

   370 	array_release(&merge_stack);

   371 }

   372 

   373 static void

   374 merge_files(struct razor_merger *merger)

   375 {

   376 	struct razor_entry *root;

   377 	struct merge_directory md;

   378 	uint32_t *map1, *map2;

   379 

   380 	map1 = merger->source1.file_map;

   381 	map2 = merger->source2.file_map;

   382 

   383 	md.merged = 0;

   384 

   385 	if (merger->source1.set->files.size) {

   386 		root = (struct razor_entry *) merger->source1.set->files.data;

   387 		if (root->start)

   388 			fix_file_map(map1, root, root);

   389 		md.dir1 = 0;

   390 	} else {

   391 		md.dir1 = 0xFFFFFFFF;

   392 	}

   393 

   394 	if (merger->source2.set->files.size) {

   395 		root = (struct razor_entry *) merger->source2.set->files.data;

   396 		if (root->start)

   397 			fix_file_map(map2, root, root);

   398 		md.dir2 = 0;

   399 	} else {

   400 		md.dir2 = 0xFFFFFFFF;

   401 	}

   402 

   403 	/* Remove the unnamed root which razor_set_create() added */

   404 	array_release(&merger->set->files);

   405 	array_init(&merger->set->files);

   406 

   407 	merge_one_directory(merger, &md);

   408 }

   409 

   410 static void

   411 emit_files(struct list_head *files, struct array *source_pool,

   412 	   uint32_t *map, struct array *pool)

   413 {

   414 	uint32_t r;

   415 	struct list *p, *q;

   416 

   417 	r = pool->size / sizeof *q;

   418 	p = list_first(files, source_pool);

   419 	while (p) {

   420 		q = array_add(pool, sizeof *q);

   421 		q->data = map[p->data];

   422 		q->flags = p->flags;

   423 		p = list_next(p);

   424 	}

   425 

   426 	list_set_ptr(files, r);

   427 }

   428 

   429 /* Rebuild property->packages maps.  We can't just remap these, as a

   430  * property may have lost or gained a number of packages.  Allocate an

   431  * array per property and loop through the packages and add them to

   432  * the arrays for their properties. */

   433 static void

   434 rebuild_property_package_lists(struct razor_set *set)

   435 {

   436 	struct array *pkgs, *a;

   437 	struct razor_package *pkg, *pkg_end;

   438 	struct razor_property *prop, *prop_end;

   439 	struct list *r;

   440 	uint32_t *q;

   441 	int count;

   442 

   443 	count = set->properties.size / sizeof (struct razor_property);

   444 	pkgs = zalloc(count * sizeof *pkgs);

   445 	pkg_end = set->packages.data + set->packages.size;

   446 

   447 	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {

   448 		r = list_first(&pkg->properties, &set->property_pool);

   449 		while (r) {

   450 			q = array_add(&pkgs[r->data], sizeof *q);

   451 			*q = pkg - (struct razor_package *) set->packages.data;

   452 			r = list_next(r);

   453 		}

   454 	}

   455 

   456 	prop_end = set->properties.data + set->properties.size;

   457 	a = pkgs;

   458 	for (prop = set->properties.data; prop < prop_end; prop++, a++) {

   459 		list_set_array(&prop->packages, &set->package_pool, a, 0);

   460 		array_release(a);

   461 	}

   462 	free(pkgs);

   463 }

   464 

   465 static void

   466 rebuild_file_package_lists(struct razor_set *set)

   467 {

   468 	struct array *pkgs, *a;

   469 	struct razor_package *pkg, *pkg_end;

   470 	struct razor_entry *entry, *entry_end;

   471 	struct list *r;

   472 	uint32_t *q;

   473 	int count;

   474 

   475 	count = set->files.size / sizeof (struct razor_entry);

   476 	pkgs = zalloc(count * sizeof *pkgs);

   477 	pkg_end = set->packages.data + set->packages.size;

   478 

   479 	for (pkg = set->packages.data; pkg < pkg_end; pkg++) {

   480 		r = list_first(&pkg->files, &set->file_pool);

   481 		while (r) {

   482 			q = array_add(&pkgs[r->data], sizeof *q);

   483 			*q = pkg - (struct razor_package *) set->packages.data;

   484 			r = list_next(r);

   485 		}

   486 	}

   487 

   488 	entry_end = set->files.data + set->files.size;

   489 	a = pkgs;

   490 	for (entry = set->files.data; entry < entry_end; entry++, a++) {

   491 		list_set_array(&entry->packages, &set->package_pool, a, 0);

   492 		array_release(a);

   493 	}

   494 	free(pkgs);

   495 }

   496 

   497 struct razor_set *

   498 razor_merger_commit(struct razor_merger *merger)

   499 {

   500 	struct razor_package *p, *pend;

   501 

   502 	/* As we built the package list, we filled out a bitvector of

   503 	 * the properties that are referenced by the packages in the

   504 	 * new set.  Now we do a parallel loop through the properties

   505 	 * and emit those marked in the bit vector to the new set.  In

   506 	 * the process, we update the bit vector to actually map from

   507 	 * indices in the old property list to indices in the new

   508 	 * property list for both sets. */

   509 

   510 	merge_properties(merger);

   511 	merge_files(merger);

   512 

   513 	/* Now we loop through the packages again and emit the

   514 	 * property lists, remapped to point to the new properties. */

   515 

   516 	pend = merger->set->packages.data + merger->set->packages.size;

   517 	for (p = merger->set->packages.data; p < pend; p++) {

   518 		struct source *src;

   519 

   520 		if (p->flags & UPSTREAM_SOURCE)

   521 			src = &merger->source2;

   522 		else

   523 			src = &merger->source1;

   524 

   525 		emit_properties(&p->properties,

   526 				&src->set->property_pool,

   527 				src->property_map,

   528 				&merger->set->property_pool);

   529 		emit_files(&p->files,

   530 			   &src->set->file_pool,

   531 			   src->file_map,

   532 			   &merger->set->file_pool);

   533 		p->flags &= ~UPSTREAM_SOURCE;

   534 	}

   535 

   536 	rebuild_property_package_lists(merger->set);

   537 	rebuild_file_package_lists(merger->set);

   538 

   539 	merger->committed = 1;

   540 

   541 	return merger->set;

   542 }

   543 

   544 void

   545 razor_merger_package_add_script(struct razor_merger *merger,

   546 				struct razor_package *package,

   547 				enum razor_property_flags script,

   548 				const char *program, const char *body)

   549 {

   550 	uint32_t p, b;

   551 	char *pool;

   552 	struct razor_set *set = merger->set;

   553 	assert ((void *)package >= set->packages.data && \

   554 	    (void *)package < set->packages.data + set->packages.size);

   555 

   556 	p = hashtable_tokenize(&merger->table, program);

   557 	b = hashtable_tokenize(&merger->table, body);

   558 

   559 	pool = merger->set->string_pool.data;

   560 

   561 	switch (script) {

   562 	case RAZOR_PROPERTY_PREUN:

   563 		assert(pool[package->preun.program] == '\0');

   564 		assert(pool[package->preun.body] == '\0');

   565 		package->preun.program = p;

   566 		package->preun.body = b;

   567 		break;

   568 	case RAZOR_PROPERTY_POSTUN:

   569 		assert(pool[package->postun.program] == '\0');

   570 		assert(pool[package->postun.body] == '\0');

   571 		package->postun.program = p;

   572 		package->postun.body = b;

   573 		break;

   574 	default:

   575 		break;

   576 	}

   577 }

   578 

   579 void razor_merger_destroy(struct razor_merger *merger)

   580 {

   581 	hashtable_release(&merger->table);

   582 	hashtable_release(&merger->file_table);

   583 	free(merger);

   584 }
razor