Mercurial > hg > audiodb
view status.cpp @ 404:1fb8bee777e5 api-inversion
Begin working towards inverting audioDB::insert() / audiodb_insert().
New data type audiodb_datum_t, roughly corresponding to a "track" in
current audioDB parlance; it contains exactly the feature information
and metadata to record.
New function audiodb_insert_datum() to insert one of these
audiodb_datum_t objects into the database; the intention is that not
only can insertion of feature files be implemented in terms of this
function, but that it will be a useful function in its own right,
callable perhaps from PD, Max/MSP, and/or a VAMP plugin. This function
is complicated enough that it actually gets a comment.
Implement audioDB::insert() in terms of audiodb_insert_datum(), via a
wrapper which handles the slightly wacky error/non-error case of
attempting to insert features with a key that already exists in the
database.
Delete whole rafts of code. We can't quite delete everything because
there's batchinsert / batchinsert_large_adb to sort out; the good news
is that the batchinsert operation can simply be implemented as a loop
around audiodb_insert_datum() without loss of efficiency.
(There's also a stray extra audiodb_insert() in libtests/0027/, found
through an earlier iteration of this patch.)
author | mas01cr |
---|---|
date | Fri, 05 Dec 2008 22:32:43 +0000 |
parents | 58b88ab69424 |
children | 62a0515f59be |
line wrap: on
line source
#include "audioDB.h" extern "C" { #include "audioDB_API.h" #include "audioDB-internals.h" } int audiodb_status(adb_t *adb, adb_status_t *status) { /* FIXME: it would be nice to be able to test for "is this database pointer valid", but at the moment we punt that to memory discipline. */ unsigned dudCount = 0; unsigned nullCount = 0; size_t trackTableLength = ALIGN_PAGE_UP(adb->header->numFiles * O2_TRACKTABLE_ENTRY_SIZE); unsigned *trackTable = 0; void *tmp = 0; if (adb->header->length > 0) { tmp = mmap(0, trackTableLength, PROT_READ, MAP_SHARED, adb->fd, adb->header->trackTableOffset); if (tmp == (void *) -1) { return 1; } trackTable = (unsigned *) tmp; } for(unsigned k = 0; k < adb->header->numFiles; k++) { /* FIXME: this bare "16" here reveals a problem (or maybe two). * 16 here means the default value of the sequenceLength parameter * initializer (both in C++ and corresponding to the "-l" or * "--sequencelength" command-line argument). * * The problem is that the API as currently designed provides no * way to pass that information in to this routine; there's no * input parameter; nor is there in the SOAP version of this * query. However, there /is/ a way to pass that information on * the command-line -- though that codepath is completely * untested. I can see that it might be useful to provide this * information, but at present it's probably completely unused, so * the compromise for now is to hardwire the 16. */ if(trackTable[k] < 16) { dudCount++; if(!trackTable[k]) { nullCount++; } } } if(adb->header->length > 0) { if(munmap(trackTable, trackTableLength)) { return 1; } } status->numFiles = adb->header->numFiles; status->dim = adb->header->dim; status->length = adb->header->length; status->dudCount = dudCount; status->nullCount = nullCount; status->flags = adb->header->flags; status->data_region_size = adb->header->timesTableOffset - adb->header->dataOffset; return 0; }