changeset 429:5893ec2ec246 api-inversion

dataBuf is no more.

Neither is inBuf, whatever that was.

--- a/audioDB.cpp	Wed Dec 24 10:55:28 2008 +0000
+++ b/audioDB.cpp	Wed Dec 24 10:55:32 2008 +0000
@@ -205,8 +205,6 @@
     munmap(fileTable, fileTableLength);
   if(trackTable)
     munmap(trackTable, trackTableLength);
-  if(dataBuf)
-    munmap(dataBuf, dataBufLength);
   if(timesTable)
     munmap(timesTable, timesTableLength);
   if(powerTable)

--- a/audioDB.h	Wed Dec 24 10:55:28 2008 +0000
+++ b/audioDB.h	Wed Dec 24 10:55:32 2008 +0000
@@ -252,8 +252,6 @@
   char* fileTable;
   unsigned* trackTable;
   off_t* trackOffsetTable;
-  double* dataBuf;
-  double* inBuf;
   double* l2normTable;
   double* timesTable;
   double* powerTable;
@@ -264,7 +262,6 @@
 
   size_t fileTableLength;
   size_t trackTableLength;
-  off_t dataBufLength;
   size_t timesTableLength;
   size_t powerTableLength;
   size_t l2normTableLength;
@@ -444,7 +441,6 @@
     fileTable(0),				\
     trackTable(0),				\
     trackOffsetTable(0),                        \
-    dataBuf(0),					\
     l2normTable(0),				\
     timesTable(0),				\
     powerTable(0),                              \
@@ -453,7 +449,6 @@
     powerFileNameTable(0),                      \
     fileTableLength(0),				\
     trackTableLength(0),			\
-    dataBufLength(0),				\
     timesTableLength(0),			\
     powerTableLength(0),			\
     l2normTableLength(0),			\

--- a/common.cpp	Wed Dec 24 10:55:28 2008 +0000
+++ b/common.cpp	Wed Dec 24 10:55:32 2008 +0000
@@ -113,7 +113,6 @@
     if(forWrite) {
       fileTableLength = dbH->trackTableOffset - dbH->fileTableOffset;
       trackTableLength = dbH->dataOffset - dbH->trackTableOffset;
-      dataBufLength = dbH->timesTableOffset - dbH->dataOffset;
       timesTableLength = dbH->powerTableOffset - dbH->timesTableOffset;
       powerTableLength = dbH->l2normTableOffset - dbH->powerTableOffset;
       l2normTableLength = dbH->dbSize - dbH->l2normTableOffset;
@@ -121,13 +120,11 @@
       fileTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLE_ENTRY_SIZE);
       trackTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_TRACKTABLE_ENTRY_SIZE);
       if( dbH->flags & O2_FLAG_LARGE_ADB ){
-	dataBufLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLE_ENTRY_SIZE);
 	timesTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLE_ENTRY_SIZE);
 	powerTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLE_ENTRY_SIZE);
 	l2normTableLength = 0;
       }
       else{
-	dataBufLength = ALIGN_PAGE_UP(dbH->length);
 	timesTableLength = ALIGN_PAGE_UP(2*(dbH->length / dbH->dim));
 	powerTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim);
 	l2normTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim);
@@ -135,16 +132,6 @@
     }
     CHECKED_MMAP(char *, fileTable, dbH->fileTableOffset, fileTableLength);
     CHECKED_MMAP(unsigned *, trackTable, dbH->trackTableOffset, trackTableLength);
-    /*
-     * No more mmap() for dataBuf
-     *
-     * FIXME: Actually we do do the mmap() in the two cases where it's
-     * still "needed": in pointQuery and in l2norm if dbH->length is
-     * non-zero.  Removing those cases too (and deleting the dataBuf
-     * variable completely) would be cool.  -- CSR, 2007-11-19
-     *
-     * CHECKED_MMAP(double *, dataBuf, dbH->dataOffset, dataBufLength);
-     */
     if( dbH->flags & O2_FLAG_LARGE_ADB ){
       CHECKED_MMAP(char *, featureFileNameTable, dbH->dataOffset, fileTableLength);
       if( dbH->flags & O2_FLAG_TIMES )