annotate close.cpp @ 465:1030664df98c api-inversion

No more audioDB::index_allocate and audioDB::index_init_query No more SERVER_LSH_INDEX_SINGLETON, either; instead each adb_t contains a single cache of the last used in-core index. At the moment, this cache is unused by the server (and the previous cache code has been replaced by a comment), but I think that this way everyone can be allowed to benefit without anyone having to explicitly manage indexes themselves. I'm not going to say how long I wandered in a maze of valgrind before giving up and keeping the hacky workaround for loading the lsh tables [see the FIXME comment in audiodb_index_init_query()]; let's just say that it was long enough to find the extra bonus crashy close(lshfid) in audioDB::index_index_db. Also, delete the abstraction-inverting LSH stuff from query.cpp where we are making our reporters; the fix for that, which is presumably when creating small indexes for large datasets, is to implement space-efficient reporters. (The accumulator code, which is my second attempt, is more space-efficient than the reporters; inspiration may wish to be drawn...)
author mas01cr
date Tue, 30 Dec 2008 23:56:57 +0000
parents 16a903968d18
children
rev   line source
mas01cr@392 1 #include "audioDB.h"
mas01cr@392 2 extern "C" {
mas01cr@392 3 #include "audioDB_API.h"
mas01cr@402 4 #include "audioDB-internals.h"
mas01cr@392 5 }
mas01cr@392 6
mas01cr@392 7 void audiodb_close(adb_t *adb) {
mas01cr@392 8 free(adb->path);
mas01cr@392 9 free(adb->header);
mas01cr@402 10 delete adb->keys;
mas01cr@453 11 delete adb->keymap;
mas01cr@432 12 delete adb->track_lengths;
mas01cr@442 13 delete adb->track_offsets;
mas01cr@465 14 if(adb->cached_lsh) {
mas01cr@465 15 delete adb->cached_lsh;
mas01cr@465 16 }
mas01cr@392 17 close(adb->fd);
mas01cr@392 18 free(adb);
mas01cr@392 19 }