Implement razor_set_get_package() using the package iterator.
Drop bsearch and qsort with data TODO items.
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_begin_package(struct razor_importer *importer,
416 const char *name, const char *version)
418 struct razor_package *p;
420 p = array_add(&importer->set->packages, sizeof *p);
421 p->name = hashtable_tokenize(&importer->table, name);
422 p->version = hashtable_tokenize(&importer->table, version);
424 importer->package = p;
425 array_init(&importer->properties);
429 razor_importer_finish_package(struct razor_importer *importer)
431 struct razor_package *p;
433 p = importer->package;
434 p->properties = add_to_property_pool(&importer->set->property_pool,
435 &importer->properties);
437 array_release(&importer->properties);
441 razor_importer_add_property(struct razor_importer *importer,
442 const char *name, const char *version,
443 enum razor_property_type type)
445 struct razor_property *p;
448 p = array_add(&importer->set->properties, sizeof *p);
449 p->name = hashtable_tokenize(&importer->table, name) | (type << 30);
450 p->version = hashtable_tokenize(&importer->table, version);
451 p->packages = importer->package -
452 (struct razor_package *) importer->set->packages.data;
454 r = array_add(&importer->properties, sizeof *r);
455 *r = p - (struct razor_property *) importer->set->properties.data;
459 razor_importer_add_file(struct razor_importer *importer, const char *name)
461 struct import_entry *e;
463 e = array_add(&importer->files, sizeof *e);
465 e->package = importer->package -
466 (struct razor_package *) importer->set->packages.data;
467 e->name = strdup(name);
470 struct razor_importer *
471 razor_importer_new(void)
473 struct razor_importer *importer;
475 importer = zalloc(sizeof *importer);
476 importer->set = razor_set_create();
477 hashtable_init(&importer->table, &importer->set->string_pool);
482 /* Destroy an importer without creating the set. */
484 razor_importer_destroy(struct razor_importer *importer)
486 /* FIXME: write this */
490 typedef int (*compare_with_data_func_t)(const void *p1,
494 struct qsort_context {
496 compare_with_data_func_t compare;
501 qsort_swap(void *p1, void *p2, size_t size)
505 memcpy(buffer, p1, size);
506 memcpy(p1, p2, size);
507 memcpy(p2, buffer, size);
511 __qsort_with_data(void *base, size_t nelem, unsigned long *map,
512 struct qsort_context *ctx)
514 void *p, *start, *end, *pivot;
515 unsigned long *mp, *mstart, *mend, tmp;
516 int left, right, result;
517 size_t size = ctx->size;
521 end = base + nelem * size;
525 pivot = base + (random() % nelem) * size;
528 result = ctx->compare(p, pivot, ctx->data);
530 qsort_swap(p, start, size);
540 } else if (result == 0) {
546 qsort_swap(p, end, size);
555 left = (start - base) / size;
556 right = (base + nelem * size - end) / size;
558 __qsort_with_data(base, left, map, ctx);
560 __qsort_with_data(end, right, mend, ctx);
564 qsort_with_data(void *base, size_t nelem, size_t size,
565 compare_with_data_func_t compare, void *data)
567 struct qsort_context ctx;
575 ctx.compare = compare;
578 map = malloc(nelem * sizeof (unsigned long));
579 for (i = 0; i < nelem; i++)
582 __qsort_with_data(base, nelem, map, &ctx);
588 versioncmp(const char *s1, const char *s2)
594 n1 = strtol(s1, (char **) &p1, 0);
595 n2 = strtol(s2, (char **) &p2, 0);
597 /* Epoch; if one but not the other has an epoch set, default
598 * the epoch-less version to 0. */
599 res = (*p1 == ':') - (*p2 == ':');
604 } else if (res > 0) {
617 if (isdigit(*p1) && isdigit(*p2))
618 return versioncmp(p1, p2);
626 compare_packages(const void *p1, const void *p2, void *data)
628 const struct razor_package *pkg1 = p1, *pkg2 = p2;
629 struct razor_set *set = data;
630 char *pool = set->string_pool.data;
632 if (pkg1->name == pkg2->name)
633 return versioncmp(&pool[pkg1->version], &pool[pkg2->version]);
635 return strcmp(&pool[pkg1->name], &pool[pkg2->name]);
639 compare_properties(const void *p1, const void *p2, void *data)
641 const struct razor_property *prop1 = p1, *prop2 = p2;
642 struct razor_set *set = data;
643 char *pool = set->string_pool.data;
645 if (prop1->name == prop2->name)
646 return versioncmp(&pool[prop1->version],
647 &pool[prop2->version]);
648 else if ((prop1->name & RAZOR_ENTRY_MASK) == (prop2->name & RAZOR_ENTRY_MASK))
649 return (prop1->name >> 30) - (prop2->name >> 30);
651 return strcmp(&pool[prop1->name & RAZOR_ENTRY_MASK],
652 &pool[prop2->name & RAZOR_ENTRY_MASK]);
655 static unsigned long *
656 uniqueify_properties(struct razor_set *set)
658 struct razor_property *rp, *up, *rp_end;
659 struct array *pkgs, *p;
660 unsigned long *map, *rmap, *r;
661 int i, count, unique;
663 count = set->properties.size / sizeof(struct razor_property);
664 map = qsort_with_data(set->properties.data,
666 sizeof(struct razor_property),
670 rp_end = set->properties.data + set->properties.size;
671 rmap = malloc(count * sizeof *map);
672 pkgs = zalloc(count * sizeof *pkgs);
673 for (rp = set->properties.data, up = rp, i = 0; rp < rp_end; rp++, i++) {
674 if (rp->name != up->name || rp->version != up->version) {
677 up->version = rp->version;
680 unique = up - (struct razor_property *) set->properties.data;
681 rmap[map[i]] = unique;
682 r = array_add(&pkgs[unique], sizeof *r);
688 set->properties.size = (void *) up - set->properties.data;
690 for (rp = set->properties.data, p = pkgs; rp < rp_end; rp++, p++) {
691 if (p->size / sizeof *r == 1) {
693 rp->packages = *r | RAZOR_IMMEDIATE;
696 add_to_property_pool(&set->package_pool, p);
707 remap_links(struct array *links, unsigned long *map)
709 unsigned long *p, *end;
711 end = links->data + links->size;
712 for (p = links->data; p < end; p++)
713 *p = map[*p & RAZOR_ENTRY_MASK] | (*p & ~RAZOR_ENTRY_MASK);
717 compare_filenames(const void *p1, const void *p2, void *data)
719 const struct import_entry *e1 = p1;
720 const struct import_entry *e2 = p2;
722 return strcmp(e1->name, e2->name);
726 count_entries(struct import_directory *d)
728 struct import_directory *p, *end;
731 end = d->files.data + d->files.size;
735 d->count += p->count + 1;
741 serialize_files(struct razor_set *set,
742 struct import_directory *d, struct array *array)
744 struct import_directory *p, *end;
745 struct razor_entry *e = NULL;
749 end = d->files.data + d->files.size;
750 s = array->size / sizeof *e + d->files.size / sizeof *p;
752 e = array_add(array, sizeof *e);
754 e->start = p->count > 0 ? s : 0;
757 if (p->packages.size == 0) {
759 } else if (p->packages.size / sizeof *r == 1) {
760 r = p->packages.data;
761 e->packages = *r | RAZOR_IMMEDIATE;
763 e->packages = add_to_property_pool(&set->package_pool,
766 array_release(&p->packages);
770 e->name |= RAZOR_ENTRY_LAST;
773 end = d->files.data + d->files.size;
775 serialize_files(set, p, array);
781 remap_property_package_links(struct array *properties, unsigned long *rmap)
783 struct razor_property *p, *end;
785 end = properties->data + properties->size;
786 for (p = properties->data; p < end; p++)
787 if (p->packages & RAZOR_IMMEDIATE)
788 p->packages = rmap[p->packages & RAZOR_ENTRY_MASK] |
793 build_file_tree(struct razor_importer *importer)
795 int count, i, length;
796 struct import_entry *filenames;
798 unsigned long name, *r;
800 struct import_directory *d, root;
801 struct razor_entry *e;
803 count = importer->files.size / sizeof (struct import_entry);
804 qsort_with_data(importer->files.data,
806 sizeof (struct import_entry),
810 root.name = hashtable_tokenize(&importer->table, "");
811 array_init(&root.files);
812 array_init(&root.packages);
815 filenames = importer->files.data;
816 for (i = 0; i < count; i++) {
817 f = filenames[i].name;
824 end = strchr(f, '/');
828 memcpy(dirname, f, length);
829 dirname[length] ='\0';
830 name = hashtable_tokenize(&importer->table, dirname);
831 if (d->last == NULL || d->last->name != name) {
832 d->last = array_add(&d->files, sizeof *d);
833 d->last->name = name;
834 d->last->last = NULL;
835 array_init(&d->last->files);
836 array_init(&d->last->packages);
844 r = array_add(&d->packages, sizeof *r);
845 *r = filenames[i].package;
846 free(filenames[i].name);
849 count_entries(&root);
850 array_init(&importer->set->files);
852 e = array_add(&importer->set->files, sizeof *e);
853 e->name = root.name | RAZOR_ENTRY_LAST;
857 serialize_files(importer->set, &root, &importer->set->files);
859 array_release(&importer->files);
863 build_package_file_lists(struct razor_set *set, unsigned long *rmap)
865 struct razor_package *p, *packages;
867 struct razor_entry *e, *end;
868 unsigned long *r, *q;
871 count = set->packages.size / sizeof *p;
872 pkgs = zalloc(count * sizeof *pkgs);
874 end = set->files.data + set->files.size;
875 for (e = set->files.data; e < end; e++) {
876 if (e->packages == ~0) {
878 } else if (e->packages & RAZOR_IMMEDIATE) {
879 e->packages = rmap[e->packages & RAZOR_ENTRY_MASK] |
883 r = (unsigned long *) set->package_pool.data + e->packages;
887 q = array_add(&pkgs[*r & RAZOR_ENTRY_MASK], sizeof *q);
888 *q = e - (struct razor_entry *) set->files.data;
889 if (*r++ & RAZOR_IMMEDIATE)
894 packages = set->packages.data;
895 for (i = 0; i < count; i++) {
897 add_to_property_pool(&set->file_pool, &pkgs[i]);
898 array_release(&pkgs[i]);
904 razor_importer_finish(struct razor_importer *importer)
906 struct razor_set *set;
907 unsigned long *map, *rmap;
910 map = uniqueify_properties(importer->set);
911 remap_links(&importer->set->property_pool, map);
914 count = importer->set->packages.size / sizeof(struct razor_package);
915 map = qsort_with_data(importer->set->packages.data,
917 sizeof(struct razor_package),
921 rmap = malloc(count * sizeof *rmap);
922 for (i = 0; i < count; i++)
926 build_file_tree(importer);
927 remap_links(&importer->set->package_pool, rmap);
928 build_package_file_lists(importer->set, rmap);
929 remap_property_package_links(&importer->set->properties, rmap);
933 hashtable_release(&importer->table);
939 struct razor_package_iterator {
940 struct razor_set *set;
941 struct razor_package *package, *end;
944 struct razor_package_iterator *
945 razor_package_iterator_create(struct razor_set *set)
947 struct razor_package_iterator *pi;
949 pi = zalloc(sizeof *pi);
951 pi->package = set->packages.data;
952 pi->end = set->packages.data + set->packages.size;
958 razor_package_iterator_next(struct razor_package_iterator *pi,
959 struct razor_package **package,
960 const char **name, const char **version)
964 pool = pi->set->string_pool.data;
965 *package = pi->package;
966 *name = &pool[pi->package->name];
967 *version = &pool[pi->package->version];
969 return pi->package++ < pi->end;
973 razor_package_iterator_destroy(struct razor_package_iterator *pi)
978 struct razor_package *
979 razor_set_get_package(struct razor_set *set, const char *package)
981 struct razor_package_iterator *pi;
982 struct razor_package *p;
983 const char *name, *version;
985 pi = razor_package_iterator_create(set);
986 while (razor_package_iterator_next(pi, &p, &name, &version)) {
987 if (strcmp(package, name) == 0)
990 razor_package_iterator_destroy(pi);
995 struct razor_property_iterator {
996 struct razor_set *set;
997 struct razor_property *property, *end;
998 unsigned long *index;
1002 struct razor_property_iterator *
1003 razor_property_iterator_create(struct razor_set *set,
1004 struct razor_package *package)
1006 struct razor_property_iterator *pi;
1008 pi = zalloc(sizeof *pi);
1010 pi->property = set->properties.data;
1011 pi->end = set->properties.data + set->properties.size;
1013 pi->index = (unsigned long *)
1014 set->property_pool.data + package->properties;
1025 razor_property_iterator_next(struct razor_property_iterator *pi,
1026 struct razor_property **property,
1027 const char **name, const char **version,
1028 enum razor_property_type *type)
1032 struct razor_property *p, *properties;
1035 properties = pi->set->properties.data;
1036 p = &properties[*pi->index & RAZOR_ENTRY_MASK];
1038 pi->last = (*pi->index++ & RAZOR_IMMEDIATE) != 0;
1041 valid = p < pi->end;
1045 pool = pi->set->string_pool.data;
1047 *name = &pool[p->name & RAZOR_ENTRY_MASK];
1048 *version = &pool[p->version];
1049 *type = p->name >> 30;
1058 razor_property_iterator_destroy(struct razor_property_iterator *pi)
1063 struct razor_property *
1064 razor_set_get_property(struct razor_set *set, const char *property)
1066 struct razor_property *p;
1067 struct razor_property_iterator *pi;
1068 const char *name, *version;
1069 enum razor_property_type type;
1071 pi = razor_property_iterator_create(set, NULL);
1072 while (razor_property_iterator_next(pi, &p, &name, &version, &type)) {
1073 if (strcmp(name, property) == 0)
1076 razor_property_iterator_destroy(pi);
1083 razor_set_list_property_packages(struct razor_set *set,
1085 const char *version,
1086 enum razor_property_type type)
1088 struct razor_property *property, *end;
1089 struct razor_package *p, *packages;
1096 property = razor_set_get_property(set, name);
1097 packages = set->packages.data;
1098 pool = set->string_pool.data;
1099 end = set->properties.data + set->properties.size;
1100 while (property < end &&
1101 strcmp(name, &pool[property->name & RAZOR_ENTRY_MASK]) == 0) {
1103 versioncmp(version, &pool[property->version]) != 0)
1105 if (type != (property->name >> 30))
1108 if (property->packages & RAZOR_IMMEDIATE)
1109 r = &property->packages;
1111 r = (unsigned long *)
1112 set->package_pool.data + property->packages;
1114 p = &packages[*r & RAZOR_ENTRY_MASK];
1116 &pool[p->name & RAZOR_ENTRY_MASK],
1118 if (*r++ & RAZOR_IMMEDIATE)
1126 static struct razor_entry *
1127 find_entry(struct razor_set *set, struct razor_entry *dir, const char *pattern)
1129 struct razor_entry *e;
1130 const char *n, *pool = set->string_pool.data;
1133 e = (struct razor_entry *) set->files.data + dir->start;
1135 n = pool + (e->name & RAZOR_ENTRY_MASK);
1136 if (strcmp(pattern + 1, n) == 0)
1139 if (e->start != 0 && strncmp(pattern + 1, n, len) == 0 &&
1140 pattern[len + 1] == '/') {
1141 return find_entry(set, e, pattern + len + 1);
1143 } while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
1149 list_dir(struct razor_set *set, struct razor_entry *dir,
1150 const char *prefix, const char *pattern)
1152 struct razor_entry *e;
1153 const char *n, *pool = set->string_pool.data;
1155 e = (struct razor_entry *) set->files.data + dir->start;
1157 n = pool + (e->name & RAZOR_ENTRY_MASK);
1158 if (pattern && pattern[0] && fnmatch(pattern, n, 0) != 0)
1160 printf("%s/%s%s\n", prefix, n, e->start > 0 ? "/" : "");
1161 } while (((e++)->name & RAZOR_ENTRY_LAST) == 0);
1165 razor_set_list_files(struct razor_set *set, const char *pattern)
1167 struct razor_entry *e;
1168 char buffer[512], *p, *base;
1170 if (pattern == NULL)
1173 strcpy(buffer, pattern);
1174 e = find_entry(set, set->files.data, buffer);
1175 if (e && e->start > 0) {
1178 p = strrchr(buffer, '/');
1186 e = find_entry(set, set->files.data, buffer);
1188 list_dir(set, e, buffer, base);
1192 razor_set_list_file_packages(struct razor_set *set, const char *filename)
1194 struct razor_entry *e;
1195 struct razor_package *packages, *p;
1199 e = find_entry(set, set->files.data, filename);
1203 if (e->packages & RAZOR_IMMEDIATE)
1206 r = (unsigned long *) set->package_pool.data + e->packages;
1208 packages = set->packages.data;
1209 pool = set->string_pool.data;
1211 p = &packages[*r & RAZOR_ENTRY_MASK];
1212 printf("%s-%s\n", &pool[p->name], &pool[p->version]);
1213 if (*r++ & RAZOR_IMMEDIATE)
1218 static unsigned long *
1219 list_package_files(struct razor_set *set, unsigned long *r,
1220 struct razor_entry *dir, unsigned long end,
1223 struct razor_entry *e, *f, *entries;
1224 unsigned long next, file;
1228 entries = (struct razor_entry *) set->files.data;
1229 pool = set->string_pool.data;
1231 e = entries + dir->start;
1233 if (entries + (*r & RAZOR_ENTRY_MASK) == e) {
1234 printf("%s/%s\n", prefix,
1235 pool + (e->name & RAZOR_ENTRY_MASK));
1236 if (*r & RAZOR_ENTRY_LAST)
1239 if ((*r & RAZOR_ENTRY_MASK) >= end)
1242 } while (!((e++)->name & RAZOR_ENTRY_LAST));
1244 e = entries + dir->start;
1249 if (e->name & RAZOR_ENTRY_LAST)
1253 while (f->start == 0 && !(f->name & RAZOR_ENTRY_LAST))
1261 file = *r & RAZOR_ENTRY_MASK;
1262 if (e->start <= file && file < next) {
1263 len = strlen(prefix);
1265 strcpy(prefix + len + 1,
1266 pool + (e->name & RAZOR_ENTRY_MASK));
1267 r = list_package_files(set, r, e, next, prefix);
1270 } while (!((e++)->name & RAZOR_ENTRY_LAST) && r != NULL);
1276 razor_set_list_package_files(struct razor_set *set, const char *name)
1278 struct razor_package *package;
1279 unsigned long *r, end;
1282 package = razor_set_get_package(set, name);
1284 r = (unsigned long *) set->file_pool.data + package->files;
1285 end = set->files.size / sizeof (struct razor_entry);
1287 list_package_files(set, r, set->files.data, end, buffer);
1291 razor_set_validate(struct razor_set *set, struct array *unsatisfied)
1293 struct razor_property *r, *p, *end;
1297 end = set->properties.data + set->properties.size;
1298 pool = set->string_pool.data;
1300 for (r = set->properties.data, p = r; r < end; r++) {
1301 if (r->name >> 30 != RAZOR_PROPERTY_REQUIRES)
1304 if ((r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK)) {
1306 while (p < end && p->name == r->name)
1310 /* If there is more than one version of a provides,
1311 * seek to the end for the highest version. */
1312 /* FIXME: This doesn't work if we have a series of
1313 * requires a = 1, provides a = 1, requires a = 2,
1314 * provides a = 2, as the kernel and kernel-devel
1316 while (p + 1 < end && p->name == (p + 1)->name)
1319 /* FIXME: We need to track property flags (<, <=, =
1320 * etc) to properly determine if a requires is
1321 * satisfied. The current code doesn't track that the
1322 * requires a = 1 isn't satisfied by a = 2 provides. */
1325 (p->name >> 30) != RAZOR_PROPERTY_PROVIDES ||
1326 (r->name & RAZOR_ENTRY_MASK) != (p->name & RAZOR_ENTRY_MASK) ||
1327 versioncmp(&pool[r->version], &pool[p->version]) > 0) {
1328 /* FIXME: We ignore file requires for now. */
1329 if (pool[r->name & RAZOR_ENTRY_MASK] == '/')
1331 u = array_add(unsatisfied, sizeof *u);
1332 *u = r - (struct razor_property *) set->properties.data;
1338 razor_set_list_unsatisfied(struct razor_set *set)
1340 struct array unsatisfied;
1341 struct razor_property *properties, *r;
1342 unsigned long *u, *end;
1345 array_init(&unsatisfied);
1346 razor_set_validate(set, &unsatisfied);
1348 end = unsatisfied.data + unsatisfied.size;
1349 properties = set->properties.data;
1350 pool = set->string_pool.data;
1352 for (u = unsatisfied.data; u < end; u++) {
1353 r = properties + *u;
1354 if (pool[r->version] == '\0')
1355 printf("%ss not satisfied\n",
1356 &pool[r->name & RAZOR_ENTRY_MASK]);
1358 printf("%s-%s not satisfied\n",
1359 &pool[r->name & RAZOR_ENTRY_MASK],
1363 array_release(&unsatisfied);
1366 #define UPSTREAM_SOURCE 0x80000000ul
1367 #define INDEX_MASK 0x00fffffful
1370 struct razor_set *set;
1371 unsigned long *property_map;
1374 struct razor_merger {
1375 struct razor_set *set;
1376 struct hashtable table;
1377 struct source source1;
1378 struct source source2;
1381 static struct razor_merger *
1382 razor_merger_create(struct razor_set *set1, struct razor_set *set2)
1384 struct razor_merger *merger;
1388 merger = zalloc(sizeof *merger);
1389 merger->set = razor_set_create();
1390 hashtable_init(&merger->table, &merger->set->string_pool);
1392 count = set1->properties.size / sizeof (struct razor_property);
1393 size = count * sizeof merger->source1.property_map[0];
1394 merger->source1.property_map = zalloc(size);
1395 merger->source1.set = set1;
1397 count = set2->properties.size / sizeof (struct razor_property);
1398 size = count * sizeof merger->source2.property_map[0];
1399 merger->source2.property_map = zalloc(size);
1400 merger->source2.set = set2;
1406 add_package(struct razor_merger *merger,
1407 struct razor_package *package, struct source *source,
1408 unsigned long flags)
1412 struct razor_package *p;
1414 pool = source->set->string_pool.data;
1415 p = array_add(&merger->set->packages, sizeof *p);
1416 p->name = hashtable_tokenize(&merger->table, &pool[package->name]);
1418 p->version = hashtable_tokenize(&merger->table,
1419 &pool[package->version]);
1420 p->properties = package->properties;
1422 if (package->properties & RAZOR_IMMEDIATE)
1423 r = &package->properties;
1425 r = (unsigned long *)
1426 source->set->property_pool.data + package->properties;
1428 source->property_map[*r & RAZOR_ENTRY_MASK] = 1;
1429 if (*r++ & RAZOR_IMMEDIATE)
1435 /* Build the new package list sorted by merging the two package lists.
1436 * Build new string pool as we go. */
1438 merge_packages(struct razor_merger *merger, struct array *packages)
1440 struct razor_package *upstream_packages, *p, *s, *send;
1441 struct source *source1, *source2;
1442 char *spool, *upool;
1443 unsigned long *u, *uend;
1446 source1 = &merger->source1;
1447 source2 = &merger->source2;
1448 upstream_packages = source2->set->packages.data;
1451 uend = packages->data + packages->size;
1452 upool = source2->set->string_pool.data;
1454 s = source1->set->packages.data;
1455 send = source1->set->packages.data + source1->set->packages.size;
1456 spool = source1->set->string_pool.data;
1459 p = upstream_packages + *u;
1462 cmp = strcmp(&spool[s->name], &upool[p->name]);
1463 if (u >= uend || cmp < 0) {
1464 add_package(merger, s, source1, 0);
1466 } else if (cmp == 0) {
1467 add_package(merger, p, source2, UPSTREAM_SOURCE);
1471 add_package(merger, p, source2, UPSTREAM_SOURCE);
1477 static unsigned long
1478 add_property(struct razor_merger *merger,
1479 const char *name, const char *version, int type)
1481 struct razor_property *p;
1483 p = array_add(&merger->set->properties, sizeof *p);
1484 p->name = hashtable_tokenize(&merger->table, name) | (type << 30);
1485 p->version = hashtable_tokenize(&merger->table, version);
1487 return p - (struct razor_property *) merger->set->properties.data;
1491 merge_properties(struct razor_merger *merger)
1493 struct razor_property *p1, *p2;
1494 struct razor_set *set1, *set2;
1495 unsigned long *map1, *map2;
1496 int i, j, cmp, count1, count2;
1497 char *pool1, *pool2;
1499 set1 = merger->source1.set;
1500 set2 = merger->source2.set;
1501 map1 = merger->source1.property_map;
1502 map2 = merger->source2.property_map;
1506 pool1 = set1->string_pool.data;
1507 pool2 = set2->string_pool.data;
1509 count1 = set1->properties.size / sizeof *p1;
1510 count2 = set2->properties.size / sizeof *p2;
1511 while (i < count1 || j < count2) {
1512 if (i < count1 && map1[i] == 0) {
1516 if (j < count2 && map2[j] == 0) {
1520 p1 = (struct razor_property *) set1->properties.data + i;
1521 p2 = (struct razor_property *) set2->properties.data + j;
1522 if (i < count1 && j < count2)
1523 cmp = strcmp(&pool1[p1->name & RAZOR_ENTRY_MASK],
1524 &pool2[p2->name & RAZOR_ENTRY_MASK]);
1525 else if (i < count1)
1530 cmp = versioncmp(&pool1[p1->version],
1531 &pool2[p2->version]);
1533 map1[i++] = add_property(merger,
1534 &pool1[p1->name & RAZOR_ENTRY_MASK],
1535 &pool1[p1->version],
1537 } else if (cmp > 0) {
1538 map2[j++] = add_property(merger,
1539 &pool2[p2->name & RAZOR_ENTRY_MASK],
1540 &pool2[p2->version],
1543 map1[i++] = map2[j++] = add_property(merger,
1544 &pool1[p1->name & RAZOR_ENTRY_MASK],
1545 &pool1[p1->version],
1551 static unsigned long
1552 emit_properties(struct array *source_pool, unsigned long index,
1553 unsigned long *map, struct array *pool)
1555 unsigned long r, *p, *q;
1557 r = pool->size / sizeof *q;
1558 p = (unsigned long *) source_pool->data + index;
1560 q = array_add(pool, sizeof *q);
1561 *q = map[*p & RAZOR_ENTRY_MASK] | (*p & ~RAZOR_ENTRY_MASK);
1562 if (*p++ & RAZOR_ENTRY_LAST)
1569 /* Rebuild property->packages maps. We can't just remap these, as a
1570 * property may have lost or gained a number of packages. Allocate an
1571 * array per property and loop through the packages and add them to
1572 * the arrays for their properties. */
1574 rebuild_package_lists(struct razor_set *set)
1576 struct array *pkgs, *a;
1577 struct razor_package *pkg, *pkg_end;
1578 struct razor_property *prop, *prop_end;
1579 unsigned long *r, *q, *pool;
1582 count = set->properties.size / sizeof (struct razor_property);
1583 pkgs = zalloc(count * sizeof *pkgs);
1584 pkg_end = set->packages.data + set->packages.size;
1585 pool = set->property_pool.data;
1587 for (pkg = set->packages.data; pkg < pkg_end; pkg++) {
1588 for (r = &pool[pkg->properties]; ; r++) {
1589 q = array_add(&pkgs[*r & RAZOR_ENTRY_MASK], sizeof *q);
1590 *q = pkg - (struct razor_package *) set->packages.data;
1591 if (*r & RAZOR_IMMEDIATE)
1596 prop_end = set->properties.data + set->properties.size;
1598 for (prop = set->properties.data; prop < prop_end; prop++, a++) {
1599 if (a->size / sizeof *r == 1) {
1601 prop->packages = *r | RAZOR_IMMEDIATE;
1604 add_to_property_pool(&set->property_pool, a);
1612 razor_merger_finish(struct razor_merger *merger)
1614 struct razor_set *result;
1616 result = merger->set;
1617 hashtable_release(&merger->table);
1623 /* Add packages from 'upstream' to 'set'. The packages to add are
1624 * specified by the 'packages' array, which is a sorted list of
1625 * package indexes. Returns a newly allocated package set. Does not
1626 * enforce validity of the resulting package set.
1628 * This looks more complicated than it is. An easy way to merge two
1629 * package sets would be to just use a razor_importer, but that
1630 * requires resorting, and is thus O(n log n). We can do this in a
1631 * linear sweep, but it gets a little more complicated.
1634 razor_set_add(struct razor_set *set, struct razor_set *upstream,
1635 struct array *packages)
1637 struct razor_merger *merger;
1638 struct razor_package *p, *pend;
1640 merger = razor_merger_create(set, upstream);
1642 merge_packages(merger, packages);
1644 /* As we built the package list, we filled out a bitvector of
1645 * the properties that are referenced by the packages in the
1646 * new set. Now we do a parallel loop through the properties
1647 * and emit those marked in the bit vector to the new set. In
1648 * the process, we update the bit vector to actually map from
1649 * indices in the old property list to indices in the new
1650 * property list for both sets. */
1652 merge_properties(merger);
1654 /* Now we loop through the packages again and emit the
1655 * property lists, remapped to point to the new properties. */
1657 pend = merger->set->packages.data + merger->set->packages.size;
1658 for (p = merger->set->packages.data; p < pend; p++) {
1661 if (p->name & UPSTREAM_SOURCE)
1662 src = &merger->source2;
1664 src = &merger->source1;
1666 p->properties = emit_properties(&src->set->property_pool,
1669 &merger->set->property_pool);
1670 p->name &= INDEX_MASK;
1673 rebuild_package_lists(merger->set);
1675 return razor_merger_finish(merger);
1679 razor_set_satisfy(struct razor_set *set, struct array *unsatisfied,
1680 struct razor_set *upstream, struct array *list)
1682 struct razor_property *requires, *r;
1683 struct razor_property *p, *pend;
1684 unsigned long *u, *end, *pkg, *package_pool;
1687 end = unsatisfied->data + unsatisfied->size;
1688 requires = set->properties.data;
1689 pool = set->string_pool.data;
1691 p = upstream->properties.data;
1692 pend = upstream->properties.data + upstream->properties.size;
1693 upool = upstream->string_pool.data;
1694 package_pool = upstream->package_pool.data;
1696 for (u = unsatisfied->data; u < end; u++) {
1700 strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
1701 &upool[p->name & RAZOR_ENTRY_MASK]) > 0 &&
1702 (p->name >> 30) != RAZOR_PROPERTY_PROVIDES)
1704 /* If there is more than one version of a provides,
1705 * seek to the end for the highest version. */
1706 while (p + 1 < pend && p->name == (p + 1)->name)
1710 strcmp(&pool[r->name & RAZOR_ENTRY_MASK],
1711 &upool[p->name & RAZOR_ENTRY_MASK]) != 0 ||
1712 versioncmp(&pool[r->version], &upool[p->version]) > 0) {
1713 /* Do we need to track unsatisfiable requires
1714 * as we go, or should we just do a
1715 * razor_set_validate() at the end? */
1717 pkg = array_add(list, sizeof *pkg);
1718 /* We just pull in the first package that provides */
1719 if (p->packages & RAZOR_IMMEDIATE)
1720 *pkg = p->packages & RAZOR_ENTRY_MASK;
1722 *pkg = package_pool[p->packages];
1728 find_packages(struct razor_set *set,
1729 int count, const char **packages, struct array *list)
1731 struct razor_package *p;
1735 /* FIXME: Sort the packages. */
1736 for (i = 0; i < count; i++) {
1737 p = razor_set_get_package(set, packages[i]);
1738 r = array_add(list, sizeof *r);
1739 *r = p - (struct razor_package *) set->packages.data;
1744 find_all_packages(struct razor_set *set,
1745 struct razor_set *upstream, struct array *list)
1747 struct razor_package *p, *u, *pend, *uend;
1751 pend = set->packages.data + set->packages.size;
1752 pool = set->string_pool.data;
1753 u = upstream->packages.data;
1754 uend = upstream->packages.data + upstream->packages.size;
1755 upool = upstream->string_pool.data;
1757 for (p = set->packages.data; p < pend; p++) {
1758 while (u < uend && strcmp(&pool[p->name], &upool[u->name]) > 0)
1760 if (strcmp(&pool[p->name], &upool[u->name]) == 0) {
1761 r = array_add(list, sizeof *r);
1762 *r = u - (struct razor_package *) upstream->packages.data;
1768 razor_set_update(struct razor_set *set, struct razor_set *upstream,
1769 int count, const char **packages)
1771 struct razor_set *new;
1772 struct razor_package *upackages;
1773 struct array list, unsatisfied;
1775 unsigned long *u, *end;
1780 find_packages(upstream, count, packages, &list);
1782 find_all_packages(set, upstream, &list);
1784 end = list.data + list.size;
1785 upackages = upstream->packages.data;
1786 pool = upstream->string_pool.data;
1787 total += list.size / sizeof *u;
1789 while (list.size > 0) {
1790 new = razor_set_add(set, upstream, &list);
1791 array_release(&list);
1792 razor_set_destroy(set);
1795 array_init(&unsatisfied);
1796 razor_set_validate(new, &unsatisfied);
1798 razor_set_satisfy(new, &unsatisfied, upstream, &list);
1799 array_release(&unsatisfied);
1801 end = list.data + list.size;
1802 upackages = upstream->packages.data;
1803 pool = upstream->string_pool.data;
1804 total += list.size / sizeof *u;
1807 array_release(&list);
1812 /* The diff order matters. We should sort the packages so that a
1813 * REMOVE of a package comes before the INSTALL, and so that all
1814 * requires for a package have been installed before the package.
1818 razor_set_diff(struct razor_set *set, struct razor_set *upstream,
1819 razor_package_callback_t callback, void *data)
1821 struct razor_package *p, *pend, *u, *uend;
1822 char *ppool, *upool;
1825 p = set->packages.data;
1826 pend = set->packages.data + set->packages.size;
1827 ppool = set->string_pool.data;
1829 u = upstream->packages.data;
1830 uend = upstream->packages.data + upstream->packages.size;
1831 upool = upstream->string_pool.data;
1833 while (p < pend || u < uend) {
1834 if (p < pend && u < uend) {
1835 res = strcmp(&ppool[p->name], &upool[u->name]);
1837 res = versioncmp(&ppool[p->version],
1838 &upool[u->version]);
1841 if (u == uend || res < 0) {
1842 callback(&ppool[p->name], &ppool[p->version],
1846 } else if (p == pend || res > 0) {
1847 callback(&upool[u->name], NULL, &upool[u->version],