Add iterator API, boot-strap test suite.
17 #include "razor-internal.h"
24 struct razor_set_section {
30 struct razor_set_header {
33 struct razor_set_section sections[0];
36 #define RAZOR_MAGIC 0x7a7a7a7a
37 #define RAZOR_VERSION 1
39 #define RAZOR_ENTRY_LAST 0x80000000ul
40 #define RAZOR_IMMEDIATE 0x80000000ul
41 #define RAZOR_ENTRY_MASK 0x00fffffful
43 #define RAZOR_STRING_POOL 0
44 #define RAZOR_PACKAGES 1
45 #define RAZOR_PROPERTIES 2
47 #define RAZOR_PACKAGE_POOL 4
48 #define RAZOR_PROPERTY_POOL 5
49 #define RAZOR_FILE_POOL 6
51 struct razor_package {
53 unsigned long version;
54 unsigned long properties;
58 struct razor_property {
60 unsigned long version;
61 unsigned long packages;
67 unsigned long packages;
71 struct array string_pool;
72 struct array packages;
73 struct array properties;
75 struct array package_pool;
76 struct array property_pool;
77 struct array file_pool;
78 struct razor_set_header *header;
82 unsigned long package;
86 struct import_directory {
87 unsigned long name, count;
89 struct array packages;
90 struct import_directory *last;
98 struct razor_importer {
99 struct razor_set *set;
100 struct hashtable table;
101 struct razor_package *package;
102 struct array properties;
107 array_init(struct array *array)
109 memset(array, 0, sizeof *array);
113 array_release(struct array *array)
119 array_add(struct array *array, int size)
124 if (array->alloc > 0)
125 alloc = array->alloc;
129 while (alloc < array->size + size)
132 if (array->alloc < alloc) {
133 data = realloc(array->data, alloc);
137 array->alloc = alloc;
140 p = array->data + array->size;
157 struct razor_set_section razor_sections[] = {
158 { RAZOR_STRING_POOL, offsetof(struct razor_set, string_pool) },
159 { RAZOR_PACKAGES, offsetof(struct razor_set, packages) },
160 { RAZOR_PROPERTIES, offsetof(struct razor_set, properties) },
161 { RAZOR_FILES, offsetof(struct razor_set, files) },
162 { RAZOR_PACKAGE_POOL, offsetof(struct razor_set, package_pool) },
163 { RAZOR_PROPERTY_POOL, offsetof(struct razor_set, property_pool) },
164 { RAZOR_FILE_POOL, offsetof(struct razor_set, file_pool) },
168 razor_set_create(void)
170 return zalloc(sizeof(struct razor_set));
174 razor_set_open(const char *filename)
176 struct razor_set *set;
177 struct razor_set_section *s;
182 set = zalloc(sizeof *set);
183 fd = open(filename, O_RDONLY);
184 if (fstat(fd, &stat) < 0)
186 set->header = mmap(NULL, stat.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
187 if (set->header == MAP_FAILED) {
192 for (s = set->header->sections; ~s->type; s++) {
193 if (s->type >= ARRAY_SIZE(razor_sections))
195 if (s->type != razor_sections[s->type].type)
197 array = (void *) set + razor_sections[s->type].offset;
198 array->data = (void *) set->header + s->offset;
199 array->size = s->size;
200 array->alloc = s->size;
208 razor_set_destroy(struct razor_set *set)
215 for (i = 0; set->header->sections[i].type; i++)
217 size = set->header->sections[i].type;
218 munmap(set->header, size);
220 for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
221 a = (void *) set + razor_sections[i].offset;
230 razor_set_write(struct razor_set *set, const char *filename)
233 struct razor_set_header *header = (struct razor_set_header *) data;
235 unsigned long offset;
238 memset(data, 0, sizeof data);
239 header->magic = RAZOR_MAGIC;
240 header->version = RAZOR_VERSION;
241 offset = sizeof data;
243 for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
244 if (razor_sections[i].type != i)
246 a = (void *) set + razor_sections[i].offset;
247 header->sections[i].type = i;
248 header->sections[i].offset = offset;
249 header->sections[i].size = a->size;
250 offset += ALIGN(a->size, 4096);
253 header->sections[i].type = ~0;
254 header->sections[i].offset = 0;
255 header->sections[i].size = 0;
257 fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
261 razor_write(fd, data, sizeof data);
262 for (i = 0; i < ARRAY_SIZE(razor_sections); i++) {
263 if (razor_sections[i].type != i)
265 a = (void *) set + razor_sections[i].offset;
266 razor_write(fd, a->data, ALIGN(a->size, 4096));
275 hash_string(const char *key)
278 unsigned int hash = 0;
280 for (p = key; *p; p++)
281 hash = (hash * 617) ^ *p;
287 hashtable_lookup(struct hashtable *table, const char *key)
289 unsigned int mask, start, i;
293 pool = table->pool->data;
294 mask = table->buckets.alloc - 1;
295 start = hash_string(key) * sizeof(unsigned long);
297 for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
298 b = table->buckets.data + ((start + i) & mask);
303 if (strcmp(key, &pool[*b]) == 0)
311 add_to_string_pool(struct hashtable *table, const char *key)
316 len = strlen(key) + 1;
317 p = array_add(table->pool, len);
320 return p - (char *) table->pool->data;
324 add_to_property_pool(struct array *pool, struct array *properties)
328 if (properties->size == 0)
330 else if (properties->size == sizeof *p)
331 return *(unsigned long *) properties->data | RAZOR_IMMEDIATE;
333 p = array_add(pool, properties->size);
334 memcpy(p, properties->data, properties->size);
335 p[properties->size / sizeof *p - 1] |= RAZOR_IMMEDIATE;
337 return p - (unsigned long *) pool->data;
341 do_insert(struct hashtable *table, unsigned long value)
343 unsigned int mask, start, i;
347 key = (char *) table->pool->data + value;
348 mask = table->buckets.alloc - 1;
349 start = hash_string(key) * sizeof(unsigned long);
351 for (i = 0; i < table->buckets.alloc; i += sizeof *b) {
352 b = table->buckets.data + ((start + i) & mask);
361 hashtable_insert(struct hashtable *table, const char *key)
363 unsigned long value, *buckets, *b, *end;
366 alloc = table->buckets.alloc;
367 array_add(&table->buckets, 4 * sizeof *buckets);
368 if (alloc != table->buckets.alloc) {
369 end = table->buckets.data + alloc;
370 memset(end, 0, table->buckets.alloc - alloc);
371 for (b = table->buckets.data; b < end; b++) {
375 do_insert(table, value);
380 value = add_to_string_pool(table, key);
381 do_insert (table, value);
387 hashtable_init(struct hashtable *table, struct array *pool)
389 array_init(&table->buckets);
394 hashtable_release(struct hashtable *table)
396 array_release(&table->buckets);
400 hashtable_tokenize(struct hashtable *table, const char *string)
407 token = hashtable_lookup(table, string);
411 return hashtable_insert(table, string);
415 razor_importer_tokenize(struct razor_importer *importer, const char *string)
417 return hashtable_tokenize(&importer->table, string);
421 razor_importer_begin_package(struct razor_importer *importer,
422 const char *name, const char *version)
424 struct razor_package *p;
426 p = array_add(&importer->set->packages, sizeof *p);
427 p->name = razor_importer_tokenize(importer, name);
428 p->version = razor_importer_tokenize(importer, version);
430 importer->package = p;
431 array_init(&importer->properties);
435 razor_importer_finish_package(struct razor_importer *importer)
437 struct razor_package *p;
439 p = importer->package;
440 p->properties = add_to_property_pool(&importer->set->property_pool,
441 &importer->properties);
443 array_release(&importer->properties);
447 razor_importer_add_property(struct razor_importer *importer,
448 const char *name, const char *version,
449 enum razor_property_type type)
451 struct razor_property *p;
454 p = array_add(&importer->set->properties, sizeof *p);
455 p->name = razor_importer_tokenize(importer, name) | (type << 30);
456 p->version = razor_importer_tokenize(importer, version);
457 p->packages = importer->package -
458 (struct razor_package *) importer->set->packages.data;
460 r = array_add(&importer->properties, sizeof *r);
461 *r = p - (struct razor_property *) importer->set->properties.data;
465 razor_importer_add_file(struct razor_importer *importer, const char *name)
467 struct import_entry *e;
469 e = array_add(&importer->files, sizeof *e);
471 e->package = importer->package -
472 (struct razor_package *) importer->set->packages.data;
473 e->name = strdup(name);
476 struct razor_importer *
477 razor_importer_new(void)
479 struct razor_importer *importer;
481 importer = zalloc(sizeof *importer);
482 importer->set = razor_set_create();
483 hashtable_init(&importer->table, &importer->set->string_pool);
488 /* Destroy an importer without creating the set. */
490 razor_importer_destroy(struct razor_importer *importer)
492 /* FIXME: write this */
496 typedef int (*compare_with_data_func_t)(const void *p1,
500 struct qsort_context {
502 compare_with_data_func_t compare;
507 qsort_swap(void *p1, void *p2, size_t size)
511 memcpy(buffer, p1, size);
512 memcpy(p1, p2, size);
513 memcpy(p2, buffer, size);
517 __qsort_with_data(void *base, size_t nelem, unsigned long *map,
518 struct qsort_context *ctx)
520 void *p, *start, *end, *pivot;
521 unsigned long *mp, *mstart, *mend, tmp;
522 int left, right, result;
523 size_t size = ctx->size;
527 end = base + nelem * size;
531 pivot = base + (random() % nelem) * size;
534 result = ctx->compare(p, pivot, ctx->data);
536 qsort_swap(p, start, size);
546 } else if (result == 0) {
552 qsort_swap(p, end, size);
561 left = (start - base) / size;
562 right = (base + nelem * size - end) / size;
564 __qsort_with_data(base, left, map, ctx);
566 __qsort_with_data(end, right, mend, ctx);
570 qsort_with_data(void *base, size_t nelem, size_t size,
571 compare_with_data_func_t compare, void *data)
573 struct qsort_context ctx;
581 ctx.compare = compare;
584 map = malloc(nelem * sizeof (unsigned long));
585 for (i = 0; i < nelem; i++)
588 __qsort_with_data(base, nelem, map, &ctx);
594 versioncmp(const char *s1, const char *s2)
600 n1 = strtol(s1, (char **) &p1, 0);
601 n2 = strtol(s2, (char **) &p2, 0);
603 /* Epoch; if one but not the other has an epoch set, default
604 * the epoch-less version to 0. */
605 res = (*p1 == ':') - (*p2 == ':');
610 } else if (res > 0) {
623 if (isdigit(*p1) && isdigit(*p2))
624 return versioncmp(p1, p2);
632 compare_packages(const void *p1, const void *p2, void *data)
634 const struct razor_package *pkg1 = p1, *pkg2 = p2;
635 struct razor_set *set = data;
636 char *pool = set->string_pool.data;
638 if (pkg1->name == pkg2->name)
639 return versioncmp(&pool[pkg1->version], &pool[pkg2->version]);
641 return strcmp(&pool[pkg1->name], &pool[pkg2->name]);
645 compare_properties(const void *p1, const void *p2, void *data)
647 const struct razor_property *prop1 = p1, *prop2 = p2;
648 struct razor_set *set = data;
649 char *pool = set->string_pool.data;
651 if (prop1->name == prop2->name)
652 return versioncmp(&pool[prop1->version],
653 &pool[prop2->version]);
654 else if ((prop1->name & RAZOR_ENTRY_MASK) == (prop2->name & RAZOR_ENTRY_MASK))
655 return (prop1->name >> 30) - (prop2->name >> 30);
657 return strcmp(&pool[prop1->name & RAZOR_ENTRY_MASK],
658 &pool[prop2->name & RAZOR_ENTRY_MASK]);
661 static unsigned long *
662 uniqueify_properties(struct razor_set *set)
664 struct razor_property *rp, *up, *rp_end;
665 struct array *pkgs, *p;
666 unsigned long *map, *rmap, *r;
667 int i, count, unique;
669 count = set->properties.size / sizeof(struct razor_property);
670 map = qsort_with_data(set->properties.data,
672 sizeof(struct razor_property),
676 rp_end = set->properties.data + set->properties.size;
677 rmap = malloc(count * sizeof *map);
678 pkgs = zalloc(count * sizeof *pkgs);
679 for (rp = set->properties.data, up = rp, i = 0; rp < rp_end; rp++, i++) {
680 if (rp->name != up->name || rp->version != up->version) {
683 up->version = rp->version;
686 unique = up - (struct razor_property *) set->properties.data;
687 rmap[map[i]] = unique;
688 r = array_add(&pkgs[unique], sizeof *r);
694 set->properties.size = (void *) up - set->properties.data;
696 for (rp = set->properties.data, p = pkgs; rp < rp_end; rp++, p++) {
697 if (p->size / sizeof *r == 1) {
699 rp->packages = *r | RAZOR_IMMEDIATE;
702 add_to_property_pool(&set->package_pool, p);
713 remap_links(struct array *links, unsigned long *map)
715 unsigned long *p, *end;
717 end = links->data + links->size;
718 for (p = links->data; p < end; p++)
719 *p = map[*p & RAZOR_ENTRY_MASK] | (*p & ~RAZOR_ENTRY_MASK);
723 compare_filenames(const void *p1, const void *p2, void *data)
725 const struct import_entry *e1 = p1;
726 const struct import_entry *e2 = p2;
728 return strcmp(e1->name, e2->name);
732 count_entries(struct import_directory *d)
734 struct import_directory *p, *end;
737 end = d->files.data + d->files.size;
741 d->count += p->count + 1;
747 serialize_files(struct razor_set *set,
748 struct import_directory *d, struct array *array)
750 struct import_directory *p, *end;
751 struct razor_entry *e = NULL;
755 end = d->files.data + d->files.size;
756 s = array->size / sizeof *e + d->files.size / sizeof *p;
758 e = array_add(array, sizeof *e);
760 e->start = p->count > 0 ? s : 0;
763 if (p->packages.size == 0) {
765 } else if (p->packages.size / sizeof *r == 1) {
766 r = p->packages.data;
767 e->packages = *r | RAZOR_IMMEDIATE;
769 e->packages = add_to_property_pool(&set->package_pool,
772 array_release(&p->packages);
776 e->name |= RAZOR_ENTRY_LAST;
779 end = d->files.data + d->files.size;
781 serialize_files(set, p, array);
787 remap_property_package_links(struct array *properties, unsigned long *rmap)
789 struct razor_property *p, *end;
791 end = properties->data + properties->size;
792 for (p = properties->data; p < end; p++)
793 if (p->packages & RAZOR_IMMEDIATE)
794 p->packages = rmap[p->packages & RAZOR_ENTRY_MASK] |
799 build_file_tree(struct razor_importer *importer)
801 int count, i, length;
802 struct import_entry *filenames;
804 unsigned long name, *r;
806 struct import_directory *d, root;
807 struct razor_entry *e;
809 count = importer->files.size / sizeof (struct import_entry);
810 qsort_with_data(importer->files.data,
812 sizeof (struct import_entry),
816 root.name = razor_importer_tokenize(importer, "");
817 array_init(&root.files);
818 array_init(&root.packages);
821 filenames = importer->files.data;
822 for (i = 0; i < count; i++) {
823 f = filenames[i].name;
830 end = strchr(f, '/');
834 memcpy(dirname, f, length);
835 dirname[length] ='\0';
836 name = razor_importer_tokenize(importer, dirname);
837 if (d->last == NULL || d->last->name != name) {
838 d->last = array_add(&d->files, sizeof *d);
839 d->last->name = name;
840 d->last->last = NULL;
841 array_init(&d->last->files);
842 array_init(&d->last->packages);
850 r = array_add(&d->packages, sizeof *r);
851 *r = filenames[i].package;
852 free(filenames[i].name);
855 count_entries(&root);
856 array_init(&importer->set->files);
858 e = array_add(&importer->set->files, sizeof *e);
859 e->name = root.name | RAZOR_ENTRY_LAST;
863 serialize_files(importer->set, &root, &importer->set->files);
865 array_release(&importer->files);
869 build_package_file_lists(struct razor_set *set, unsigned long *rmap)
871 struct razor_package *p, *packages;
873 struct razor_entry *e, *end;
874 unsigned long *r, *q;
877 count = set->packages.size / sizeof *p;
878 pkgs = zalloc(count * sizeof *pkgs);
880 end = set->files.data + set->files.size;
881 for (e = set->files.data; e < end; e++) {
882 if (e->packages == ~0) {
884 } else if (e->packages & RAZOR_IMMEDIATE) {
885 e->packages = rmap[e->packages & RAZOR_ENTRY_MASK] |
889 r = (unsigned long *) set->package_pool.data + e->packages;
893 q = array_add(&pkgs[*r & RAZOR_ENTRY_MASK], sizeof *q);
894 *q = e - (struct razor_entry *) set->files.data;
895 if (*r++ & RAZOR_IMMEDIATE)
900 packages = set->packages.data;
901 for (i = 0; i < count; i++) {
903 add_to_property_pool(&set->file_pool, &pkgs[i]);
904 array_release(&pkgs[i]);
910 razor_importer_finish(struct razor_importer *importer)
912 struct razor_set *set;
913 unsigned long *map, *rmap;
916 map = uniqueify_properties(importer->set);
917 remap_links(&importer->set->property_pool, map);
920 count = importer->set->packages.size / sizeof(struct razor_package);
921 map = qsort_with_data(importer->set->packages.data,
923 sizeof(struct razor_package),
927 rmap = malloc(count * sizeof *rmap);
928 for (i = 0; i < count; i++)
932 build_file_tree(importer);
933 remap_links(&importer->set->package_pool, rmap);
934 build_package_file_lists(importer->set, rmap);
935 remap_property_package_links(&importer->set->properties, rmap);
939 hashtable_release(&importer->table);
945 struct razor_package_iterator {
946 struct razor_set *set;
947 struct razor_package *package, *end;
950 struct razor_package_iterator *
951 razor_package_iterator_create(struct razor_set *set)
953 struct razor_package_iterator *pi;
955 pi = zalloc(sizeof *pi);
957 pi->package = set->packages.data;
958 pi->end = set->packages.data + set->packages.size;
964 razor_package_iterator_next(struct razor_package_iterator *pi,
965 struct razor_package **package,
966 const char **name, const char **version)
970 pool = pi->set->string_pool.data;
971 *package = pi->package;
972 *name = &pool[pi->package->name];
973 *version = &pool[pi->package->version];
975 return pi->package++ < pi->end;
979 razor_package_iterator_destroy(struct razor_package_iterator *pi)
984 struct razor_set *bsearch_set;
987 compare_package_name(const void *key, const void *data)
989 const struct razor_package *p = data;
992 pool = bsearch_set->string_pool.data;
994 return strcmp(key, &pool[p->name]);
997 struct razor_package *
998 razor_set_get_package(struct razor_set *set, const char *package)
1001 return bsearch(package, set->packages.data,
1002 set->packages.size / sizeof(struct razor_package),
1003 sizeof(struct razor_package), compare_package_name);
1007 compare_property_name(const void *key, const void *data)
1009 const struct razor_property *p = data;
1012 pool = bsearch_set->string_pool.data;
1014 return strcmp(key, &pool[p->name & RAZOR_ENTRY_MASK]);
1017 struct razor_property *
1018 razor_set_get_property(struct razor_set *set, const char *property)
1020 struct razor_property *p, *start;
1023 p = bsearch(property, set->properties.data,
1024 set->properties.size / sizeof(struct razor_property),
1025 sizeof(struct razor_property), compare_property_name);
1027 start = set->properties.data;
1029 ((p - 1)->name & RAZOR_ENTRY_MASK) ==
1030 (p->name & RAZOR_ENTRY_MASK))
1036 struct razor_property_iterator {
1037 struct razor_set *set;
1038 struct razor_property *property, *end;
1039 unsigned long *index;
1043 struct razor_property_iterator *
1044 razor_property_iterator_create(struct razor_set *set,
1045 struct razor_package *package)
1047 struct razor_property_iterator *pi;
1049 pi = zalloc(sizeof *pi);
1051 pi->property = set->properties.data;
1052 pi->end = set->properties.data + set->properties.size;
1054 pi->index = (unsigned long *)
1055 set->property_pool.data + package->properties;
1066 razor_property_iterator_next(struct razor_property_iterator *pi,
1067 struct razor_property **property,
1068 const char **name, const char **version,
1069 enum razor_property_type *type)
1072 unsigned long flags, index;
1074 struct razor_property *p, *properties;
1077 properties = pi->set->properties.data;
1078 p = &properties[*pi->index & RAZOR_ENTRY_MASK];
1080 pi->last = (*pi->index++ & RAZOR_IMMEDIATE) != 0;
1085 valid = p < pi->end;
1088 pool = pi->set->string_pool.data;
1090 *name = &pool[p->name & RAZOR_ENTRY_MASK];
1091 *version = &pool[p->version];
1092 *type = p->name >> 30;
1098 razor_property_iterator_destroy(struct razor_property_iterator *pi)
1104 razor_set_list_property_packages(struct razor_set *set,
1106 const char *version,
1107 enum razor_property_type type)
1109 struct razor_property *property, *end;
1110 struct razor_package *p, *packages;
1117 property = razor_set_get_property(set, name);
1118 packages = set->packages.data;
1119 pool = set->string_pool.data;
1120 end = set->properties.data + set->properties.size;
1121 while (property < end &&
1122 strcmp(name, &pool[property->name & RAZOR_ENTRY_MASK]) == 0) {
1124 versioncmp(version, &pool[property->version]) != 0)
1126 if (type != (property->name >> 30))
1129 if (property->packages & RAZOR_IMMEDIATE)
1130 r = &property->packages;
1132 r = (unsigned long *)
1133 set->package_pool.data + property->packages;
1135 p = &packages[*r & RAZOR_ENTRY_MASK];
1137 &pool[p->name & RAZOR_ENTRY_MASK],
1139 if (*r++ & RAZOR_IMMEDIATE)
1147 static struct razor_entry *
1148 find_entry(struct razor_set *set, struct razor_entry *dir, const char *pattern)
1150 struct razor_entry *e;
1151 const char *n, *pool = set->string_pool.data;
1154 e = (struct razor_entry *) set->files.data + dir->start;
1156 n = pool + (e->name & RAZOR_ENTRY_MASK);
1157 if (strcmp(pattern + 1, n) == 0)
1160 if (e->start != 0 && strncmp(pattern + 1, n, len) == 0 &&
1161 pattern[len + 1] == '/') {
1162 return find_entry(set, e, pattern + len + 1);
1164 } while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
1170 list_dir(struct razor_set *set, struct razor_entry *dir,
1171 const char *prefix, const char *pattern)
1173 struct razor_entry *e;
1174 const char *n, *pool = set->string_pool.data;
1176 e = (struct razor_entry *) set->files.data + dir->start;
1178 n = pool + (e->name & RAZOR_ENTRY_MASK);
1179 if (pattern && pattern[0] && fnmatch(pattern, n, 0) != 0)
1181 printf("%s/%s%s\n", prefix, n, e->start > 0 ? "/" : "");
1182 } while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
1186 razor_set_list_files(struct razor_set *set, const char *pattern)
1188 struct razor_entry *e;
1189 char buffer[512], *p, *base;
1191 if (pattern == NULL)
1194 strcpy(buffer, pattern);
1195 e = find_entry(set, set->files.data, buffer);
1196 if (e && e->start > 0) {
1199 p = strrchr(buffer, '/');
1207 e = find_entry(set, set->files.data, buffer);
1209 list_dir(set, e, buffer, base);
1213 razor_set_list_file_packages(struct razor_set *set, const char *filename)
1215 struct razor_entry *e;
1216 struct razor_package *packages, *p;
1220 e = find_entry(set, set->files.data, filename);
1224 if (e->packages & RAZOR_IMMEDIATE)
1227 r = (unsigned long *) set->package_pool.data + e->packages;
1229 packages = set->packages.data;
1230 pool = set->string_pool.data;
1232 p = &packages[*r & RAZOR_ENTRY_MASK];
1233 printf("%s-%s\n", &pool[p->name], &pool[p->version]);
1234 if (*r++ & RAZOR_IMMEDIATE)
1239 static unsigned long *
1240 list_package_files(struct razor_set *set, unsigned long *r,
1241 struct razor_entry *dir, unsigned long end,
1244 struct razor_entry *e, *f, *entries;
1245 unsigned long next, file;
1249 entries = (struct razor_entry *) set->files.data;
1250 pool = set->string_pool.data;
1252 e = entries + dir->start;
1254 if (entries + (*r & RAZOR_ENTRY_MASK) == e) {
1255 printf("%s/%s\n", prefix,
1256 pool + (e->name & RAZOR_ENTRY_MASK));
1257 if (*r & RAZOR_ENTRY_LAST)
1260 if ((*r & RAZOR_ENTRY_MASK) >= end)
1263 } while (!((e++)->name & RAZOR_ENTRY_LAST));
1265 e = entries + dir->start;
1270 if (e->name & RAZOR_ENTRY_LAST)
1274 while (f->start == 0 && !(f->name & RAZOR_ENTRY_LAST))
1282 file = *r & RAZOR_ENTRY_MASK;
1283 if (e->start <= file && file < next) {
1284 len = strlen(prefix);
1286 strcpy(prefix + len + 1,
1287 pool + (e->name & RAZOR_ENTRY_MASK));
1288 r = list_package_files(set, r, e, next, prefix);
1291 } while (!((e++)->name & RAZOR_ENTRY_LAST) && r != NULL);
1297 razor_set_list_package_files(struct razor_set *set, const char *name)
1299 struct razor_package *package;
1300 unsigned long *r, end;
1303 package = razor_set_get_package(set, name);
1305 r = (unsigned long *) set->file_pool.data + package->files;
1306 end = set->files.size / sizeof (struct razor_entry);
1308 list_package_files(set, r, set->files.data, end, buffer);
1312 razor_set_validate(struct razor_set *set, struct array *unsatisfied)
1314 struct razor_property *r, *p, *end;
1318 end = set->properties.data + set->properties.size;
1319 pool = set->string_pool.data;
1321 for (r = set->properties.data, p = r; r < end; r++) {
1322 if (r->name >> 30 != RAZOR_PROPERTY_REQUIRES)
1325 if ((r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK)) {
1327 while (p < end && p->name == r->name)
1331 /* If there is more than one version of a provides,
1332 * seek to the end for the highest version. */
1333 /* FIXME: This doesn't work if we have a series of
1334 * requires a = 1, provides a = 1, requires a = 2,
1335 * provides a = 2, as the kernel and kernel-devel
1337 while (p + 1 < end && p->name == (p + 1)->name)
1340 /* FIXME: We need to track property flags (<, <=, =
1341 * etc) to properly determine if a requires is
1342 * satisfied. The current code doesn't track that the
1343 * requires a = 1 isn't satisfied by a = 2 provides. */
1346 (p->name >> 30) != RAZOR_PROPERTY_PROVIDES ||
1347 (r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK) ||
1348 versioncmp(&pool[r->version], &pool[p->version]) > 0) {
1349 /* FIXME: We ignore file requires for now. */
1350 if (pool[r->name & RAZOR_ENTRY_MASK] == '/')
1352 u = array_add(unsatisfied, sizeof *u);
1353 *u = r - (struct razor_property *) set->properties.data;
1359 razor_set_list_unsatisfied(struct razor_set *set)
1361 struct array unsatisfied;
1362 struct razor_property *properties, *r;
1363 unsigned long *u, *end;
1366 array_init(&unsatisfied);
1367 razor_set_validate(set, &unsatisfied);
1369 end = unsatisfied.data + unsatisfied.size;
1370 properties = set->properties.data;
1371 pool = set->string_pool.data;
1373 for (u = unsatisfied.data; u < end; u++) {
1374 r = properties + *u;
1375 if (pool[r->version] == '\0')
1376 printf("%ss not satisfied\n",
1377 &pool[r->name & RAZOR_ENTRY_MASK]);
1379 printf("%s-%s not satisfied\n",
1380 &pool[r->name & RAZOR_ENTRY_MASK],
1384 array_release(&unsatisfied);
1387 #define UPSTREAM_SOURCE 0x80000000ul
1388 #define INDEX_MASK 0x00fffffful
1391 struct razor_set *set;
1392 unsigned long *property_map;
1395 struct razor_merger {
1396 struct razor_set *set;
1397 struct hashtable table;
1398 struct source source1;
1399 struct source source2;
1402 static struct razor_merger *
1403 razor_merger_create(struct razor_set *set1, struct razor_set *set2)
1405 struct razor_merger *merger;
1409 merger = zalloc(sizeof *merger);
1410 merger->set = razor_set_create();
1411 hashtable_init(&merger->table, &merger->set->string_pool);
1413 count = set1->properties.size / sizeof (struct razor_property);
1414 size = count * sizeof merger->source1.property_map[0];
1415 merger->source1.property_map = zalloc(size);
1416 merger->source1.set = set1;
1418 count = set2->properties.size / sizeof (struct razor_property);
1419 size = count * sizeof merger->source2.property_map[0];
1420 merger->source2.property_map = zalloc(size);
1421 merger->source2.set = set2;
1427 add_package(struct razor_merger *merger,
1428 struct razor_package *package, struct source *source,
1429 unsigned long flags)
1433 struct razor_package *p;
1435 pool = source->set->string_pool.data;
1436 p = array_add(&merger->set->packages, sizeof *p);
1437 p->name = hashtable_tokenize(&merger->table, &pool[package->name]);
1439 p->version = hashtable_tokenize(&merger->table,
1440 &pool[package->version]);
1441 p->properties = package->properties;
1443 if (package->properties & RAZOR_IMMEDIATE)
1444 r = &package->properties;
1446 r = (unsigned long *)
1447 source->set->property_pool.data + package->properties;
1449 source->property_map[*r & RAZOR_ENTRY_MASK] = 1;
1450 if (*r++ & RAZOR_IMMEDIATE)
1456 /* Build the new package list sorted by merging the two package lists.
1457 * Build new string pool as we go. */
1459 merge_packages(struct razor_merger *merger, struct array *packages)
1461 struct razor_package *upstream_packages, *p, *s, *send;
1462 struct source *source1, *source2;
1463 char *spool, *upool;
1464 unsigned long *u, *uend;
1467 source1 = &merger->source1;
1468 source2 = &merger->source2;
1469 upstream_packages = source2->set->packages.data;
1472 uend = packages->data + packages->size;
1473 upool = source2->set->string_pool.data;
1475 s = source1->set->packages.data;
1476 send = source1->set->packages.data + source1->set->packages.size;
1477 spool = source1->set->string_pool.data;
1480 p = upstream_packages + *u;
1483 cmp = strcmp(&spool[s->name], &upool[p->name]);
1484 if (u >= uend || cmp < 0) {
1485 add_package(merger, s, source1, 0);
1487 } else if (cmp == 0) {
1488 add_package(merger, p, source2, UPSTREAM_SOURCE);
1492 add_package(merger, p, source2, UPSTREAM_SOURCE);
1498 static unsigned long
1499 add_property(struct razor_merger *merger,
1500 const char *name, const char *version, int type)
1502 struct razor_property *p;
1504 p = array_add(&merger->set->properties, sizeof *p);
1505 p->name = hashtable_tokenize(&merger->table, name) | (type << 30);
1506 p->version = hashtable_tokenize(&merger->table, version);
1508 return p - (struct razor_property *) merger->set->properties.data;
1512 merge_properties(struct razor_merger *merger)
1514 struct razor_property *p1, *p2;
1515 struct razor_set *set1, *set2;
1516 unsigned long *map1, *map2;
1517 int i, j, cmp, count1, count2;
1518 char *pool1, *pool2;
1520 set1 = merger->source1.set;
1521 set2 = merger->source2.set;
1522 map1 = merger->source1.property_map;
1523 map2 = merger->source2.property_map;
1527 pool1 = set1->string_pool.data;
1528 pool2 = set2->string_pool.data;
1530 count1 = set1->properties.size / sizeof *p1;
1531 count2 = set2->properties.size / sizeof *p2;
1532 while (i < count1 || j < count2) {
1533 if (i < count1 && map1[i] == 0) {
1537 if (j < count2 && map2[j] == 0) {
1541 p1 = (struct razor_property *) set1->properties.data + i;
1542 p2 = (struct razor_property *) set2->properties.data + j;
1543 if (i < count1 && j < count2)
1544 cmp = strcmp(&pool1[p1->name & RAZOR_ENTRY_MASK],
1545 &pool2[p2->name & RAZOR_ENTRY_MASK]);
1546 else if (i < count1)
1551 cmp = versioncmp(&pool1[p1->version],
1552 &pool2[p2->version]);
1554 map1[i++] = add_property(merger,
1555 &pool1[p1->name & RAZOR_ENTRY_MASK],
1556 &pool1[p1->version],
1558 } else if (cmp > 0) {
1559 map2[j++] = add_property(merger,
1560 &pool2[p2->name & RAZOR_ENTRY_MASK],
1561 &pool2[p2->version],
1564 map1[i++] = map2[j++] = add_property(merger,
1565 &pool1[p1->name & RAZOR_ENTRY_MASK],
1566 &pool1[p1->version],
1572 static unsigned long
1573 emit_properties(struct array *source_pool, unsigned long index,
1574 unsigned long *map, struct array *pool)
1576 unsigned long r, *p, *q;
1578 r = pool->size / sizeof *q;
1579 p = (unsigned long *) source_pool->data + index;
1581 q = array_add(pool, sizeof *q);
1582 *q = map[*p & RAZOR_ENTRY_MASK] | (*p & ~RAZOR_ENTRY_MASK);
1583 if (*p++ & RAZOR_ENTRY_LAST)
1590 /* Rebuild property->packages maps. We can't just remap these, as a
1591 * property may have lost or gained a number of packages. Allocate an
1592 * array per property and loop through the packages and add them to
1593 * the arrays for their properties. */
1595 rebuild_package_lists(struct razor_set *set)
1597 struct array *pkgs, *a;
1598 struct razor_package *pkg, *pkg_end;
1599 struct razor_property *prop, *prop_end;
1600 unsigned long *r, *q, *pool;
1603 count = set->properties.size / sizeof (struct razor_property);
1604 pkgs = zalloc(count * sizeof *pkgs);
1605 pkg_end = set->packages.data + set->packages.size;
1606 pool = set->property_pool.data;
1608 for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
1609 for (r = &pool[pkg->properties]; ; r++) {
1610 q = array_add(&pkgs[*r & RAZOR_ENTRY_MASK], sizeof *q);
1611 *q = pkg - (struct razor_package *) set->packages.data;
1612 if (*r & RAZOR_IMMEDIATE)
1617 prop_end = set->properties.data + set->properties.size;
1619 for (prop = set->properties.data; prop < prop_end; prop++, a++) {
1620 if (a->size / sizeof *r == 1) {
1622 prop->packages = *r | RAZOR_IMMEDIATE;
1625 add_to_property_pool(&set->property_pool, a);
1633 razor_merger_finish(struct razor_merger *merger)
1635 struct razor_set *result;
1637 result = merger->set;
1638 hashtable_release(&merger->table);
1644 /* Add packages from 'upstream' to 'set'. The packages to add are
1645 * specified by the 'packages' array, which is a sorted list of
1646 * package indexes. Returns a newly allocated package set. Does not
1647 * enforce validity of the resulting package set.
1649 * This looks more complicated than it is. An easy way to merge two
1650 * package sets would be to just use a razor_importer, but that
1651 * requires resorting, and is thus O(n log n). We can do this in a
1652 * linear sweep, but it gets a little more complicated.
1655 razor_set_add(struct razor_set *set, struct razor_set *upstream,
1656 struct array *packages)
1658 struct razor_merger *merger;
1659 struct razor_package *p, *pend;
1661 merger = razor_merger_create(set, upstream);
1663 merge_packages(merger, packages);
1665 /* As we built the package list, we filled out a bitvector of
1666 * the properties that are referenced by the packages in the
1667 * new set. Now we do a parallel loop through the properties
1668 * and emit those marked in the bit vector to the new set. In
1669 * the process, we update the bit vector to actually map from
1670 * indices in the old property list to indices in the new
1671 * property list for both sets. */
1673 merge_properties(merger);
1675 /* Now we loop through the packages again and emit the
1676 * property lists, remapped to point to the new properties. */
1678 pend = merger->set->packages.data + merger->set->packages.size;
1679 for (p = merger->set->packages.data; p < pend; p++) {
1682 if (p->name & UPSTREAM_SOURCE)
1683 src = &merger->source2;
1685 src = &merger->source1;
1687 p->properties = emit_properties(&src->set->property_pool,
1690 &merger->set->property_pool);
1691 p->name &= INDEX_MASK;
1694 rebuild_package_lists(merger->set);
1696 return razor_merger_finish(merger);
1700 razor_set_satisfy(struct razor_set *set, struct array *unsatisfied,
1701 struct razor_set *upstream, struct array *list)
1703 struct razor_property *requires, *r;
1704 struct razor_property *p, *pend;
1705 unsigned long *u, *end, *pkg, *package_pool;
1708 end = unsatisfied->data + unsatisfied->size;
1709 requires = set->properties.data;
1710 pool = set->string_pool.data;
1712 p = upstream->properties.data;
1713 pend = upstream->properties.data + upstream->properties.size;
1714 upool = upstream->string_pool.data;
1715 package_pool = upstream->package_pool.data;
1717 for (u = unsatisfied->data; u < end; u++) {
1721 strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
1722 &upool[p->name & RAZOR_ENTRY_MASK]) > 0 &&
1723 (p->name >> 30) != RAZOR_PROPERTY_PROVIDES)
1725 /* If there is more than one version of a provides,
1726 * seek to the end for the highest version. */
1727 while (p + 1 < pend && p->name == (p + 1)->name)
1731 strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
1732 &upool[p->name & RAZOR_ENTRY_MASK]) != 0 ||
1733 versioncmp(&pool[r->version], &upool[p->version]) > 0) {
1734 /* Do we need to track unsatisfiable requires
1735 * as we go, or should we just do a
1736 * razor_set_validate() at the end? */
1738 pkg = array_add(list, sizeof *pkg);
1739 /* We just pull in the first package that provides */
1740 if (p->packages & RAZOR_IMMEDIATE)
1741 *pkg = p->packages & RAZOR_ENTRY_MASK;
1743 *pkg = package_pool[p->packages];
1749 find_packages(struct razor_set *set,
1750 int count, const char **packages, struct array *list)
1752 struct razor_package *p;
1756 /* FIXME: Sort the packages. */
1757 for (i = 0; i < count; i++) {
1758 p = razor_set_get_package(set, packages[i]);
1759 r = array_add(list, sizeof *r);
1760 *r = p - (struct razor_package *) set->packages.data;
1765 find_all_packages(struct razor_set *set,
1766 struct razor_set *upstream, struct array *list)
1768 struct razor_package *p, *u, *pend, *uend;
1772 pend = set->packages.data + set->packages.size;
1773 pool = set->string_pool.data;
1774 u = upstream->packages.data;
1775 uend = upstream->packages.data + upstream->packages.size;
1776 upool = upstream->string_pool.data;
1778 for (p = set->packages.data; p < pend; p++) {
1779 while (u < uend && strcmp(&pool[p->name], &upool[u->name]) > 0)
1781 if (strcmp(&pool[p->name], &upool[u->name]) == 0) {
1782 r = array_add(list, sizeof *r);
1783 *r = u - (struct razor_package *) upstream->packages.data;
1789 razor_set_update(struct razor_set *set, struct razor_set *upstream,
1790 int count, const char **packages)
1792 struct razor_set *new;
1793 struct razor_package *upackages;
1794 struct array list, unsatisfied;
1796 unsigned long *u, *end;
1801 find_packages(upstream, count, packages, &list);
1803 find_all_packages(set, upstream, &list);
1805 end = list.data + list.size;
1806 upackages = upstream->packages.data;
1807 pool = upstream->string_pool.data;
1808 total += list.size / sizeof *u;
1810 while (list.size > 0) {
1811 new = razor_set_add(set, upstream, &list);
1812 array_release(&list);
1813 razor_set_destroy(set);
1816 array_init(&unsatisfied);
1817 razor_set_validate(new, &unsatisfied);
1819 razor_set_satisfy(new, &unsatisfied, upstream, &list);
1820 array_release(&unsatisfied);
1822 end = list.data + list.size;
1823 upackages = upstream->packages.data;
1824 pool = upstream->string_pool.data;
1825 total += list.size / sizeof *u;
1828 array_release(&list);
1833 /* The diff order matters. We should sort the packages so that a
1834 * REMOVE of a package comes before the INSTALL, and so that all
1835 * requires for a package have been installed before the package.
1839 razor_set_diff(struct razor_set *set, struct razor_set *upstream,
1840 razor_package_callback_t callback, void *data)
1842 struct razor_package *p, *pend, *u, *uend;
1843 char *ppool, *upool;
1846 p = set->packages.data;
1847 pend = set->packages.data + set->packages.size;
1848 ppool = set->string_pool.data;
1850 u = upstream->packages.data;
1851 uend = upstream->packages.data + upstream->packages.size;
1852 upool = upstream->string_pool.data;
1854 while (p < pend || u < uend) {
1855 if (p < pend && u < uend) {
1856 res = strcmp(&ppool[p->name], &upool[u->name]);
1858 res = versioncmp(&ppool[p->version],
1859 &upool[u->version]);
1862 if (u == uend || res < 0) {
1863 callback(&ppool[p->name], &ppool[p->version],
1867 } else if (p == pend || res > 0) {
1868 callback(&upool[u->name], NULL, &upool[u->version],