Add a file tree section to the package set structure.
22 struct razor_set_section {
28 struct razor_set_header {
31 struct razor_set_section sections[0];
34 #define RAZOR_MAGIC 0x7a7a7a7a
35 #define RAZOR_VERSION 1
37 #define RAZOR_PACKAGES 0
38 #define RAZOR_REQUIRES 1
39 #define RAZOR_PROVIDES 2
40 #define RAZOR_STRING_POOL 3
41 #define RAZOR_PACKAGE_POOL 4
42 #define RAZOR_REQUIRES_POOL 5
43 #define RAZOR_PROVIDES_POOL 6
44 #define RAZOR_FILE_TREE 7
46 struct razor_package {
48 unsigned long version;
49 unsigned long requires;
50 unsigned long provides;
53 struct razor_property {
55 unsigned long version;
56 unsigned long packages;
66 struct array string_pool;
67 struct array packages;
68 struct array package_pool;
69 struct array requires;
70 struct array provides;
71 struct array requires_pool;
72 struct array provides_pool;
73 struct array file_tree;
74 struct razor_set_header *header;
77 struct import_property_context {
82 struct razor_importer {
83 struct razor_set *set;
85 struct import_property_context requires;
86 struct import_property_context provides;
87 struct razor_package *package;
92 array_init(struct array *array)
94 memset(array, 0, sizeof *array);
98 array_release(struct array *array)
104 array_add(struct array *array, int size)
109 if (array->alloc > 0)
110 alloc = array->alloc;
114 while (alloc < array->size + size)
117 if (array->alloc < alloc) {
118 data = realloc(array->data, alloc);
122 array->alloc = alloc;
125 p = array->data + array->size;
132 write_to_fd(int fd, void *p, size_t size)
138 len = write(fd, p, rest);
158 struct razor_set_section razor_sections[] = {
159 { RAZOR_PACKAGES, offsetof(struct razor_set, packages) },
160 { RAZOR_REQUIRES, offsetof(struct razor_set, requires) },
161 { RAZOR_PROVIDES, offsetof(struct razor_set, provides) },
162 { RAZOR_STRING_POOL, offsetof(struct razor_set, string_pool) },
163 { RAZOR_PACKAGE_POOL, offsetof(struct razor_set, package_pool) },
164 { RAZOR_REQUIRES_POOL, offsetof(struct razor_set, requires_pool) },
165 { RAZOR_PROVIDES_POOL, offsetof(struct razor_set, provides_pool) },
166 { RAZOR_FILE_TREE, offsetof(struct razor_set, file_tree) },
170 razor_set_create(void)
172 return zalloc(sizeof(struct razor_set));
176 razor_set_open(const char *filename)
178 struct razor_set *set;
179 struct razor_set_section *s;
184 set = zalloc(sizeof *set);
185 fd = open(filename, O_RDONLY);
186 if (fstat(fd, &stat) < 0)
188 set->header = mmap(NULL, stat.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
189 if (set->header == MAP_FAILED) {
194 for (s = set->header->sections; ~s->type; s++) {
195 if (s->type >= ARRAY_SIZE(razor_sections))
197 if (s->type != razor_sections[s->type].type)
199 array = (void *) set + razor_sections[s->type].offset;
200 array->data = (void *) set->header + s->offset;
201 array->size = s->size;
202 array->alloc = s->size;
210 razor_set_destroy(struct razor_set *set)
217 for (i = 0; set->header->sections[i].type; i++)
219 size = set->header->sections[i].type;
220 munmap(set->header, size);
222 for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
223 a = (void *) set + razor_sections[i].offset;
232 razor_set_write(struct razor_set *set, const char *filename)
235 struct razor_set_header *header = (struct razor_set_header *) data;
237 unsigned long offset;
240 memset(data, 0, sizeof data);
241 header->magic = RAZOR_MAGIC;
242 header->version = RAZOR_VERSION;
243 offset = sizeof data;
245 for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
246 if (razor_sections[i].type != i)
248 a = (void *) set + razor_sections[i].offset;
249 header->sections[i].type = i;
250 header->sections[i].offset = offset;
251 header->sections[i].size = a->size;
252 offset += (a->size + 4095) & ~4095;
255 header->sections[i].type = ~0;
256 header->sections[i].offset = 0;
257 header->sections[i].size = 0;
259 fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
263 write_to_fd(fd, data, sizeof data);
264 for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
265 if (razor_sections[i].type != i)
267 a = (void *) set + razor_sections[i].offset;
268 write_to_fd(fd, a->data, (a->size + 4095) & ~4095);
277 hash_string(const char *key)
280 unsigned int hash = 0;
282 for (p = key; *p; p++)
283 hash = (hash * 617) ^ *p;
289 razor_importer_lookup(struct razor_importer *importer, const char *key)
291 unsigned int mask, start, i;
295 pool = importer->set->string_pool.data;
296 mask = importer->buckets.alloc - 1;
297 start = hash_string(key) * sizeof(unsigned long);
299 for (i = 0; i < importer->buckets.alloc; i += sizeof *b) {
300 b = importer->buckets.data + ((start + i) & mask);
305 if (strcmp(key, &pool[*b]) == 0)
313 add_to_string_pool(struct razor_set *set, const char *key)
318 len = strlen(key) + 1;
319 p = array_add(&set->string_pool, len);
322 return p - (char *) set->string_pool.data;
326 add_to_property_pool(struct array *pool, struct array *properties)
330 p = array_add(properties, sizeof *p);
332 p = array_add(pool, properties->size);
333 memcpy(p, properties->data, properties->size);
335 return p - (unsigned long *) pool->data;
339 do_insert(struct razor_importer *importer, unsigned long value)
341 unsigned int mask, start, i;
345 key = (char *) importer->set->string_pool.data + value;
346 mask = importer->buckets.alloc - 1;
347 start = hash_string(key) * sizeof(unsigned long);
349 for (i = 0; i < importer->buckets.alloc; i += sizeof *b) {
350 b = importer->buckets.data + ((start + i) & mask);
359 razor_importer_insert(struct razor_importer *importer, const char *key)
361 unsigned long value, *buckets, *b, *end;
364 alloc = importer->buckets.alloc;
365 array_add(&importer->buckets, 4 * sizeof *buckets);
366 if (alloc != importer->buckets.alloc) {
367 end = importer->buckets.data + alloc;
368 memset(end, 0, importer->buckets.alloc - alloc);
369 for (b = importer->buckets.data; b < end; b++) {
373 do_insert(importer, value);
378 value = add_to_string_pool(importer->set, key);
379 do_insert (importer, value);
385 razor_importer_tokenize(struct razor_importer *importer, const char *string)
390 return razor_importer_tokenize(importer, "");
392 token = razor_importer_lookup(importer, string);
396 return razor_importer_insert(importer, string);
400 razor_importer_begin_package(struct razor_importer *importer,
401 const char *name, const char *version)
403 struct razor_package *p;
405 p = array_add(&importer->set->packages, sizeof *p);
406 p->name = razor_importer_tokenize(importer, name);
407 p->version = razor_importer_tokenize(importer, version);
409 importer->package = p;
410 array_init(&importer->requires.package);
411 array_init(&importer->provides.package);
415 razor_importer_finish_package(struct razor_importer *importer)
417 struct razor_package *p;
419 p = importer->package;
420 p->requires = add_to_property_pool(&importer->set->requires_pool,
421 &importer->requires.package);
422 p->provides = add_to_property_pool(&importer->set->provides_pool,
423 &importer->provides.package);
425 array_release(&importer->requires.package);
426 array_release(&importer->provides.package);
430 razor_importer_add_property(struct razor_importer *importer,
431 struct import_property_context *pctx,
432 const char *name, const char *version)
434 struct razor_property *p;
437 p = array_add(pctx->all, sizeof *p);
438 p->name = razor_importer_tokenize(importer, name);
439 p->version = razor_importer_tokenize(importer, version);
440 p->packages = importer->package -
441 (struct razor_package *) importer->set->packages.data;
443 r = array_add(&pctx->package, sizeof *r);
444 *r = p - (struct razor_property *) pctx->all->data;
448 razor_importer_add_requires(struct razor_importer *importer,
449 const char *name, const char *version)
451 razor_importer_add_property(importer,
452 &importer->requires, name, version);
456 razor_importer_add_provides(struct razor_importer *importer,
457 const char *name, const char *version)
459 razor_importer_add_property(importer,
460 &importer->provides, name, version);
464 razor_importer_add_file(struct razor_importer *importer, const char *name)
468 p = array_add(&importer->files, sizeof *p);
472 struct razor_importer *
473 razor_importer_new(void)
475 struct razor_importer *importer;
477 importer = zalloc(sizeof *importer);
478 importer->set = razor_set_create();
479 importer->requires.all = &importer->set->requires;
480 importer->provides.all = &importer->set->provides;
485 typedef int (*compare_with_data_func_t)(const void *p1,
489 struct qsort_context {
491 compare_with_data_func_t compare;
496 qsort_swap(void *p1, void *p2, size_t size)
500 memcpy(buffer, p1, size);
501 memcpy(p1, p2, size);
502 memcpy(p2, buffer, size);
506 __qsort_with_data(void *base, size_t nelem, unsigned long *map,
507 struct qsort_context *ctx)
509 void *p, *start, *end, *pivot;
510 unsigned long *mp, *mstart, *mend, tmp;
511 int left, right, result;
512 size_t size = ctx->size;
516 end = base + nelem * size;
520 pivot = base + (random() % nelem) * size;
523 result = ctx->compare(p, pivot, ctx->data);
525 qsort_swap(p, start, size);
535 } else if (result == 0) {
541 qsort_swap(p, end, size);
550 left = (start - base) / size;
551 right = (base + nelem * size - end) / size;
553 __qsort_with_data(base, left, map, ctx);
555 __qsort_with_data(end, right, mend, ctx);
559 qsort_with_data(void *base, size_t nelem, size_t size,
560 compare_with_data_func_t compare, void *data)
562 struct qsort_context ctx;
567 ctx.compare = compare;
570 map = malloc(nelem * sizeof (unsigned long));
571 for (i = 0; i < nelem; i++)
574 __qsort_with_data(base, nelem, map, &ctx);
580 versioncmp(const char *s1, const char *s2)
586 n1 = strtol(s1, (char **) &p1, 0);
587 n2 = strtol(s2, (char **) &p2, 0);
589 /* Epoch; if one but not the other has an epoch set, default
590 * the epoch-less version to 0. */
591 res = (*p1 == ':') - (*p2 == ':');
596 } else if (res > 0) {
609 if (isdigit(*p1) && isdigit(*p2))
610 return versioncmp(p1, p2);
618 compare_packages(const void *p1, const void *p2, void *data)
620 const struct razor_package *pkg1 = p1, *pkg2 = p2;
621 struct razor_set *set = data;
622 char *pool = set->string_pool.data;
624 if (pkg1->name == pkg2->name)
625 return versioncmp(&pool[pkg1->version], &pool[pkg2->version]);
627 return strcmp(&pool[pkg1->name], &pool[pkg2->name]);
631 compare_properties(const void *p1, const void *p2, void *data)
633 const struct razor_property *prop1 = p1, *prop2 = p2;
634 struct razor_set *set = data;
635 char *pool = set->string_pool.data;
637 if (prop1->name == prop2->name)
638 return versioncmp(&pool[prop1->version], &pool[prop2->version]);
640 return strcmp(&pool[prop1->name], &pool[prop2->name]);
643 static unsigned long *
644 uniqueify_properties(struct razor_set *set, struct array *properties)
646 struct razor_property *rp, *up, *rp_end;
647 struct array *pkgs, *p;
648 unsigned long *map, *rmap, *r;
649 int i, count, unique;
651 count = properties->size / sizeof(struct razor_property);
652 map = qsort_with_data(properties->data,
654 sizeof(struct razor_property),
658 rp_end = properties->data + properties->size;
659 rmap = malloc(count * sizeof *map);
660 pkgs = zalloc(count * sizeof *pkgs);
661 for (rp = properties->data, up = rp, i = 0; rp < rp_end; rp++, i++) {
662 if (rp->name != up->name || rp->version != up->version) {
665 up->version = rp->version;
668 unique = up - (struct razor_property *) properties->data;
669 rmap[map[i]] = unique;
670 r = array_add(&pkgs[unique], sizeof *r);
676 properties->size = (void *) up - properties->data;
678 for (rp = properties->data, p = pkgs; rp < rp_end; rp++, p++) {
679 rp->packages = add_to_property_pool(&set->package_pool, p);
689 remap_links(struct array *links, unsigned long *map)
691 unsigned long *p, *end;
693 end = links->data + links->size;
694 for (p = links->data; p < end; p++)
700 compare_filenames(const void *p1, const void *p2, void *data)
702 char *f1 = *(char **) p1;
703 char *f2 = *(char **) p2;
705 return strcmp(f1, f2);
709 unsigned long name, count;
711 struct directory *last;
715 count_entries(struct directory *d)
717 struct directory *p, *end;
720 end = d->files.data + d->files.size;
724 d->count += p->count + 1;
730 serialize_files(struct directory *d, struct array *array)
732 struct directory *p, *end;
733 struct razor_entry *e;
737 end = d->files.data + d->files.size;
738 s = array->size / sizeof *e + d->files.size / sizeof *p;
740 e = array_add(array, sizeof *e);
742 e->count = p->files.size / sizeof *p;
749 end = d->files.data + d->files.size;
751 serialize_files(p, array);
757 build_file_tree(struct razor_importer *importer)
759 int count, i, length;
760 char **filenames, *f, *end;
763 struct directory *d, root;
764 struct razor_entry *e;
766 count = importer->files.size / sizeof (char *);
767 qsort_with_data(importer->files.data,
773 root.name = razor_importer_tokenize(importer, "");
774 array_init(&root.files);
777 filenames = importer->files.data;
778 for (i = 0; i < count; i++) {
785 end = strchr(f + 1, '/');
788 length = end - (f + 1);
789 memcpy(dirname, f + 1, length);
790 dirname[length] ='\0';
791 name = razor_importer_tokenize(importer, dirname);
792 if (d->last == NULL || d->last->name != name) {
793 d->last = array_add(&d->files, sizeof *d);
794 d->last->name = name;
795 d->last->last = NULL;
796 array_init(&d->last->files);
805 count_entries(&root);
806 array_init(&importer->set->file_tree);
808 e = array_add(&importer->set->file_tree, sizeof *e);
810 e->count = root.files.size / sizeof *d;
813 serialize_files(&root, &importer->set->file_tree);
815 array_release(&importer->files);
819 list_dir(struct razor_set *set, struct razor_entry *e, int indent)
821 struct razor_entry *c;
822 char *pool = set->string_pool.data;
825 for (i = 0; i < indent; i++)
827 printf("%s\n", pool + e->name);
828 for (i = 0; i < e->count; i++) {
829 c = (struct razor_entry *) set->file_tree.data + e->start + i;
830 list_dir(set, c, indent + 2);
835 razor_set_list_files(struct razor_set *set)
837 list_dir(set, set->file_tree.data, 2);
841 razor_importer_finish(struct razor_importer *importer)
843 struct razor_set *set;
844 unsigned long *map, *rmap;
847 map = uniqueify_properties(importer->set, &importer->set->requires);
848 remap_links(&importer->set->requires_pool, map);
851 map = uniqueify_properties(importer->set, &importer->set->provides);
852 remap_links(&importer->set->provides_pool, map);
855 count = importer->set->packages.size / sizeof(struct razor_package);
856 map = qsort_with_data(importer->set->packages.data,
858 sizeof(struct razor_package),
862 rmap = malloc(count * sizeof *rmap);
863 for (i = 0; i < count; i++)
866 remap_links(&importer->set->package_pool, rmap);
870 build_file_tree(importer);
873 array_release(&importer->buckets);
880 razor_set_list(struct razor_set *set)
882 struct razor_package *p, *end;
885 pool = set->string_pool.data;
886 end = set->packages.data + set->packages.size;
887 for (p = set->packages.data; p < end; p++)
888 printf("%s %s\n", &pool[p->name], &pool[p->version]);
891 struct razor_set *bsearch_set;
894 compare_package_name(const void *key, const void *data)
896 const struct razor_package *p = data;
899 pool = bsearch_set->string_pool.data;
901 return strcmp(key, &pool[p->name]);
904 struct razor_package *
905 razor_set_get_package(struct razor_set *set, const char *package)
908 return bsearch(package, set->packages.data,
909 set->packages.size / sizeof(struct razor_package),
910 sizeof(struct razor_package), compare_package_name);
914 compare_property_name(const void *key, const void *data)
916 const struct razor_property *p = data;
919 pool = bsearch_set->string_pool.data;
921 return strcmp(key, &pool[p->name]);
924 struct razor_property *
925 razor_set_get_property(struct razor_set *set,
926 struct array *properties,
927 const char *property)
929 struct razor_property *p, *start;
932 p = bsearch(property, properties->data,
933 properties->size / sizeof(struct razor_property),
934 sizeof(struct razor_property), compare_property_name);
936 start = properties->data;
937 while (p > start && (p - 1)->name == p->name)
944 razor_set_list_all_properties(struct razor_set *set, struct array *properties)
946 struct razor_property *p, *end;
949 pool = set->string_pool.data;
950 end = properties->data + properties->size;
951 for (p = properties->data; p < end; p++)
952 printf("%s %s\n", &pool[p->name], &pool[p->version]);
956 razor_set_list_requires(struct razor_set *set, const char *name)
958 struct razor_property *p, *requires;
959 struct razor_package *package;
964 package = razor_set_get_package(set, name);
965 r = (unsigned long *) set->requires_pool.data +
967 requires = set->requires.data;
968 pool = set->string_pool.data;
971 printf("%s %s\n", &pool[p->name], &pool[p->version]);
974 razor_set_list_all_properties(set, &set->requires);
978 razor_set_list_provides(struct razor_set *set, const char *name)
980 struct razor_property *p, *provides;
981 struct razor_package *package;
986 package = razor_set_get_package(set, name);
987 r = (unsigned long *) set->provides_pool.data +
989 provides = set->provides.data;
990 pool = set->string_pool.data;
993 printf("%s %s\n", &pool[p->name], &pool[p->version]);
996 razor_set_list_all_properties(set, &set->provides);
1000 razor_set_list_property_packages(struct razor_set *set,
1001 struct array *properties,
1003 const char *version)
1005 struct razor_property *property, *end;
1006 struct razor_package *p, *packages;
1013 property = razor_set_get_property(set, properties, name);
1014 packages = set->packages.data;
1015 pool = set->string_pool.data;
1016 end = properties->data + properties->size;
1017 while (property < end && strcmp(name, &pool[property->name]) == 0) {
1018 if (version && versioncmp(version, &pool[property->version]) != 0)
1020 r = (unsigned long *)
1021 set->package_pool.data + property->packages;
1023 p = &packages[*r++];
1025 &pool[p->name], &pool[p->version]);
1033 razor_set_list_requires_packages(struct razor_set *set,
1035 const char *version)
1037 razor_set_list_property_packages(set, &set->requires, name, version);
1041 razor_set_list_provides_packages(struct razor_set *set,
1043 const char *version)
1045 razor_set_list_property_packages(set, &set->provides, name, version);
1049 razor_set_validate(struct razor_set *set, struct array *unsatisfied)
1051 struct razor_property *r, *p, *rend, *pend;
1055 p = set->provides.data;
1056 rend = set->requires.data + set->requires.size;
1057 pend = set->provides.data + set->provides.size;
1058 pool = set->string_pool.data;
1060 for (r = set->requires.data; r < rend; r++) {
1061 while (p < pend && strcmp(&pool[r->name], &pool[p->name]) > 0)
1064 /* If there is more than one version of a provides,
1065 * seek to the end for the highest version. */
1066 while (p + 1 < pend && p->name == (p + 1)->name)
1069 /* FIXME: We need to track property flags (<, <=, =
1070 * etc) to properly determine if a requires is
1071 * satisfied. The current code doesn't track that the
1072 * requires a = 1 isn't satisfied by a = 2 provides. */
1074 if (p == pend || strcmp(&pool[r->name], &pool[p->name]) != 0 ||
1075 versioncmp(&pool[r->version], &pool[p->version]) > 0) {
1076 /* FIXME: We ignore file requires for now. */
1077 if (pool[r->name] == '/')
1079 u = array_add(unsatisfied, sizeof *u);
1080 *u = r - (struct razor_property *) set->requires.data;
1086 razor_set_list_unsatisfied(struct razor_set *set)
1088 struct array unsatisfied;
1089 struct razor_property *requires, *r;
1090 unsigned long *u, *end;
1093 array_init(&unsatisfied);
1094 razor_set_validate(set, &unsatisfied);
1096 end = unsatisfied.data + unsatisfied.size;
1097 requires = set->requires.data;
1098 pool = set->string_pool.data;
1100 for (u = unsatisfied.data; u < end; u++) {
1102 printf("%s %s not satisfied\n",
1103 &pool[r->name], &pool[r->version]);
1106 array_release(&unsatisfied);
1109 #define UPSTREAM_SOURCE 0x80000000ul
1110 #define INDEX_MASK 0x00fffffful
1113 struct razor_set *set;
1114 unsigned long *requires_map;
1115 unsigned long *provides_map;
1119 prepare_source(struct source *source, struct razor_set *set)
1126 count = set->requires.size / sizeof (struct razor_property);
1127 size = count * sizeof *source->requires_map;
1128 source->requires_map = zalloc(size);
1130 count = set->provides.size / sizeof (struct razor_property);
1131 size = count * sizeof *source->provides_map;
1132 source->provides_map = zalloc(size);
1136 add_package(struct razor_importer *importer,
1137 struct razor_package *package, struct source *source,
1138 unsigned long flags)
1142 struct razor_package *p;
1144 pool = source->set->string_pool.data;
1145 p = array_add(&importer->set->packages, sizeof *p);
1146 p->name = razor_importer_tokenize(importer, &pool[package->name]);
1148 p->version = razor_importer_tokenize(importer,
1149 &pool[package->version]);
1150 p->requires = package->requires;
1151 p->provides = package->provides;
1153 r = (unsigned long *)
1154 source->set->requires_pool.data + package->requires;
1156 source->requires_map[*r++] = 1;
1158 r = (unsigned long *)
1159 source->set->provides_pool.data + package->provides;
1161 source->provides_map[*r++] = 1;
1165 /* Build the new package list sorted by merging the two package lists.
1166 * Build new string pool as we go. (for now we just re-use that part of
1169 merge_packages(struct razor_importer *importer,
1170 struct source *source1, struct source *source2,
1171 struct array *packages)
1173 struct razor_package *upstream_packages, *p, *s, *send;
1174 char *spool, *upool;
1175 unsigned long *u, *uend;
1178 upstream_packages = source2->set->packages.data;
1181 uend = packages->data + packages->size;
1182 upool = source2->set->string_pool.data;
1184 s = source1->set->packages.data;
1185 send = source1->set->packages.data + source1->set->packages.size;
1186 spool = source1->set->string_pool.data;
1189 p = upstream_packages + *u;
1192 cmp = strcmp(&spool[s->name], &upool[p->name]);
1193 if (u >= uend || cmp < 0) {
1194 add_package(importer, s, source1, 0);
1196 } else if (cmp == 0) {
1197 add_package(importer, p, source2, UPSTREAM_SOURCE);
1201 add_package(importer, p, source2, UPSTREAM_SOURCE);
1207 static unsigned long
1208 add_property(struct razor_importer *importer, struct array *properties,
1209 const char *name, const char *version)
1211 struct razor_property *p;
1213 p = array_add(properties, sizeof *p);
1214 p->name = razor_importer_tokenize(importer, name);
1215 p->version = razor_importer_tokenize(importer, version);
1217 return p - (struct razor_property *) properties->data;
1221 merge_properties(struct array *properties,
1222 struct razor_importer *importer,
1223 struct razor_set *set1,
1224 struct array *properties1,
1225 unsigned long *map1,
1226 struct razor_set *set2,
1227 struct array *properties2,
1228 unsigned long *map2)
1230 struct razor_property *p1, *p2;
1231 int i, j, cmp, count1, count2;
1232 char *pool1, *pool2;
1236 pool1 = set1->string_pool.data;
1237 pool2 = set2->string_pool.data;
1239 count1 = properties1->size / sizeof *p1;
1240 count2 = properties2->size / sizeof *p2;
1241 while (i < count1 || j < count2) {
1242 if (i < count1 && map1[i] == 0) {
1246 if (j < count2 && map2[j] == 0) {
1250 p1 = (struct razor_property *) properties1->data + i;
1251 p2 = (struct razor_property *) properties2->data + j;
1252 if (i < count1 && j < count2)
1253 cmp = strcmp(&pool1[p1->name], &pool2[p2->name]);
1254 else if (i < count1)
1259 cmp = versioncmp(&pool1[p1->version],
1260 &pool2[p2->version]);
1262 map1[i++] = add_property(importer,
1265 &pool1[p1->version]);
1266 } else if (cmp > 0) {
1267 map2[j++] = add_property(importer,
1270 &pool2[p2->version]);
1272 map1[i++] = map2[j++] = add_property(importer,
1275 &pool1[p1->version]);
1280 static unsigned long
1281 emit_properties(struct array *source_pool, unsigned long index,
1282 unsigned long *map, struct array *pool)
1284 unsigned long r, *p, *q;
1286 r = pool->size / sizeof *q;
1287 p = (unsigned long *) source_pool->data + index;
1289 q = array_add(pool, sizeof *q);
1293 q = array_add(pool, sizeof *q);
1299 /* Rebuild property->packages maps. We can't just remap these, as a
1300 * property may have lost or gained a number of packages. Allocate an
1301 * array per property and loop through the packages and add them to
1302 * the arrays for their properties. */
1304 rebuild_package_lists(struct razor_set *set)
1306 int requires_count, provides_count;
1307 struct array *requires_pkgs, *provides_pkgs, *a;
1308 struct razor_package *pkg, *pkg_end;
1309 struct razor_property *prop, *prop_end;
1310 unsigned long *r, *q, *rpool, *ppool;
1312 requires_count = set->requires.size / sizeof (struct razor_property);
1313 provides_count = set->provides.size / sizeof (struct razor_property);
1314 requires_pkgs = zalloc(requires_count * sizeof *requires_pkgs);
1315 provides_pkgs = zalloc(provides_count * sizeof *provides_pkgs);
1316 pkg_end = set->packages.data + set->packages.size;
1317 rpool = set->requires_pool.data;
1318 ppool = set->provides_pool.data;
1320 for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
1321 for (r = &rpool[pkg->requires]; *r != ~0; r++) {
1322 q = array_add(&requires_pkgs[*r], sizeof *q);
1323 *q = pkg - (struct razor_package *) set->packages.data;
1325 for (r = &ppool[pkg->provides]; *r != ~0; r++) {
1326 q = array_add(&provides_pkgs[*r], sizeof *q);
1327 *q = pkg - (struct razor_package *) set->packages.data;
1331 prop_end = set->requires.data + set->requires.size;
1333 for (prop = set->requires.data; prop < prop_end; prop++, a++) {
1334 prop->packages = add_to_property_pool(&set->requires_pool, a);
1337 free(requires_pkgs);
1339 prop_end = set->provides.data + set->provides.size;
1341 for (prop = set->provides.data; prop < prop_end; prop++, a++) {
1342 prop->packages = add_to_property_pool(&set->provides_pool, a);
1345 free(provides_pkgs);
1348 /* Add packages from 'upstream' to 'set'. The packages to add are
1349 * specified by the 'packages' array, which is a sorted list of
1350 * package indexes. Returns a newly allocated package set. Does not
1351 * enforce validity of the resulting package set.
1353 * This looks more complicated than it is. An easy way to merge two
1354 * package sets would be to just use a razor_importer, but that
1355 * requires resorting, and is thus O(n log n). We can do this in a
1356 * linear sweep, but it gets a little more complicated.
1359 razor_set_add(struct razor_set *set, struct razor_set *upstream,
1360 struct array *packages)
1362 struct razor_set *result;
1363 struct razor_importer *importer;
1364 struct razor_package *p, *pend;
1365 struct source source, upstream_source;
1367 importer = razor_importer_new();
1369 prepare_source(&upstream_source, upstream);
1370 prepare_source(&source, set);
1372 merge_packages(importer, &source, &upstream_source, packages);
1374 /* As we built the package list, we filled out a bitvector of
1375 * the properties that are referenced by the packages in the
1376 * new set. Now we do a parallel loop through the properties
1377 * and emit those marked in the bit vector to the new set. In
1378 * the process, we update the bit vector to actually map from
1379 * indices in the old property list to indices in the new
1380 * property list for both sets. */
1382 merge_properties(&importer->set->requires, importer,
1383 set, &set->requires, source.requires_map,
1384 upstream, &upstream->requires,
1385 upstream_source.requires_map);
1386 merge_properties(&importer->set->provides, importer,
1387 set, &set->provides, source.provides_map,
1388 upstream, &upstream->provides,
1389 upstream_source.provides_map);
1391 /* Now we loop through the packages again and emit the
1392 * property lists, remapped to point to the new properties. */
1394 pend = importer->set->packages.data + importer->set->packages.size;
1395 for (p = importer->set->packages.data; p < pend; p++) {
1398 if (p->name & UPSTREAM_SOURCE)
1399 src = &upstream_source;
1403 p->requires = emit_properties(&src->set->requires_pool,
1406 &importer->set->requires_pool);
1407 p->provides = emit_properties(&src->set->provides_pool,
1410 &importer->set->provides_pool);
1411 p->name &= INDEX_MASK;
1414 rebuild_package_lists(importer->set);
1416 result = importer->set;
1417 array_release(&importer->buckets);
1424 razor_set_satisfy(struct razor_set *set, struct array *unsatisfied,
1425 struct razor_set *upstream, struct array *list)
1427 struct razor_property *requires, *r;
1428 struct razor_property *p, *pend;
1429 unsigned long *u, *end, *pkg, *package_pool;
1432 end = unsatisfied->data + unsatisfied->size;
1433 requires = set->requires.data;
1434 pool = set->string_pool.data;
1436 p = upstream->provides.data;
1437 pend = upstream->provides.data + upstream->provides.size;
1438 upool = upstream->string_pool.data;
1439 package_pool = upstream->package_pool.data;
1441 for (u = unsatisfied->data; u < end; u++) {
1444 while (p < pend && strcmp(&pool[r->name], &upool[p->name]) > 0)
1446 /* If there is more than one version of a provides,
1447 * seek to the end for the highest version. */
1448 while (p + 1 < pend && p->name == (p + 1)->name)
1452 strcmp(&pool[r->name], &upool[p->name]) != 0 ||
1453 versioncmp(&pool[r->version], &upool[p->version]) > 0) {
1454 /* Do we need to track unsatisfiable requires
1455 * as we go, or should we just do a
1456 * razor_set_validate() at the end? */
1458 pkg = array_add(list, sizeof *pkg);
1459 /* We just pull in the first package that provides */
1460 *pkg = package_pool[p->packages];
1466 find_packages(struct razor_set *set,
1467 int count, const char **packages, struct array *list)
1469 struct razor_package *p;
1473 /* FIXME: Sort the packages. */
1474 for (i = 0; i < count; i++) {
1475 p = razor_set_get_package(set, packages[i]);
1476 r = array_add(list, sizeof *r);
1477 *r = p - (struct razor_package *) set->packages.data;
1482 find_all_packages(struct razor_set *set,
1483 struct razor_set *upstream, struct array *list)
1485 struct razor_package *p, *u, *pend, *uend;
1489 pend = set->packages.data + set->packages.size;
1490 pool = set->string_pool.data;
1491 u = upstream->packages.data;
1492 uend = upstream->packages.data + upstream->packages.size;
1493 upool = upstream->string_pool.data;
1495 for (p = set->packages.data; p < pend; p++) {
1496 while (u < uend && strcmp(&pool[p->name], &upool[u->name]) > 0)
1498 if (strcmp(&pool[p->name], &upool[u->name]) == 0) {
1499 r = array_add(list, sizeof *r);
1500 *r = u - (struct razor_package *) upstream->packages.data;
1506 razor_set_update(struct razor_set *set, struct razor_set *upstream,
1507 int count, const char **packages)
1509 struct razor_set *new;
1510 struct razor_package *upackages;
1511 struct array list, unsatisfied;
1513 unsigned long *u, *end;
1518 find_packages(upstream, count, packages, &list);
1520 find_all_packages(set, upstream, &list);
1522 end = list.data + list.size;
1523 upackages = upstream->packages.data;
1524 pool = upstream->string_pool.data;
1525 total += list.size / sizeof *u;
1527 while (list.size > 0) {
1528 new = razor_set_add(set, upstream, &list);
1529 array_release(&list);
1530 razor_set_destroy(set);
1533 array_init(&unsatisfied);
1534 razor_set_validate(new, &unsatisfied);
1536 razor_set_satisfy(new, &unsatisfied, upstream, &list);
1537 array_release(&unsatisfied);
1539 end = list.data + list.size;
1540 upackages = upstream->packages.data;
1541 pool = upstream->string_pool.data;
1542 total += list.size / sizeof *u;
1545 array_release(&list);
1550 /* The diff order matters. We should sort the packages so that a
1551 * REMOVE of a package comes before the INSTALL, and so that all
1552 * requires for a package have been installed before the package.
1556 razor_set_diff(struct razor_set *set, struct razor_set *upstream,
1557 razor_package_callback_t callback, void *data)
1559 struct razor_package *p, *pend, *u, *uend;
1560 char *ppool, *upool;
1563 p = set->packages.data;
1564 pend = set->packages.data + set->packages.size;
1565 ppool = set->string_pool.data;
1567 u = upstream->packages.data;
1568 uend = upstream->packages.data + upstream->packages.size;
1569 upool = upstream->string_pool.data;
1571 while (p < pend || u < uend) {
1572 if (p < pend && u < uend) {
1573 res = strcmp(&ppool[p->name], &upool[u->name]);
1575 res = versioncmp(&ppool[p->version],
1576 &upool[u->version]);
1579 if (u == uend || res < 0) {
1580 callback(&ppool[p->name], &ppool[p->version],
1584 } else if (p == pend || res > 0) {
1585 callback(&upool[u->name], NULL, &upool[u->version],