Compare the right index against pq->count.
Fix a little logic error there.
2 * Copyright (C) 2008 Kristian Høgsberg <krh@redhat.com>
3 * Copyright (C) 2008 Red Hat, Inc
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation; either version 2 of the License, or
8 * (at your option) any later version.
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
15 * You should have received a copy of the GNU General Public License along
16 * with this program; if not, write to the Free Software Foundation, Inc.,
17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
23 #include "razor-internal.h"
27 razor_importer_begin_package(struct razor_importer *importer,
32 struct razor_package *p;
34 p = array_add(&importer->set->packages, sizeof *p);
35 p->name = hashtable_tokenize(&importer->table, name);
37 p->version = hashtable_tokenize(&importer->table, version);
38 p->arch = hashtable_tokenize(&importer->table, arch);
40 importer->package = p;
41 array_init(&importer->properties);
46 razor_importer_finish_package(struct razor_importer *importer)
48 list_set_array(&importer->package->properties,
49 &importer->set->property_pool,
50 &importer->properties,
53 array_release(&importer->properties);
57 razor_importer_add_details(struct razor_importer *importer,
59 const char *description,
63 importer->package->summary = hashtable_tokenize(&importer->details_table, summary);
64 importer->package->description = hashtable_tokenize(&importer->details_table, description);
65 importer->package->url = hashtable_tokenize(&importer->details_table, url);
66 importer->package->license = hashtable_tokenize(&importer->details_table, license);
70 razor_importer_add_property(struct razor_importer *importer,
75 struct razor_property *p;
78 p = array_add(&importer->set->properties, sizeof *p);
79 p->name = hashtable_tokenize(&importer->table, name);
81 p->version = hashtable_tokenize(&importer->table, version);
82 list_set_ptr(&p->packages, importer->package -
83 (struct razor_package *) importer->set->packages.data);
85 r = array_add(&importer->properties, sizeof *r);
86 *r = p - (struct razor_property *) importer->set->properties.data;
88 if (((flags & RAZOR_PROPERTY_TYPE_MASK) == RAZOR_PROPERTY_REQUIRES) &&
90 r = array_add(&importer->file_requires, sizeof *r);
96 razor_importer_add_file(struct razor_importer *importer, const char *name)
98 struct import_entry *e;
100 e = array_add(&importer->files, sizeof *e);
102 e->package = importer->package -
103 (struct razor_package *) importer->set->packages.data;
104 e->name = strdup(name);
107 struct razor_importer *
108 razor_importer_create(void)
110 struct razor_importer *importer;
112 importer = zalloc(sizeof *importer);
113 importer->set = razor_set_create();
114 hashtable_init(&importer->table, &importer->set->string_pool);
115 hashtable_init(&importer->details_table,
116 &importer->set->details_string_pool);
117 hashtable_init(&importer->file_table,
118 &importer->set->file_string_pool);
123 /* Destroy an importer without creating the set. */
125 razor_importer_destroy(struct razor_importer *importer)
127 /* FIXME: write this */
131 compare_packages(const void *p1, const void *p2, void *data)
133 const struct razor_package *pkg1 = p1, *pkg2 = p2;
134 struct razor_set *set = data;
135 char *pool = set->string_pool.data;
137 /* FIXME: what if the flags are different? */
138 if (pkg1->name == pkg2->name)
139 return razor_versioncmp(&pool[pkg1->version], &pool[pkg2->version]);
141 return strcmp(&pool[pkg1->name], &pool[pkg2->name]);
145 compare_properties(const void *p1, const void *p2, void *data)
147 const struct razor_property *prop1 = p1, *prop2 = p2;
148 struct razor_set *set = data;
149 char *pool = set->string_pool.data;
151 if (prop1->name != prop2->name)
152 return strcmp(&pool[prop1->name], &pool[prop2->name]);
153 else if (prop1->flags != prop2->flags)
154 return prop1->flags - prop2->flags;
155 else if (prop1->version != prop2->version)
156 return razor_versioncmp(&pool[prop1->version], &pool[prop2->version]);
158 return prop1->packages.list_ptr - prop2->packages.list_ptr;
162 uniqueify_properties(struct razor_set *set)
164 struct razor_property *rp, *up, *rp_end;
165 struct array *pkgs, *p;
167 uint32_t *map, *rmap;
168 int i, count, unique;
170 count = set->properties.size / sizeof(struct razor_property);
171 map = razor_qsort_with_data(set->properties.data,
173 sizeof(struct razor_property),
177 rp_end = set->properties.data + set->properties.size;
178 rmap = malloc(count * sizeof *map);
179 pkgs = zalloc(count * sizeof *pkgs);
180 for (rp = set->properties.data, up = rp, i = 0; rp < rp_end; rp++, i++) {
181 if (rp->name != up->name ||
182 rp->flags != up->flags ||
183 rp->version != up->version) {
186 up->flags = rp->flags;
187 up->version = rp->version;
190 unique = up - (struct razor_property *) set->properties.data;
191 rmap[map[i]] = unique;
192 r = array_add(&pkgs[unique], sizeof *r);
199 set->properties.size = (void *) up - set->properties.data;
201 for (rp = set->properties.data, p = pkgs; rp < rp_end; rp++, p++) {
202 list_set_array(&rp->packages, &set->package_pool, p, 0);
212 compare_filenames(const void *p1, const void *p2, void *data)
214 const struct import_entry *e1 = p1;
215 const struct import_entry *e2 = p2;
216 const char *n1 = e1->name;
217 const char *n2 = e2->name;
219 /* Need to make sure that the contents of a directory
220 * are sorted immediately after it. So "foo/bar" has to
221 * sort before "foo.conf"
223 * FIXME: this is about 60% slower than strcmp
227 return *n2 == '/' ? 1 : -1;
229 return *n1 == '/' ? -1 : 1;
242 count_entries(struct import_directory *d)
244 struct import_directory *p, *end;
247 end = d->files.data + d->files.size;
251 d->count += p->count + 1;
257 serialize_files(struct razor_set *set,
258 struct import_directory *d, struct array *array)
260 struct import_directory *p, *end;
261 struct razor_entry *e = NULL;
265 end = d->files.data + d->files.size;
266 s = array->size / sizeof *e + d->files.size / sizeof *p;
268 e = array_add(array, sizeof *e);
271 e->start = p->count > 0 ? s : 0;
274 list_set_array(&e->packages, &set->package_pool, &p->packages, 0);
275 array_release(&p->packages);
279 e->flags |= RAZOR_ENTRY_LAST;
282 end = d->files.data + d->files.size;
284 serialize_files(set, p, array);
290 remap_property_package_links(struct array *properties, uint32_t *rmap)
292 struct razor_property *p, *end;
294 end = properties->data + properties->size;
295 for (p = properties->data; p < end; p++)
296 list_remap_head(&p->packages, rmap);
300 build_file_tree(struct razor_importer *importer)
302 int count, i, length;
303 struct import_entry *filenames;
307 struct import_directory *d, root;
308 struct razor_entry *e;
310 count = importer->files.size / sizeof (struct import_entry);
311 razor_qsort_with_data(importer->files.data,
313 sizeof (struct import_entry),
317 root.name = hashtable_tokenize(&importer->table, "");
318 array_init(&root.files);
319 array_init(&root.packages);
322 filenames = importer->files.data;
323 for (i = 0; i < count; i++) {
324 f = filenames[i].name;
331 end = strchr(f, '/');
335 memcpy(dirname, f, length);
336 dirname[length] ='\0';
337 name = hashtable_tokenize(&importer->table, dirname);
338 if (d->last == NULL || d->last->name != name) {
339 d->last = array_add(&d->files, sizeof *d);
340 d->last->name = name;
341 d->last->last = NULL;
342 array_init(&d->last->files);
343 array_init(&d->last->packages);
351 r = array_add(&d->packages, sizeof *r);
352 *r = filenames[i].package;
353 free(filenames[i].name);
356 count_entries(&root);
357 e = importer->set->files.data;
359 e->flags = RAZOR_ENTRY_LAST;
360 e->start = importer->files.size ? 1 : 0;
361 list_set_empty(&e->packages);
363 serialize_files(importer->set, &root, &importer->set->files);
365 array_release(&importer->files);
369 list_to_array(struct list *list, struct array *array)
374 item = array_add(array, sizeof *item);
376 list = list_next(list);
381 compare_file_requires(const void *p1, const void *p2, void *data)
383 uint32_t *f1 = (void *)p1, *f2 = (void *)p2;
384 const char *pool = data;
386 return strcmp(&pool[*f1], &pool[*f2]);
390 find_file_provides(struct razor_importer *importer)
392 struct razor_property *prop;
393 struct razor_entry *top, *entry;
394 struct razor_package *packages;
395 struct array pkgprops;
397 uint32_t *req, *req_start, *req_end;
398 uint32_t *map, *newprop;
401 pool = importer->set->string_pool.data;
402 packages = importer->set->packages.data;
403 top = importer->set->files.data;
405 req = req_start = importer->file_requires.data;
406 req_end = importer->file_requires.data + importer->file_requires.size;
407 map = razor_qsort_with_data(req, req_end - req, sizeof *req,
408 compare_file_requires, pool);
411 for (req = req_start; req < req_end; req++) {
412 if (req > req_start && req[0] == req[-1])
414 entry = razor_set_find_entry(importer->set, top, &pool[*req]);
418 for (pkg = list_first(&entry->packages, &importer->set->package_pool); pkg; pkg = list_next(pkg)) {
419 prop = array_add(&importer->set->properties, sizeof *prop);
422 RAZOR_PROPERTY_PROVIDES | RAZOR_PROPERTY_EQUAL;
423 prop->version = hashtable_tokenize(&importer->table, "");
424 list_set_ptr(&prop->packages, pkg->data);
426 /* Update property list of pkg */
427 array_init(&pkgprops);
428 list_to_array(list_first(&packages[pkg->data].properties, &importer->set->property_pool), &pkgprops);
429 newprop = array_add(&pkgprops, sizeof *newprop);
430 *newprop = prop - (struct razor_property *)importer->set->properties.data;
431 list_set_array(&packages[pkg->data].properties, &importer->set->property_pool, &pkgprops, 1);
432 array_release(&pkgprops);
436 array_release(&importer->file_requires);
440 build_package_file_lists(struct razor_set *set, uint32_t *rmap)
442 struct razor_package *p, *packages;
444 struct razor_entry *e, *end;
449 count = set->packages.size / sizeof *p;
450 pkgs = zalloc(count * sizeof *pkgs);
452 end = set->files.data + set->files.size;
453 for (e = set->files.data; e < end; e++) {
454 list_remap_head(&e->packages, rmap);
455 r = list_first(&e->packages, &set->package_pool);
457 q = array_add(&pkgs[r->data], sizeof *q);
458 *q = e - (struct razor_entry *) set->files.data;
463 packages = set->packages.data;
464 for (i = 0; i < count; i++) {
465 list_set_array(&packages[i].files, &set->file_pool, &pkgs[i], 0);
466 array_release(&pkgs[i]);
472 razor_importer_finish(struct razor_importer *importer)
474 struct razor_set *set;
475 uint32_t *map, *rmap;
478 build_file_tree(importer);
479 find_file_provides(importer);
481 map = uniqueify_properties(importer->set);
482 list_remap_pool(&importer->set->property_pool, map);
485 count = importer->set->packages.size / sizeof(struct razor_package);
486 map = razor_qsort_with_data(importer->set->packages.data,
488 sizeof(struct razor_package),
492 rmap = malloc(count * sizeof *rmap);
493 for (i = 0; i < count; i++)
497 list_remap_pool(&importer->set->package_pool, rmap);
498 build_package_file_lists(importer->set, rmap);
499 remap_property_package_links(&importer->set->properties, rmap);
503 hashtable_release(&importer->table);