annotate libtests/0007/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 342822c2d49a
rev   line source
mas01ik@355 1 #include <stdio.h>
mas01ik@355 2 #include <stdlib.h>
mas01ik@355 3 #include <string.h>
mas01ik@355 4 #include <sysexits.h>
mas01ik@355 5 #include <fcntl.h>
mas01ik@355 6 #include <dirent.h>
mas01ik@355 7 #include <unistd.h>
mas01ik@355 8 #include <sys/stat.h>
mas01ik@355 9 /*
mas01ik@355 10 * * #define NDEBUG
mas01ik@355 11 * * */
mas01ik@355 12 #include <assert.h>
mas01ik@355 13
mas01ik@355 14 #include "../../audioDB_API.h"
mas01ik@355 15 #include "../test_utils_lib.h"
mas01ik@355 16
mas01ik@355 17
mas01ik@355 18 int main(int argc, char **argv){
mas01ik@355 19
mas01ik@355 20 int returnval=0;
mas01ik@355 21 adb_ptr mydbp={0};
mas01ik@355 22 int ivals[10];
mas01ik@355 23 double dvals[10];
mas01ik@355 24 adb_insert_t myinsert={0};
mas01ik@355 25 unsigned int myerr=0;
mas01ik@355 26 char * databasename="testdb";
mas01ik@355 27 adb_query_t myadbquery={0};
mas01ik@355 28 adb_queryresult_t myadbqueryresult={0};
mas01ik@355 29 // adbquery myadbquery2={0};
mas01ik@355 30 // adbqueryresult myadbqueryresult2={0};
mas01ik@355 31 int size=0;
mas01ik@355 32
mas01ik@355 33 /* remove old directory */
mas01ik@355 34 clean_remove_db(databasename);
mas01ik@355 35
mas01ik@355 36 /* create new db */
mas01ik@355 37 mydbp=audiodb_create(databasename,0,0,0);
mas01ik@355 38
mas01ik@355 39 //# tests that the lack of -l when the query sequence is shorter doesn't
mas01ik@355 40 //# segfault.
mas01ik@355 41
mas01ik@355 42 /* make test file */
mas01ik@355 43 //intstring 2 > testfeature
mas01ik@355 44 //floatstring 0 1 >> testfeature
mas01ik@355 45 //floatstring 1 0 >> testfeature
mas01ik@355 46 ivals[0]=2;
mas01ik@355 47 dvals[0]=0; dvals[1]=1; dvals[2]=1; dvals[3]=0;
mas01ik@355 48 maketestfile("testfeature",ivals,dvals,4);
mas01ik@355 49
mas01ik@355 50 /* insert */
mas01ik@355 51 //${AUDIODB} -d testdb -I -f testfeature
mas01ik@355 52 myinsert.features="testfeature";
mas01ik@355 53 myerr=audiodb_insert(mydbp,&myinsert);
mas01ik@355 54 if(myerr){ returnval=-1; };
mas01ik@355 55
mas01ik@355 56
mas01ik@355 57 /* turn on l2norm */
mas01ik@355 58 //# sequence queries require L2NORM
mas01ik@355 59 //${AUDIODB} -d testdb -L
mas01ik@355 60 if(audiodb_l2norm(mydbp)){ returnval=-1; };
mas01ik@355 61
mas01ik@355 62
mas01ik@355 63 /* make query */
mas01ik@355 64 //echo "query point (0.0,0.5)"
mas01ik@355 65 //intstring 2 > testquery
mas01ik@355 66 //floatstring 0 0.5 >> testquery
mas01ik@355 67 ivals[0]=2;
mas01ik@355 68 dvals[0]=0; dvals[1]=0.5;
mas01ik@355 69 maketestfile("testquery",ivals,dvals,2);
mas01ik@355 70
mas01ik@355 71
mas01ik@355 72 /* should fail */
mas01ik@355 73
mas01ik@355 74 //audioDB -Q sequence -d testdb -f testquery
mas01ik@355 75 //expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery
mas01ik@355 76
mas01ik@355 77 myadbquery.querytype="sequence";
mas01ik@355 78 myadbquery.feature="testquery";
mas01ik@355 79 //myadbquery.sequencelength="1";
mas01ik@355 80 myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
mas01ik@355 81 size=myadbqueryresult.sizeRlist;
mas01ik@355 82 if (!myerr){ returnval = -1;};
mas01ik@355 83
mas01ik@355 84
mas01ik@355 85 ///* should fail */
mas01ik@355 86 //expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery -n 1
mas01ik@355 87 myadbquery.querytype="sequence";
mas01ik@355 88 myadbquery.feature="testquery";
mas01ik@355 89 myadbquery.numpoints="1";
mas01ik@355 90 myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
mas01ik@355 91 if(!myerr){ returnval=-1; };
mas01ik@355 92
mas01ik@355 93 /* query 2 */
mas01ik@355 94 //echo "query point (0.5,0.0)"
mas01ik@355 95 //intstring 2 > testquery
mas01ik@355 96 //floatstring 0.5 0 >> testquery
mas01ik@355 97 ivals[0]=2;
mas01ik@355 98 dvals[0]=0.5; dvals[1]=0.0;
mas01ik@355 99 maketestfile("testquery",ivals,dvals,2);
mas01ik@355 100
mas01ik@355 101 /* should fail */
mas01ik@355 102 //expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery
mas01ik@355 103 myadbquery.querytype="sequence";
mas01ik@355 104 myadbquery.feature="testquery";
mas01ik@355 105 myadbquery.numpoints=NULL;
mas01ik@355 106 myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
mas01ik@355 107 if(!myerr){ returnval=-1; };
mas01ik@355 108
mas01ik@355 109 /* should fail */
mas01ik@355 110 //expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery -n 1
mas01ik@355 111 myadbquery.querytype="sequence";
mas01ik@355 112 myadbquery.feature="testquery";
mas01ik@355 113 myadbquery.numpoints="1";
mas01ik@355 114 myerr=audiodb_query(mydbp,&myadbquery,&myadbqueryresult);
mas01ik@355 115 if(!myerr){ returnval=-1; };
mas01ik@355 116
mas01ik@355 117
mas01ik@355 118
mas01ik@355 119
mas01ik@355 120 //printf("returnval:%d\n", returnval);
mas01ik@355 121
mas01ik@355 122 return(returnval);
mas01ik@355 123 }
mas01ik@355 124