Mercurial > hg > audiodb
view libtests/0001/prog1.c @ 392:78fed0d4c108 api-inversion
Include some necessary information in struct adb.
Now the struct adb contains a database fd, the flags used to open that
fd (so that we can later tell if it was for write or not) and a database
header pointer.
audiodb_open() is now responsible for filling in all of that
information. To do that, it needs to take an open(2) flag; that's good,
because it means that the call to open(2) is no longer invoking
undefined behaviour. (Also, the previous version of audiodb_open()
leaked an fd). Unfortunately, that means we have broken ABI and API
compatibility. (Fortunately, we have fewer than 12 users).
Use audiodb_open() in audioDB::initDBHeader().
We've temporarily(?) put acquire_lock(int, bool) in the API header; that
means we need to include <stdbool.h> and compile C files with -std=c99.
Do so.
Make audiodb_close() free resources allocated by audiodb_open().
Include a struct adb * field in the audioDB C++ object...
... which lets us actually implement memory-correctness, by
audiodb_close()ing the database in audioDB::cleanup().
[ The lock is, I think, correctly disposed of; man fcntl(2) on Linux
says that the locks are released once any file descriptor relating to
the file is closed, and we close the fd in audiodb_close(). ]
author | mas01cr |
---|---|
date | Mon, 24 Nov 2008 15:42:15 +0000 |
parents | 94c18f128ce8 |
children | e072aa1611f5 |
line wrap: on
line source
#include <stdio.h> #include <stdlib.h> #include <string.h> #include <sysexits.h> #include <fcntl.h> #include <dirent.h> #include <unistd.h> #include <sys/stat.h> #include <errno.h> /* * * #define NDEBUG * * */ #include <assert.h> #include "../../audioDB_API.h" #include "../test_utils_lib.h" int main(int argc, char **argv){ int returnval=0; adb_ptr mydbp={0}; adb_ptr mydbp2={0}; struct stat statbuf; int statval=0; char * databasename="testdb"; //if [ -f testdb ]; then rm -f testdb; fi /* remove old directory */ clean_remove_db(databasename); /* create new db */ //# creation //${AUDIODB} -N -d testdb mydbp=audiodb_open(databasename,O_RDWR); /* open should fail (return NULL), so create a new db */ if (!mydbp){ mydbp=audiodb_create(databasename,0,0,0); } if (!mydbp){ printf("fail\n"); returnval=-1; } /* stat testdb - let's make sure that it is there */ //stat testdb statval=stat(databasename, &statbuf); if (statval){ returnval=-1; } audiodb_close(mydbp); /* try to create should fail, because db exists now */ mydbp2=audiodb_create(databasename,0,0,0); if (mydbp2){ returnval=-1; } /* should pass now - db exists */ //expect_clean_error_exit ${AUDIODB} -N -d testdb mydbp2=audiodb_open(databasename, O_RDONLY); if (!mydbp2){ returnval=-1; } //this test would fail at compile time because of the API interface //# should fail (no db given) //expect_clean_error_exit ${AUDIODB} -N audiodb_close(mydbp2); // printf("returnval:%d\n",returnval); return(returnval); }