1.1 --- a/razor.c Wed Feb 20 12:42:42 2008 -0500
1.2 +++ b/razor.c Wed Feb 20 13:34:55 2008 -0500
1.3 @@ -942,7 +942,7 @@
1.4
1.5 static void
1.6 list_dir(struct razor_set *set, struct razor_entry *dir,
1.7 - const char *prefix, const char *pattern)
1.8 + char *prefix, const char *pattern)
1.9 {
1.10 struct razor_entry *e;
1.11 const char *n, *pool = set->string_pool.data;
1.12 @@ -952,7 +952,14 @@
1.13 n = pool + e->name;
1.14 if (pattern && pattern[0] && fnmatch(pattern, n, 0) != 0)
1.15 continue;
1.16 - printf("%s/%s%s\n", prefix, n, e->start > 0 ? "/" : "");
1.17 + printf("%s/%s\n", prefix, n);
1.18 + if (e->start) {
1.19 + char *sub = prefix + strlen (prefix);
1.20 + *sub = '/';
1.21 + strcpy (sub + 1, n);
1.22 + list_dir(set, e, prefix, pattern);
1.23 + *sub = '\0';
1.24 + }
1.25 } while (!((e++)->flags & RAZOR_ENTRY_LAST));
1.26 }
1.27
1.28 @@ -962,8 +969,11 @@
1.29 struct razor_entry *e;
1.30 char buffer[512], *p, *base;
1.31
1.32 - if (pattern == NULL)
1.33 - pattern = "/";
1.34 + if (pattern == NULL || !strcmp (pattern, "/")) {
1.35 + buffer[0] = '\0';
1.36 + list_dir(set, set->files.data, buffer, NULL);
1.37 + return;
1.38 + }
1.39
1.40 strcpy(buffer, pattern);
1.41 e = find_entry(set, set->files.data, buffer);
1.42 @@ -1152,6 +1162,7 @@
1.43 struct source {
1.44 struct razor_set *set;
1.45 uint32_t *property_map;
1.46 + uint32_t *file_map;
1.47 };
1.48
1.49 struct razor_merger {
1.50 @@ -1172,15 +1183,21 @@
1.51 merger->set = razor_set_create();
1.52 hashtable_init(&merger->table, &merger->set->string_pool);
1.53
1.54 + merger->source1.set = set1;
1.55 count = set1->properties.size / sizeof (struct razor_property);
1.56 size = count * sizeof merger->source1.property_map[0];
1.57 merger->source1.property_map = zalloc(size);
1.58 - merger->source1.set = set1;
1.59 + count = set1->files.size / sizeof (struct razor_entry);
1.60 + size = count * sizeof merger->source1.file_map[0];
1.61 + merger->source1.file_map = zalloc(size);
1.62
1.63 + merger->source2.set = set2;
1.64 count = set2->properties.size / sizeof (struct razor_property);
1.65 size = count * sizeof merger->source2.property_map[0];
1.66 merger->source2.property_map = zalloc(size);
1.67 - merger->source2.set = set2;
1.68 + count = set2->files.size / sizeof (struct razor_entry);
1.69 + size = count * sizeof merger->source2.file_map[0];
1.70 + merger->source2.file_map = zalloc(size);
1.71
1.72 return merger;
1.73 }
1.74 @@ -1200,13 +1217,20 @@
1.75 p->flags = flags;
1.76 p->version = hashtable_tokenize(&merger->table,
1.77 &pool[package->version]);
1.78 +
1.79 p->properties = package->properties;
1.80 -
1.81 r = list_first(&package->properties, &source->set->property_pool);
1.82 while (r) {
1.83 source->property_map[r->data] = 1;
1.84 r = list_next(r);
1.85 }
1.86 +
1.87 + p->files = package->files;
1.88 + r = list_first(&package->files, &source->set->file_pool);
1.89 + while (r) {
1.90 + source->file_map[r->data] = 1;
1.91 + r = list_next(r);
1.92 + }
1.93 }
1.94
1.95
1.96 @@ -1358,13 +1382,202 @@
1.97
1.98 list_set_ptr(properties, r);
1.99 }
1.100 -
1.101 +
1.102 +static uint32_t
1.103 +add_file(struct razor_merger *merger, const char *name)
1.104 +{
1.105 + struct razor_entry *e;
1.106 +
1.107 + e = array_add(&merger->set->files, sizeof *e);
1.108 + e->name = hashtable_tokenize(&merger->table, name);
1.109 + e->flags = 0;
1.110 + e->start = 0;
1.111 +
1.112 + return e - (struct razor_entry *)merger->set->files.data;
1.113 +}
1.114 +
1.115 +static int
1.116 +fix_file_map(uint32_t *map,
1.117 + struct razor_entry *files,
1.118 + struct razor_entry *top)
1.119 +{
1.120 + uint32_t e;
1.121 + int found_file = 0;
1.122 +
1.123 + e = top->start;
1.124 + do {
1.125 + if (files[e].start)
1.126 + fix_file_map(map, files, &files[e]);
1.127 + if (map[e])
1.128 + found_file = 1;
1.129 + } while (!(files[e++].flags & RAZOR_ENTRY_LAST));
1.130 +
1.131 + if (found_file)
1.132 + map[top - files] = 1;
1.133 + return found_file;
1.134 +}
1.135 +
1.136 +struct merge_directory {
1.137 + uint32_t merged, dir1, dir2;
1.138 +};
1.139 +
1.140 +static void
1.141 +merge_one_directory(struct razor_merger *merger, struct merge_directory *md)
1.142 +{
1.143 + struct razor_entry *root1, *root2, *mroot, *e1, *e2;
1.144 + struct razor_set *set1, *set2;
1.145 + struct array merge_stack;
1.146 + struct merge_directory *child_md, *end_md;
1.147 + uint32_t *map1, *map2, start, last;
1.148 + int cmp;
1.149 + char *pool1, *pool2;
1.150 +
1.151 + set1 = merger->source1.set;
1.152 + set2 = merger->source2.set;
1.153 + map1 = merger->source1.file_map;
1.154 + map2 = merger->source2.file_map;
1.155 + pool1 = set1->string_pool.data;
1.156 + pool2 = set2->string_pool.data;
1.157 + root1 = (struct razor_entry *) set1->files.data;
1.158 + root2 = (struct razor_entry *) set2->files.data;
1.159 +
1.160 + array_init(&merge_stack);
1.161 +
1.162 + start = merger->set->files.size / sizeof (struct razor_entry);
1.163 + last = 0;
1.164 + e1 = md->dir1 ? root1 + md->dir1 : NULL;
1.165 + e2 = md->dir2 ? root2 + md->dir2 : NULL;
1.166 + while (e1 || e2) {
1.167 + if (!e2 && !map1[e1 - root1]) {
1.168 + if ((e1++)->flags & RAZOR_ENTRY_LAST)
1.169 + e1 = NULL;
1.170 + continue;
1.171 + }
1.172 + if (!e1 && !map2[e2 - root2]) {
1.173 + if ((e2++)->flags & RAZOR_ENTRY_LAST)
1.174 + e2 = NULL;
1.175 + continue;
1.176 + }
1.177 + if (e1 && !map1[e1 - root1] &&
1.178 + e2 && !map1[e2 - root2]) {
1.179 + if ((e1++)->flags & RAZOR_ENTRY_LAST)
1.180 + e1 = NULL;
1.181 + if ((e2++)->flags & RAZOR_ENTRY_LAST)
1.182 + e2 = NULL;
1.183 + continue;
1.184 + }
1.185 +
1.186 + if (!e1)
1.187 + cmp = 1;
1.188 + else if (!e2)
1.189 + cmp = -1;
1.190 + else {
1.191 + cmp = strcmp (&pool1[e1->name],
1.192 + &pool2[e2->name]);
1.193 + }
1.194 +
1.195 + if (cmp < 0) {
1.196 + if (map1[e1 - root1]) {
1.197 + map1[e1 - root1] = last =
1.198 + add_file(merger, &pool1[e1->name]);
1.199 + if (e1->start) {
1.200 + child_md = array_add(&merge_stack, sizeof (struct merge_directory));
1.201 + child_md->merged = last;
1.202 + child_md->dir1 = e1->start;
1.203 + child_md->dir2 = 0;
1.204 + }
1.205 + }
1.206 + if ((e1++)->flags & RAZOR_ENTRY_LAST)
1.207 + e1 = NULL;
1.208 + } else if (cmp > 0) {
1.209 + if (map2[e2 - root2]) {
1.210 + map2[e2 - root2] = last =
1.211 + add_file(merger, &pool2[e2->name]);
1.212 + if (e2->start) {
1.213 + child_md = array_add(&merge_stack, sizeof (struct merge_directory));
1.214 + child_md->merged = last;
1.215 + child_md->dir1 = 0;
1.216 + child_md->dir2 = e2->start;
1.217 + }
1.218 + }
1.219 + if ((e2++)->flags & RAZOR_ENTRY_LAST)
1.220 + e2 = NULL;
1.221 + } else {
1.222 + map1[e1 - root1] = map2[e2- root2] = last =
1.223 + add_file(merger, &pool1[e1->name]);
1.224 + if (e1->start || e2->start) {
1.225 + child_md = array_add(&merge_stack, sizeof (struct merge_directory));
1.226 + child_md->merged = last;
1.227 + child_md->dir1 = e1->start;
1.228 + child_md->dir2 = e2->start;
1.229 + }
1.230 + if ((e1++)->flags & RAZOR_ENTRY_LAST)
1.231 + e1 = NULL;
1.232 + if ((e2++)->flags & RAZOR_ENTRY_LAST)
1.233 + e2 = NULL;
1.234 + }
1.235 + }
1.236 +
1.237 + mroot = (struct razor_entry *)merger->set->files.data;
1.238 + if (last) {
1.239 + mroot[last].flags = RAZOR_ENTRY_LAST;
1.240 + mroot[md->merged].start = start;
1.241 + } else
1.242 + mroot[md->merged].start = 0;
1.243 +
1.244 + end_md = merge_stack.data + merge_stack.size;
1.245 + for (child_md = merge_stack.data; child_md < end_md; child_md++)
1.246 + merge_one_directory(merger, child_md);
1.247 + array_release(&merge_stack);
1.248 +}
1.249 +
1.250 +static void
1.251 +merge_files(struct razor_merger *merger)
1.252 +{
1.253 + struct razor_entry *root1, *root2;
1.254 + struct merge_directory md;
1.255 + uint32_t *map1, *map2;
1.256 +
1.257 + map1 = merger->source1.file_map;
1.258 + map2 = merger->source2.file_map;
1.259 + root1 = (struct razor_entry *) merger->source1.set->files.data;
1.260 + root2 = (struct razor_entry *) merger->source2.set->files.data;
1.261 +
1.262 + /* FIXME. Blah */
1.263 + fix_file_map(map1, root1, root1);
1.264 + fix_file_map(map2, root2, root2);
1.265 +
1.266 + md.merged = add_file(merger, "");
1.267 + md.dir1 = root1->start;
1.268 + md.dir2 = root2->start;
1.269 + merge_one_directory(merger, &md);
1.270 +}
1.271 +
1.272 +static void
1.273 +emit_files(struct list_head *files, struct array *source_pool,
1.274 + uint32_t *map, struct array *pool)
1.275 +{
1.276 + uint32_t r;
1.277 + struct list *p, *q;
1.278 +
1.279 + r = pool->size / sizeof *q;
1.280 + p = list_first(files, source_pool);
1.281 + while (p) {
1.282 + q = array_add(pool, sizeof *q);
1.283 + q->data = map[p->data];
1.284 + q->flags = p->flags;
1.285 + p = list_next(p);
1.286 + }
1.287 +
1.288 + list_set_ptr(files, r);
1.289 +}
1.290 +
1.291 /* Rebuild property->packages maps. We can't just remap these, as a
1.292 * property may have lost or gained a number of packages. Allocate an
1.293 * array per property and loop through the packages and add them to
1.294 * the arrays for their properties. */
1.295 static void
1.296 -rebuild_package_lists(struct razor_set *set)
1.297 +rebuild_property_package_lists(struct razor_set *set)
1.298 {
1.299 struct array *pkgs, *a;
1.300 struct razor_package *pkg, *pkg_end;
1.301 @@ -1397,6 +1610,40 @@
1.302 free(pkgs);
1.303 }
1.304
1.305 +static void
1.306 +rebuild_file_package_lists(struct razor_set *set)
1.307 +{
1.308 + struct array *pkgs, *a;
1.309 + struct razor_package *pkg, *pkg_end;
1.310 + struct razor_entry *entry, *entry_end;
1.311 + struct array *pool;
1.312 + struct list *r;
1.313 + uint32_t *q;
1.314 + int count;
1.315 +
1.316 + count = set->files.size / sizeof (struct razor_entry);
1.317 + pkgs = zalloc(count * sizeof *pkgs);
1.318 + pkg_end = set->packages.data + set->packages.size;
1.319 + pool = &set->file_pool;
1.320 +
1.321 + for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
1.322 + r = list_first(&pkg->files, pool);
1.323 + while (r) {
1.324 + q = array_add(&pkgs[r->data], sizeof *q);
1.325 + *q = pkg - (struct razor_package *) set->packages.data;
1.326 + r = list_next(r);
1.327 + }
1.328 + }
1.329 +
1.330 + entry_end = set->files.data + set->files.size;
1.331 + a = pkgs;
1.332 + for (entry = set->files.data; entry < entry_end; entry++, a++) {
1.333 + list_set_array(&entry->packages, pool, a, 0);
1.334 + array_release(a);
1.335 + }
1.336 + free(pkgs);
1.337 +}
1.338 +
1.339 struct razor_set *
1.340 razor_merger_finish(struct razor_merger *merger)
1.341 {
1.342 @@ -1439,6 +1686,7 @@
1.343 * property list for both sets. */
1.344
1.345 merge_properties(merger);
1.346 + merge_files(merger);
1.347
1.348 /* Now we loop through the packages again and emit the
1.349 * property lists, remapped to point to the new properties. */
1.350 @@ -1456,10 +1704,15 @@
1.351 &src->set->property_pool,
1.352 src->property_map,
1.353 &merger->set->property_pool);
1.354 + emit_files(&p->files,
1.355 + &src->set->file_pool,
1.356 + src->file_map,
1.357 + &merger->set->file_pool);
1.358 p->flags &= ~UPSTREAM_SOURCE;
1.359 }
1.360
1.361 - rebuild_package_lists(merger->set);
1.362 + rebuild_property_package_lists(merger->set);
1.363 + rebuild_file_package_lists(merger->set);
1.364
1.365 return razor_merger_finish(merger);
1.366 }