comparison audioDB.cpp @ 128:f789aa32382f

Variable-size databases, step 1: introduce dbSize field into the
database header.

(Preserve backward-compatibility by assuming that dbSize == 0 implies
dbSize = O2_DEFAULTDBSIZE)

 void audioDB::cleanup() {
   cmdline_parser_free(&args_info);
   if(indata)
     munmap(indata,statbuf.st_size);
   if(db)
-    munmap(db,O2_DEFAULTDBSIZE);
+    munmap(db,dbH->dbSize);
   if(dbfid>0)
     close(dbfid);
   if(infid>0)
     close(infid);
   if(dbH)

   dbH->fileTableOffset = ALIGN_UP(O2_HEADERSIZE, 8);
   dbH->trackTableOffset = ALIGN_UP(dbH->fileTableOffset + O2_FILETABLESIZE*O2_MAXFILES, 8);
   dbH->dataOffset = ALIGN_UP(dbH->trackTableOffset + O2_TRACKTABLESIZE*O2_MAXFILES, 8);
   dbH->l2normTableOffset = ALIGN_DOWN(O2_DEFAULTDBSIZE - O2_MAXFILES*O2_MEANNUMVECTORS*sizeof(double), 8);
   dbH->timesTableOffset = ALIGN_DOWN(dbH->l2normTableOffset - O2_MAXFILES*O2_MEANNUMVECTORS*sizeof(double), 8);
+  dbH->dbSize = O2_DEFAULTDBSIZE;
 
   memcpy (db, dbH, O2_HEADERSIZE);
   if(verbosity) {
     cerr << COM_CREATE << " " << dbName << endl;
   }

 
   if(dbH->version != O2_FORMAT_VERSION) {
     error("database file has incorect version", dbName);
   }
 
+  // FIXME: when changing file format version, remove this workaround.
+  if(dbH->dbSize == 0) {
+    dbH->dbSize = O2_DEFAULTDBSIZE;
+  }
+
   // mmap the database file
-  if ((db = (char*) mmap(0, O2_DEFAULTDBSIZE, PROT_READ | (forWrite ? PROT_WRITE : 0),
+  if ((db = (char*) mmap(0, dbH->dbSize, PROT_READ | (forWrite ? PROT_WRITE : 0),
 			 MAP_SHARED, dbfid, 0)) == (caddr_t) -1)
     error("mmap error for initting tables of database", "", "mmap");
 
   // Make some handy tables with correct types
   fileTable = (char *) (db + dbH->fileTableOffset);

     if(verbosity) {
       cerr << "Warning: ignoring zero-length feature vector file:" << key << endl;
     }
     // CLEAN UP
     munmap(indata,statbuf.st_size);
-    munmap(db,O2_DEFAULTDBSIZE);
+    munmap(db,dbH->dbSize);
     close(infid);
     return;
   }
 
   strncpy(fileTable + dbH->numFiles*O2_FILETABLESIZE, key, strlen(key));

    }
    
    if(!timesFile->is_open()){
      if(dbH->flags & O2_FLAG_TIMES){
        munmap(indata,statbuf.st_size);
-       munmap(db,O2_DEFAULTDBSIZE);
+       munmap(db,dbH->dbSize);
        error("problem opening times file on timestamped database",timesFileName);
      }
      else{
        cerr << "Warning: problem opening times file. But non-timestamped database, so ignoring times file." << endl;
        usingTimes=0;

 	  numtimes++;
 	}while(!timesFile->eof());
      }
      if(numtimes<numVectors || numtimes>numVectors+2){
        munmap(indata,statbuf.st_size);
-       munmap(db,O2_DEFAULTDBSIZE);
+       munmap(db,dbH->dbSize);
        close(infid);
        cerr << "expected " << numVectors << " found " << numtimes << endl;
        error("Times file is incorrect length for features file",inFile);
      }
      if(verbosity>2) {