annotate soap.cpp @ 330:b1c48012cd3d

fixed null string reference in WS adb__sequenceQueryByKey()
author mas01mc
date Sat, 30 Aug 2008 15:47:53 +0000
parents 8f11ea4d9cd2
children 0c908093082f
rev   line source
mas01cr@239 1 #include "audioDB.h"
mas01cr@239 2 #include "adb.nsmap"
mas01cr@239 3
mas01cr@239 4 /* Command-line client definitions */
mas01cr@239 5
mas01cr@239 6 // FIXME: this can't propagate the sequence length argument (used for
mas01cr@239 7 // dudCount). See adb__status() definition for the other half of
mas01cr@239 8 // this. -- CSR, 2007-10-01
mas01cr@239 9 void audioDB::ws_status(const char*dbName, char* hostport){
mas01cr@239 10 struct soap soap;
mas01cr@239 11 adb__statusResponse adbStatusResponse;
mas01cr@239 12
mas01cr@239 13 // Query an existing adb database
mas01cr@239 14 soap_init(&soap);
mas01cr@239 15 if(soap_call_adb__status(&soap,hostport,NULL,(char*)dbName,adbStatusResponse)==SOAP_OK) {
mas01cr@239 16 std::cout << "numFiles = " << adbStatusResponse.result.numFiles << std::endl;
mas01cr@239 17 std::cout << "dim = " << adbStatusResponse.result.dim << std::endl;
mas01cr@239 18 std::cout << "length = " << adbStatusResponse.result.length << std::endl;
mas01cr@239 19 std::cout << "dudCount = " << adbStatusResponse.result.dudCount << std::endl;
mas01cr@239 20 std::cout << "nullCount = " << adbStatusResponse.result.nullCount << std::endl;
mas01mc@324 21 std::cout << "flags = " << (adbStatusResponse.result.flags & 0x00FFFFFF) << std::endl;
mas01cr@239 22 } else {
mas01cr@239 23 soap_print_fault(&soap,stderr);
mas01cr@239 24 }
mas01cr@239 25
mas01cr@239 26 soap_destroy(&soap);
mas01cr@239 27 soap_end(&soap);
mas01cr@239 28 soap_done(&soap);
mas01cr@239 29 }
mas01cr@239 30
mas01mc@308 31 // WS_QUERY (CLIENT SIDE)
mas01mc@307 32 void audioDB::ws_query(const char*dbName, const char *featureFileName, const char* hostport){
mas01cr@239 33 struct soap soap;
mas01cr@239 34 adb__queryResponse adbQueryResponse;
mas01mc@329 35 VERB_LOG(1, "Calling fileName query on database %s with featureFile=%s\n", dbName, featureFileName);
mas01cr@239 36 soap_init(&soap);
mas01cr@239 37 if(soap_call_adb__query(&soap,hostport,NULL,
mas01mc@307 38 (char*)dbName,(char*)featureFileName,(char*)trackFileName,(char*)timesFileName,
mas01cr@239 39 queryType, queryPoint, pointNN, trackNN, sequenceLength, adbQueryResponse)==SOAP_OK){
mas01cr@239 40 //std::std::cerr << "result list length:" << adbQueryResponse.result.__sizeRlist << std::std::endl;
mas01cr@239 41 for(int i=0; i<adbQueryResponse.result.__sizeRlist; i++)
mas01cr@239 42 std::cout << adbQueryResponse.result.Rlist[i] << " " << adbQueryResponse.result.Dist[i]
mas01cr@239 43 << " " << adbQueryResponse.result.Qpos[i] << " " << adbQueryResponse.result.Spos[i] << std::endl;
mas01cr@239 44 }
mas01cr@239 45 else
mas01cr@239 46 soap_print_fault(&soap,stderr);
mas01cr@239 47
mas01cr@239 48 soap_destroy(&soap);
mas01cr@239 49 soap_end(&soap);
mas01cr@239 50 soap_done(&soap);
mas01cr@239 51 }
mas01mc@307 52
mas01mc@308 53 // WS_QUERY_BY_KEY (CLIENT SIDE)
mas01mc@328 54 void audioDB::ws_query_by_key(const char*dbName, const char *trackKey, const char* featureFileName, const char* hostport){
mas01mc@307 55 struct soap soap;
mas01mc@307 56 adb__queryResponse adbQueryResponse;
mas01mc@314 57 /* JUST TRY TO USE A DATA STRUCTURE WITH PHP
mas01mc@314 58 adb__sequenceQueryParms asqp;
mas01mc@314 59 asqp.keyList = (char*)trackFileName;
mas01mc@314 60 asqp.timesFileName = (char*)timesFileName;
mas01mc@314 61 asqp.queryPoint = queryPoint;
mas01mc@314 62 asqp.pointNN = pointNN;
mas01mc@314 63 asqp.trackNN = trackNN;
mas01mc@314 64 asqp.sequenceLength = sequenceLength;
mas01mc@314 65 asqp.radius = radius;
mas01mc@314 66 asqp.relative_threshold = relative_threshold;
mas01mc@314 67 asqp.absolute_threshold = absolute_threshold;
mas01mc@314 68 asqp.usingQueryPoint = usingQueryPoint;
mas01mc@314 69 asqp.lsh_exact = lsh_exact;
mas01mc@314 70 */
mas01mc@329 71 VERB_LOG(1, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME",
mas01mc@329 72 strlen(trackKey)?trackKey:featureFileName);
mas01mc@307 73 soap_init(&soap);
mas01mc@307 74 if(queryType==O2_SEQUENCE_QUERY || queryType==O2_N_SEQUENCE_QUERY){
mas01mc@314 75 if(soap_call_adb__sequenceQueryByKey(&soap,hostport,NULL,
mas01mc@328 76 (char*)dbName,
mas01mc@328 77 (char*)trackKey,
mas01mc@328 78 (char*)featureFileName,
mas01mc@328 79 queryType,
mas01mc@328 80 (char*)trackFileName, // this means keyFileName
mas01mc@328 81 (char*)timesFileName,
mas01mc@314 82 queryPoint,
mas01mc@328 83 pointNN,
mas01mc@328 84 trackNN,
mas01mc@328 85 sequenceLength,
mas01mc@328 86 radius,
mas01mc@328 87 absolute_threshold,
mas01mc@328 88 usingQueryPoint,
mas01mc@314 89 lsh_exact,
mas01mc@314 90 adbQueryResponse)==SOAP_OK){
mas01mc@307 91 //std::std::cerr << "result list length:" << adbQueryResponse.result.__sizeRlist << std::std::endl;
mas01mc@307 92 for(int i=0; i<adbQueryResponse.result.__sizeRlist; i++)
mas01mc@307 93 std::cout << adbQueryResponse.result.Rlist[i] << " " << adbQueryResponse.result.Dist[i]
mas01mc@307 94 << " " << adbQueryResponse.result.Qpos[i] << " " << adbQueryResponse.result.Spos[i] << std::endl;
mas01mc@307 95 }
mas01mc@307 96 else
mas01mc@307 97 soap_print_fault(&soap,stderr);
mas01mc@307 98 }else
mas01mc@307 99 ;// FIX ME: WRITE NON-SEQUENCE QUERY BY KEY ?
mas01mc@307 100
mas01mc@307 101 soap_destroy(&soap);
mas01mc@307 102 soap_end(&soap);
mas01mc@307 103 soap_done(&soap);
mas01mc@307 104 }
mas01mc@307 105
mas01cr@239 106
mas01cr@239 107 /* Server definitions */
mas01cr@239 108 int adb__status(struct soap* soap, xsd__string dbName, adb__statusResponse &adbStatusResponse){
mas01mc@307 109 char* const argv[]={"./audioDB",COM_STATUS,"-d",dbName};
mas01cr@239 110 const unsigned argc = 4;
mas01cr@239 111 try {
mas01cr@239 112 audioDB(argc, argv, &adbStatusResponse);
mas01cr@239 113 return SOAP_OK;
mas01cr@239 114 } catch(char *err) {
mas01cr@239 115 soap_receiver_fault(soap, err, "");
mas01cr@239 116 return SOAP_FAULT;
mas01cr@239 117 }
mas01cr@239 118 }
mas01mc@308 119
mas01cr@239 120 // Literal translation of command line to web service
mas01cr@239 121 int adb__query(struct soap* soap, xsd__string dbName, xsd__string qKey, xsd__string keyList, xsd__string timesFileName, xsd__int qType, xsd__int qPos, xsd__int pointNN, xsd__int trackNN, xsd__int seqLen, adb__queryResponse &adbQueryResponse){
mas01cr@239 122 char queryType[256];
mas01mc@329 123
mas01mc@329 124 fprintf(stderr,"Calling fileName query on database %s with featureFile=%s\n", dbName, qKey);
mas01mc@329 125
mas01cr@239 126 for(int k=0; k<256; k++)
mas01cr@239 127 queryType[k]='\0';
mas01cr@239 128 if(qType == O2_POINT_QUERY)
mas01cr@239 129 strncpy(queryType, "point", strlen("point"));
mas01cr@239 130 else if (qType == O2_SEQUENCE_QUERY)
mas01cr@239 131 strncpy(queryType, "sequence", strlen("sequence"));
mas01cr@239 132 else if(qType == O2_TRACK_QUERY)
mas01cr@239 133 strncpy(queryType,"track", strlen("track"));
mas01mc@324 134 else if(qType == O2_N_SEQUENCE_QUERY)
mas01mc@324 135 strncpy(queryType,"nsequence", strlen("nsequence"));
mas01cr@239 136
mas01cr@239 137 if(pointNN==0)
mas01cr@239 138 pointNN=10;
mas01cr@239 139 if(trackNN==0)
mas01cr@239 140 trackNN=10;
mas01cr@239 141 if(seqLen==0)
mas01cr@239 142 seqLen=16;
mas01cr@239 143
mas01cr@239 144 char qPosStr[256];
mas01cr@239 145 sprintf(qPosStr, "%d", qPos);
mas01cr@239 146 char pointNNStr[256];
mas01cr@239 147 sprintf(pointNNStr,"%d",pointNN);
mas01cr@239 148 char trackNNStr[256];
mas01cr@239 149 sprintf(trackNNStr,"%d",trackNN);
mas01cr@239 150 char seqLenStr[256];
mas01cr@239 151 sprintf(seqLenStr,"%d",seqLen);
mas01cr@239 152
mas01cr@239 153 const char* argv[] ={
mas01cr@239 154 "./audioDB",
mas01cr@239 155 COM_QUERY,
mas01cr@239 156 queryType, // Need to pass a parameter
mas01cr@239 157 COM_DATABASE,
mas01cr@239 158 ENSURE_STRING(dbName),
mas01cr@239 159 COM_FEATURES,
mas01cr@239 160 ENSURE_STRING(qKey),
mas01cr@239 161 COM_KEYLIST,
mas01cr@239 162 ENSURE_STRING(keyList),
mas01cr@239 163 COM_TIMES,
mas01cr@239 164 ENSURE_STRING(timesFileName),
mas01cr@239 165 COM_QPOINT,
mas01cr@239 166 qPosStr,
mas01cr@239 167 COM_POINTNN,
mas01cr@239 168 pointNNStr,
mas01cr@239 169 COM_TRACKNN,
mas01cr@239 170 trackNNStr, // Need to pass a parameter
mas01cr@239 171 COM_SEQLEN,
mas01cr@239 172 seqLenStr
mas01cr@239 173 };
mas01cr@239 174
mas01cr@239 175 const unsigned argc = 19;
mas01cr@239 176 try {
mas01cr@239 177 audioDB(argc, (char* const*)argv, &adbQueryResponse);
mas01cr@239 178 return SOAP_OK;
mas01cr@239 179 } catch (char *err) {
mas01cr@239 180 soap_receiver_fault(soap, err, "");
mas01cr@239 181 return SOAP_FAULT;
mas01cr@239 182 }
mas01cr@239 183 }
mas01cr@239 184
mas01mc@314 185 int adb__sequenceQueryByKey(struct soap* soap,xsd__string dbName,
mas01mc@314 186 xsd__string trackKey,
mas01mc@328 187 xsd__string featureFileName,
mas01mc@314 188 xsd__int queryType,
mas01mc@328 189 xsd__string keyFileName,
mas01mc@314 190 xsd__string timesFileName,
mas01mc@314 191 xsd__int queryPoint,
mas01mc@314 192 xsd__int pointNN,
mas01mc@314 193 xsd__int trackNN,
mas01mc@314 194 xsd__int sequenceLength,
mas01mc@314 195 xsd__double radius,
mas01mc@314 196 xsd__double absolute_threshold,
mas01mc@314 197 xsd__int usingQueryPoint,
mas01mc@314 198 xsd__int lsh_exact,
mas01mc@314 199 struct adb__queryResponse& adbQueryResponse){
mas01mc@307 200 char radiusStr[256];
mas01cr@239 201 char qPosStr[256];
mas01cr@239 202 char pointNNStr[256];
mas01cr@239 203 char trackNNStr[256];
mas01cr@239 204 char seqLenStr[256];
mas01cr@239 205 char absolute_thresholdStr[256];
mas01mc@307 206 char qtypeStr[256];
mas01cr@239 207
mas01mc@329 208 fprintf(stderr, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME",
mas01mc@329 209 strlen(trackKey)?trackKey:featureFileName);
mas01mc@329 210
mas01cr@239 211 /* When the branch is merged, move this to a header and use it
mas01cr@239 212 elsewhere */
mas01cr@239 213 #define INTSTRINGIFY(val, str) \
mas01cr@239 214 snprintf(str, 256, "%d", val);
mas01cr@239 215 #define DOUBLESTRINGIFY(val, str) \
mas01cr@239 216 snprintf(str, 256, "%f", val);
mas01cr@239 217
mas01mc@314 218 INTSTRINGIFY(queryPoint, qPosStr);
mas01mc@314 219 INTSTRINGIFY(pointNN, pointNNStr);
mas01mc@314 220 INTSTRINGIFY(trackNN, trackNNStr);
mas01mc@314 221 INTSTRINGIFY(sequenceLength, seqLenStr);
mas01mc@314 222 DOUBLESTRINGIFY(absolute_threshold, absolute_thresholdStr);
mas01mc@314 223 DOUBLESTRINGIFY(radius, radiusStr);
mas01mc@307 224
mas01mc@307 225 // WS queries only support 1-nearest neighbour point reporting
mas01mc@307 226 // at the moment, until we figure out how to better serve results
mas01mc@307 227 snprintf(qtypeStr, 256, "nsequence");
mas01mc@310 228 const char *argv[]={
mas01cr@239 229 "./audioDB",
mas01cr@239 230 COM_QUERY,
mas01mc@307 231 qtypeStr,
mas01cr@239 232 COM_DATABASE,
mas01cr@239 233 dbName,
mas01mc@330 234 (trackKey&&strlen(trackKey))?COM_QUERYKEY:COM_FEATURES,
mas01mc@330 235 (trackKey&&strlen(trackKey))?ENSURE_STRING(trackKey):ENSURE_STRING(featureFileName),
mas01cr@239 236 COM_KEYLIST,
mas01mc@328 237 ENSURE_STRING(keyFileName),
mas01mc@314 238 usingQueryPoint?COM_QPOINT:COM_EXHAUSTIVE,
mas01mc@314 239 usingQueryPoint?qPosStr:"",
mas01cr@239 240 COM_POINTNN,
mas01cr@239 241 pointNNStr,
mas01cr@239 242 COM_TRACKNN,
mas01cr@239 243 trackNNStr,
mas01mc@307 244 COM_RADIUS,
mas01mc@307 245 radiusStr,
mas01cr@239 246 COM_SEQLEN,
mas01cr@239 247 seqLenStr,
mas01cr@239 248 COM_ABSOLUTE_THRESH,
mas01mc@310 249 absolute_thresholdStr,
mas01mc@314 250 lsh_exact?COM_LSH_EXACT:""
mas01cr@239 251 };
mas01cr@239 252
mas01mc@310 253 const unsigned argc = 22;
mas01mc@310 254
mas01mc@310 255
mas01cr@239 256 try {
mas01cr@239 257 audioDB(argc, (char* const*)argv, &adbQueryResponse);
mas01cr@239 258 return SOAP_OK;
mas01cr@239 259 } catch (char *err) {
mas01cr@239 260 soap_receiver_fault(soap, err, "");
mas01cr@239 261 return SOAP_FAULT;
mas01cr@239 262 }
mas01cr@239 263 }
mas01cr@239 264
mas01cr@239 265 /* Server loop */
mas01cr@239 266 void audioDB::startServer(){
mas01cr@239 267 struct soap soap;
mas01cr@239 268 int m, s; // master and slave sockets
mas01cr@239 269 soap_init(&soap);
mas01cr@239 270 // FIXME: largely this use of SO_REUSEADDR is to make writing (and
mas01cr@239 271 // running) test cases more convenient, so that multiple test runs
mas01cr@239 272 // in close succession don't fail because of a bin() error.
mas01cr@239 273 // Investigate whether there are any potential drawbacks in this,
mas01cr@239 274 // and also whether there's a better way to write the tests. --
mas01cr@239 275 // CSR, 2007-10-03
mas01cr@239 276 soap.bind_flags |= SO_REUSEADDR;
mas01cr@239 277 m = soap_bind(&soap, NULL, port, 100);
mas01cr@239 278 if (m < 0)
mas01cr@239 279 soap_print_fault(&soap, stderr);
mas01cr@239 280 else
mas01cr@239 281 {
mas01cr@239 282 fprintf(stderr, "Socket connection successful: master socket = %d\n", m);
mas01mc@308 283 // Make a global Web Services LSH Index (SINGLETON)
mas01mc@313 284 if(WS_load_index && dbName && !index_exists(dbName, radius, sequenceLength)){
mas01mc@313 285 error("Can't find requested index file:", index_get_name(dbName,radius,sequenceLength));
mas01mc@313 286 }
mas01mc@308 287 if(WS_load_index && dbName && index_exists(dbName, radius, sequenceLength)){
mas01mc@308 288 char* indexName = index_get_name(dbName, radius, sequenceLength);
mas01mc@308 289 fprintf(stderr, "Loading LSH hashtables: %s...\n", indexName);
mas01mc@308 290 lsh = new LSH(indexName, true);
mas01mc@308 291 assert(lsh);
mas01mc@308 292 SERVER_LSH_INDEX_SINGLETON = lsh;
mas01mc@308 293 fprintf(stderr, "LSH INDEX READY\n");
mas01mc@308 294 fflush(stderr);
mas01mc@308 295 delete[] indexName;
mas01mc@308 296 }
mas01mc@324 297
mas01mc@324 298 // Server-side path prefix to databases and features
mas01mc@324 299 if(adb_root)
mas01mc@324 300 SERVER_ADB_ROOT = (char*)adb_root; // Server-side database root
mas01mc@324 301 if(adb_feature_root)
mas01mc@324 302 SERVER_ADB_FEATURE_ROOT = (char*)adb_feature_root; // Server-side features root
mas01mc@308 303
mas01cr@239 304 for (int i = 1; ; i++)
mas01cr@239 305 {
mas01cr@239 306 s = soap_accept(&soap);
mas01cr@239 307 if (s < 0)
mas01cr@239 308 {
mas01cr@239 309 soap_print_fault(&soap, stderr);
mas01cr@239 310 break;
mas01cr@239 311 }
mas01cr@239 312 /* FIXME: find a way to play nice with logging when run from
mas01cr@239 313 /etc/init.d scripts: at present this just goes nowhere */
mas01cr@239 314 fprintf(stderr, "%d: accepted connection from IP=%lu.%lu.%lu.%lu socket=%d\n", i,
mas01cr@239 315 (soap.ip >> 24)&0xFF, (soap.ip >> 16)&0xFF, (soap.ip >> 8)&0xFF, soap.ip&0xFF, s);
mas01cr@239 316 if (soap_serve(&soap) != SOAP_OK) // process RPC request
mas01cr@239 317 soap_print_fault(&soap, stderr); // print error
mas01cr@239 318 fprintf(stderr, "request served\n");
mas01cr@239 319 soap_destroy(&soap); // clean up class instances
mas01cr@239 320 soap_end(&soap); // clean up everything and close socket
mas01cr@239 321 }
mas01cr@239 322 }
mas01cr@239 323 soap_done(&soap); // close master socket and detach environment
mas01cr@239 324 }