Fix bug causing "razor remove" to quietly fail.
2 * Copyright (C) 2008 Kristian Høgsberg <krh@redhat.com>
3 * Copyright (C) 2008 Red Hat, Inc
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
15 * You should have received a copy of the GNU General Public License along
16 * with this program; if not, write to the Free Software Foundation, Inc.,
17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 #include "razor-internal.h"
24 #define UPSTREAM_SOURCE 0x80
27 struct razor_set *set;
28 uint32_t *property_map;
33 struct razor_set *set;
34 struct hashtable table;
35 struct hashtable file_table;
36 struct source source1;
37 struct source source2;
41 razor_merger_create(struct razor_set *set1, struct razor_set *set2)
43 struct razor_merger *merger;
47 merger = zalloc(sizeof *merger);
48 merger->set = razor_set_create();
49 hashtable_init(&merger->table, &merger->set->string_pool);
50 hashtable_init(&merger->file_table, &merger->set->file_string_pool);
52 merger->source1.set = set1;
53 count = set1->properties.size / sizeof (struct razor_property);
54 size = count * sizeof merger->source1.property_map[0];
55 merger->source1.property_map = zalloc(size);
56 count = set1->files.size / sizeof (struct razor_entry);
57 size = count * sizeof merger->source1.file_map[0];
58 merger->source1.file_map = zalloc(size);
60 merger->source2.set = set2;
61 count = set2->properties.size / sizeof (struct razor_property);
62 size = count * sizeof merger->source2.property_map[0];
63 merger->source2.property_map = zalloc(size);
64 count = set2->files.size / sizeof (struct razor_entry);
65 size = count * sizeof merger->source2.file_map[0];
66 merger->source2.file_map = zalloc(size);
72 razor_merger_add_package(struct razor_merger *merger,
73 struct razor_package *package)
77 struct razor_package *p;
78 struct razor_set *set1;
79 struct source *source;
82 set1 = merger->source1.set;
83 if (set1->packages.data <= (void *) package &&
84 (void *) package < set1->packages.data + set1->packages.size) {
85 source = &merger->source1;
88 source = &merger->source2;
89 flags = UPSTREAM_SOURCE;
92 pool = source->set->string_pool.data;
93 p = array_add(&merger->set->packages, sizeof *p);
94 p->name = hashtable_tokenize(&merger->table, &pool[package->name]);
96 p->version = hashtable_tokenize(&merger->table,
97 &pool[package->version]);
98 p->arch = hashtable_tokenize(&merger->table,
99 &pool[package->arch]);
101 p->properties = package->properties;
102 r = list_first(&package->properties, &source->set->property_pool);
104 source->property_map[r->data] = 1;
108 p->files = package->files;
109 r = list_first(&package->files, &source->set->file_pool);
111 source->file_map[r->data] = 1;
117 add_property(struct razor_merger *merger,
118 const char *name, uint32_t flags, const char *version)
120 struct razor_property *p;
122 p = array_add(&merger->set->properties, sizeof *p);
123 p->name = hashtable_tokenize(&merger->table, name);
125 p->version = hashtable_tokenize(&merger->table, version);
127 return p - (struct razor_property *) merger->set->properties.data;
131 merge_properties(struct razor_merger *merger)
133 struct razor_property *p1, *p2;
134 struct razor_set *set1, *set2;
135 uint32_t *map1, *map2;
136 int i, j, cmp, count1, count2;
139 set1 = merger->source1.set;
140 set2 = merger->source2.set;
141 map1 = merger->source1.property_map;
142 map2 = merger->source2.property_map;
146 pool1 = set1->string_pool.data;
147 pool2 = set2->string_pool.data;
149 count1 = set1->properties.size / sizeof *p1;
150 count2 = set2->properties.size / sizeof *p2;
151 while (i < count1 || j < count2) {
152 if (i < count1 && map1[i] == 0) {
156 if (j < count2 && map2[j] == 0) {
160 p1 = (struct razor_property *) set1->properties.data + i;
161 p2 = (struct razor_property *) set2->properties.data + j;
162 if (i < count1 && j < count2)
163 cmp = strcmp(&pool1[p1->name], &pool2[p2->name]);
169 cmp = p1->flags - p2->flags;
171 cmp = razor_versioncmp(&pool1[p1->version],
172 &pool2[p2->version]);
174 map1[i++] = add_property(merger,
177 &pool1[p1->version]);
178 } else if (cmp > 0) {
179 map2[j++] = add_property(merger,
182 &pool2[p2->version]);
184 map1[i++] = map2[j++] =
188 &pool1[p1->version]);
194 emit_properties(struct list_head *properties, struct array *source_pool,
195 uint32_t *map, struct array *pool)
200 r = pool->size / sizeof *q;
201 p = list_first(properties, source_pool);
203 q = array_add(pool, sizeof *q);
204 q->data = map[p->data];
209 list_set_ptr(properties, r);
213 add_file(struct razor_merger *merger, const char *name)
215 struct razor_entry *e;
217 e = array_add(&merger->set->files, sizeof *e);
218 e->name = hashtable_tokenize(&merger->file_table, name);
222 return e - (struct razor_entry *)merger->set->files.data;
227 fix_file_map(uint32_t *map,
228 struct razor_entry *files,
229 struct razor_entry *top)
237 fix_file_map(map, files, &files[e]);
240 } while (!(files[e++].flags & RAZOR_ENTRY_LAST));
243 map[top - files] = 1;
247 struct merge_directory {
248 uint32_t merged, dir1, dir2;
252 merge_one_directory(struct razor_merger *merger, struct merge_directory *md)
254 struct razor_entry *root1, *root2, *mroot, *e1, *e2;
255 struct razor_set *set1, *set2;
256 struct array merge_stack;
257 struct merge_directory *child_md, *end_md;
258 uint32_t *map1, *map2, start, last;
262 set1 = merger->source1.set;
263 set2 = merger->source2.set;
264 map1 = merger->source1.file_map;
265 map2 = merger->source2.file_map;
266 pool1 = set1->file_string_pool.data;
267 pool2 = set2->file_string_pool.data;
268 root1 = (struct razor_entry *) set1->files.data;
269 root2 = (struct razor_entry *) set2->files.data;
271 array_init(&merge_stack);
273 start = merger->set->files.size / sizeof (struct razor_entry);
275 e1 = md->dir1 ? root1 + md->dir1 : NULL;
276 e2 = md->dir2 ? root2 + md->dir2 : NULL;
278 if (!e2 && !map1[e1 - root1]) {
279 if ((e1++)->flags & RAZOR_ENTRY_LAST)
283 if (!e1 && !map2[e2 - root2]) {
284 if ((e2++)->flags & RAZOR_ENTRY_LAST)
288 if (e1 && !map1[e1 - root1] &&
289 e2 && !map2[e2 - root2]) {
290 if ((e1++)->flags & RAZOR_ENTRY_LAST)
292 if ((e2++)->flags & RAZOR_ENTRY_LAST)
302 cmp = strcmp (&pool1[e1->name],
307 if (map1[e1 - root1]) {
308 map1[e1 - root1] = last =
309 add_file(merger, &pool1[e1->name]);
311 child_md = array_add(&merge_stack, sizeof (struct merge_directory));
312 child_md->merged = last;
313 child_md->dir1 = e1->start;
317 if ((e1++)->flags & RAZOR_ENTRY_LAST)
319 } else if (cmp > 0) {
320 if (map2[e2 - root2]) {
321 map2[e2 - root2] = last =
322 add_file(merger, &pool2[e2->name]);
324 child_md = array_add(&merge_stack, sizeof (struct merge_directory));
325 child_md->merged = last;
327 child_md->dir2 = e2->start;
330 if ((e2++)->flags & RAZOR_ENTRY_LAST)
333 map1[e1 - root1] = map2[e2- root2] = last =
334 add_file(merger, &pool1[e1->name]);
335 if (e1->start || e2->start) {
336 child_md = array_add(&merge_stack, sizeof (struct merge_directory));
337 child_md->merged = last;
338 child_md->dir1 = e1->start;
339 child_md->dir2 = e2->start;
341 if ((e1++)->flags & RAZOR_ENTRY_LAST)
343 if ((e2++)->flags & RAZOR_ENTRY_LAST)
348 mroot = (struct razor_entry *)merger->set->files.data;
350 mroot[last].flags = RAZOR_ENTRY_LAST;
351 mroot[md->merged].start = start;
353 mroot[md->merged].start = 0;
355 end_md = merge_stack.data + merge_stack.size;
356 for (child_md = merge_stack.data; child_md < end_md; child_md++)
357 merge_one_directory(merger, child_md);
358 array_release(&merge_stack);
362 merge_files(struct razor_merger *merger)
364 struct razor_entry *root;
365 struct merge_directory md;
366 uint32_t *map1, *map2;
368 map1 = merger->source1.file_map;
369 map2 = merger->source2.file_map;
373 if (merger->source1.set->files.size) {
374 root = (struct razor_entry *) merger->source1.set->files.data;
376 fix_file_map(map1, root, root);
377 md.dir1 = root->start;
381 if (merger->source2.set->files.size) {
382 root = (struct razor_entry *) merger->source2.set->files.data;
384 fix_file_map(map2, root, root);
385 md.dir2 = root->start;
389 merge_one_directory(merger, &md);
393 emit_files(struct list_head *files, struct array *source_pool,
394 uint32_t *map, struct array *pool)
399 r = pool->size / sizeof *q;
400 p = list_first(files, source_pool);
402 q = array_add(pool, sizeof *q);
403 q->data = map[p->data];
408 list_set_ptr(files, r);
411 /* Rebuild property->packages maps. We can't just remap these, as a
412 * property may have lost or gained a number of packages. Allocate an
413 * array per property and loop through the packages and add them to
414 * the arrays for their properties. */
416 rebuild_property_package_lists(struct razor_set *set)
418 struct array *pkgs, *a;
419 struct razor_package *pkg, *pkg_end;
420 struct razor_property *prop, *prop_end;
425 count = set->properties.size / sizeof (struct razor_property);
426 pkgs = zalloc(count * sizeof *pkgs);
427 pkg_end = set->packages.data + set->packages.size;
429 for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
430 r = list_first(&pkg->properties, &set->property_pool);
432 q = array_add(&pkgs[r->data], sizeof *q);
433 *q = pkg - (struct razor_package *) set->packages.data;
438 prop_end = set->properties.data + set->properties.size;
440 for (prop = set->properties.data; prop < prop_end; prop++, a++) {
441 list_set_array(&prop->packages, &set->package_pool, a, 0);
448 rebuild_file_package_lists(struct razor_set *set)
450 struct array *pkgs, *a;
451 struct razor_package *pkg, *pkg_end;
452 struct razor_entry *entry, *entry_end;
457 count = set->files.size / sizeof (struct razor_entry);
458 pkgs = zalloc(count * sizeof *pkgs);
459 pkg_end = set->packages.data + set->packages.size;
461 for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
462 r = list_first(&pkg->files, &set->file_pool);
464 q = array_add(&pkgs[r->data], sizeof *q);
465 *q = pkg - (struct razor_package *) set->packages.data;
470 entry_end = set->files.data + set->files.size;
472 for (entry = set->files.data; entry < entry_end; entry++, a++) {
473 list_set_array(&entry->packages, &set->package_pool, a, 0);
480 razor_merger_finish(struct razor_merger *merger)
482 struct razor_set *result;
483 struct razor_package *p, *pend;
485 /* As we built the package list, we filled out a bitvector of
486 * the properties that are referenced by the packages in the
487 * new set. Now we do a parallel loop through the properties
488 * and emit those marked in the bit vector to the new set. In
489 * the process, we update the bit vector to actually map from
490 * indices in the old property list to indices in the new
491 * property list for both sets. */
493 merge_properties(merger);
496 /* Now we loop through the packages again and emit the
497 * property lists, remapped to point to the new properties. */
499 pend = merger->set->packages.data + merger->set->packages.size;
500 for (p = merger->set->packages.data; p < pend; p++) {
503 if (p->flags & UPSTREAM_SOURCE)
504 src = &merger->source2;
506 src = &merger->source1;
508 emit_properties(&p->properties,
509 &src->set->property_pool,
511 &merger->set->property_pool);
512 emit_files(&p->files,
513 &src->set->file_pool,
515 &merger->set->file_pool);
516 p->flags &= ~UPSTREAM_SOURCE;
519 rebuild_property_package_lists(merger->set);
520 rebuild_file_package_lists(merger->set);
522 result = merger->set;
523 hashtable_release(&merger->table);
524 hashtable_release(&merger->file_table);