Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch threadtest4 Excluding Merge-Ins
This is equivalent to a diff from fc157dd7 to 6bef7ede
2014-12-12
| ||
00:52 | Remove the KeyInfo cache (for now - perhaps we will add it back in later - or maybe not since it provides negligible benefit but adds a lot of complexity and thread-safety risk). Add a mutex to ATTACH to deal with a data race. (check-in: 03c443ea user: drh tags: trunk) | |
00:40 | Make sure the Btree mutex is held when setting the locking mode and the secure delete flag when attaching a shared-cache database. (Closed-Leaf check-in: 6bef7ede user: drh tags: threadtest4) | |
00:26 | Merge the cell overflow page number cache thread race fix from trunk. (check-in: cefad47e user: drh tags: threadtest4) | |
2014-12-11
| ||
16:38 | Fix a race condition to do with very large index keys in shared-cache mode. (check-in: fc157dd7 user: dan tags: trunk) | |
15:27 | Fix a typo in the documentation for sqlite3_threadsafe(). (check-in: 258e747b user: drh tags: trunk) | |
Changes to src/attach.c.
︙ | ︙ | |||
146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | if( !aNew->pSchema ){ rc = SQLITE_NOMEM; }else if( aNew->pSchema->file_format && aNew->pSchema->enc!=ENC(db) ){ zErrDyn = sqlite3MPrintf(db, "attached databases must use the same text encoding as main database"); rc = SQLITE_ERROR; } pPager = sqlite3BtreePager(aNew->pBt); sqlite3PagerLockingMode(pPager, db->dfltLockMode); sqlite3BtreeSecureDelete(aNew->pBt, sqlite3BtreeSecureDelete(db->aDb[0].pBt,-1) ); #ifndef SQLITE_OMIT_PAGER_PRAGMAS sqlite3BtreeSetPagerFlags(aNew->pBt, 3 | (db->flags & PAGER_FLAGS_MASK)); #endif } aNew->safety_level = 3; aNew->zName = sqlite3DbStrDup(db, zName); if( rc==SQLITE_OK && aNew->zName==0 ){ rc = SQLITE_NOMEM; } | > > | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | if( !aNew->pSchema ){ rc = SQLITE_NOMEM; }else if( aNew->pSchema->file_format && aNew->pSchema->enc!=ENC(db) ){ zErrDyn = sqlite3MPrintf(db, "attached databases must use the same text encoding as main database"); rc = SQLITE_ERROR; } sqlite3BtreeEnter(aNew->pBt); pPager = sqlite3BtreePager(aNew->pBt); sqlite3PagerLockingMode(pPager, db->dfltLockMode); sqlite3BtreeSecureDelete(aNew->pBt, sqlite3BtreeSecureDelete(db->aDb[0].pBt,-1) ); #ifndef SQLITE_OMIT_PAGER_PRAGMAS sqlite3BtreeSetPagerFlags(aNew->pBt, 3 | (db->flags & PAGER_FLAGS_MASK)); #endif sqlite3BtreeLeave(aNew->pBt); } aNew->safety_level = 3; aNew->zName = sqlite3DbStrDup(db, zName); if( rc==SQLITE_OK && aNew->zName==0 ){ rc = SQLITE_NOMEM; } |
︙ | ︙ |
Changes to src/build.c.
︙ | ︙ | |||
431 432 433 434 435 436 437 | /* ** Reclaim the memory used by an index */ static void freeIndex(sqlite3 *db, Index *p){ #ifndef SQLITE_OMIT_ANALYZE sqlite3DeleteIndexSamples(db, p); #endif | < | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | /* ** Reclaim the memory used by an index */ static void freeIndex(sqlite3 *db, Index *p){ #ifndef SQLITE_OMIT_ANALYZE sqlite3DeleteIndexSamples(db, p); #endif sqlite3ExprDelete(db, p->pPartIdxWhere); sqlite3DbFree(db, p->zColAff); if( p->isResized ) sqlite3DbFree(db, p->azColl); #ifdef SQLITE_ENABLE_STAT3_OR_STAT4 sqlite3_free(p->aiRowEst); #endif sqlite3DbFree(db, p); |
︙ | ︙ | |||
4186 4187 4188 4189 4190 4191 4192 | ** So there might be multiple references to the returned pointer. The ** caller should not try to modify the KeyInfo object. ** ** The caller should invoke sqlite3KeyInfoUnref() on the returned object ** when it has finished using it. */ KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){ | < < < < < < < < | | | | > | | | | | | | | | | | | | | | | < | | | < | | 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 | ** So there might be multiple references to the returned pointer. The ** caller should not try to modify the KeyInfo object. ** ** The caller should invoke sqlite3KeyInfoUnref() on the returned object ** when it has finished using it. */ KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){ int i; int nCol = pIdx->nColumn; int nKey = pIdx->nKeyCol; KeyInfo *pKey; if( pParse->nErr ) return 0; if( pIdx->uniqNotNull ){ pKey = sqlite3KeyInfoAlloc(pParse->db, nKey, nCol-nKey); }else{ pKey = sqlite3KeyInfoAlloc(pParse->db, nCol, 0); } if( pKey ){ assert( sqlite3KeyInfoIsWriteable(pKey) ); for(i=0; i<nCol; i++){ char *zColl = pIdx->azColl[i]; assert( zColl!=0 ); pKey->aColl[i] = strcmp(zColl,"BINARY")==0 ? 0 : sqlite3LocateCollSeq(pParse, zColl); pKey->aSortOrder[i] = pIdx->aSortOrder[i]; } if( pParse->nErr ){ sqlite3KeyInfoUnref(pKey); pKey = 0; } } return pKey; } #ifndef SQLITE_OMIT_CTE /* ** This routine is invoked once per CTE by the parser while parsing a ** WITH clause. */ |
︙ | ︙ |
Changes to src/main.c.
︙ | ︙ | |||
1028 1029 1030 1031 1032 1033 1034 | /* Free any outstanding Savepoint structures. */ sqlite3CloseSavepoints(db); /* Close all database connections */ for(j=0; j<db->nDb; j++){ struct Db *pDb = &db->aDb[j]; if( pDb->pBt ){ | < < < < < < < < < < | 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 | /* Free any outstanding Savepoint structures. */ sqlite3CloseSavepoints(db); /* Close all database connections */ for(j=0; j<db->nDb; j++){ struct Db *pDb = &db->aDb[j]; if( pDb->pBt ){ sqlite3BtreeClose(pDb->pBt); pDb->pBt = 0; if( j!=1 ){ pDb->pSchema = 0; } } } |
︙ | ︙ | |||
2165 2166 2167 2168 2169 2170 2171 | ** argument. For now, this simply calls the internal sqlite3ErrStr() ** function. */ const char *sqlite3_errstr(int rc){ return sqlite3ErrStr(rc); } | < < < < < < < < < < < < < < < < < < < < < < < < < < | 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 | ** argument. For now, this simply calls the internal sqlite3ErrStr() ** function. */ const char *sqlite3_errstr(int rc){ return sqlite3ErrStr(rc); } /* ** Create a new collating function for database "db". The name is zName ** and the encoding is enc. */ static int createCollation( sqlite3* db, const char *zName, |
︙ | ︙ | |||
2234 2235 2236 2237 2238 2239 2240 | if( pColl && pColl->xCmp ){ if( db->nVdbeActive ){ sqlite3ErrorWithMsg(db, SQLITE_BUSY, "unable to delete/modify collation sequence due to active statements"); return SQLITE_BUSY; } sqlite3ExpirePreparedStatements(db); | < | 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 | if( pColl && pColl->xCmp ){ if( db->nVdbeActive ){ sqlite3ErrorWithMsg(db, SQLITE_BUSY, "unable to delete/modify collation sequence due to active statements"); return SQLITE_BUSY; } sqlite3ExpirePreparedStatements(db); /* If collation sequence pColl was created directly by a call to ** sqlite3_create_collation, and not generated by synthCollSeq(), ** then any copies made by synthCollSeq() need to be invalidated. ** Also, collation destructor - CollSeq.xDel() - function may need ** to be called. */ |
︙ | ︙ |
Changes to src/sqliteInt.h.
︙ | ︙ | |||
1780 1781 1782 1783 1784 1785 1786 | Table *pTable; /* The SQL table being indexed */ char *zColAff; /* String defining the affinity of each column */ Index *pNext; /* The next index associated with the same table */ Schema *pSchema; /* Schema containing this index */ u8 *aSortOrder; /* for each column: True==DESC, False==ASC */ char **azColl; /* Array of collation sequence names for index */ Expr *pPartIdxWhere; /* WHERE clause for partial indices */ | < | 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 | Table *pTable; /* The SQL table being indexed */ char *zColAff; /* String defining the affinity of each column */ Index *pNext; /* The next index associated with the same table */ Schema *pSchema; /* Schema containing this index */ u8 *aSortOrder; /* for each column: True==DESC, False==ASC */ char **azColl; /* Array of collation sequence names for index */ Expr *pPartIdxWhere; /* WHERE clause for partial indices */ int tnum; /* DB Page containing root of this index */ LogEst szIdxRow; /* Estimated average row size in bytes */ u16 nKeyCol; /* Number of columns forming the key */ u16 nColumn; /* Number of columns stored in the index */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ unsigned idxType:2; /* 1==UNIQUE, 2==PRIMARY KEY, 0==CREATE INDEX */ unsigned bUnordered:1; /* Use this index for == or IN queries only */ |
︙ | ︙ |
Changes to src/where.c.
︙ | ︙ | |||
3937 3938 3939 3940 3941 3942 3943 | if( p->wsFlags & (WHERE_VIRTUALTABLE|WHERE_AUTO_INDEX) ){ if( (p->wsFlags & WHERE_VIRTUALTABLE)!=0 && p->u.vtab.needFree ){ sqlite3_free(p->u.vtab.idxStr); p->u.vtab.needFree = 0; p->u.vtab.idxStr = 0; }else if( (p->wsFlags & WHERE_AUTO_INDEX)!=0 && p->u.btree.pIndex!=0 ){ sqlite3DbFree(db, p->u.btree.pIndex->zColAff); | < | 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 | if( p->wsFlags & (WHERE_VIRTUALTABLE|WHERE_AUTO_INDEX) ){ if( (p->wsFlags & WHERE_VIRTUALTABLE)!=0 && p->u.vtab.needFree ){ sqlite3_free(p->u.vtab.idxStr); p->u.vtab.needFree = 0; p->u.vtab.idxStr = 0; }else if( (p->wsFlags & WHERE_AUTO_INDEX)!=0 && p->u.btree.pIndex!=0 ){ sqlite3DbFree(db, p->u.btree.pIndex->zColAff); sqlite3DbFree(db, p->u.btree.pIndex); p->u.btree.pIndex = 0; } } } /* |
︙ | ︙ |
Added test/threadtest4.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | /* ** 2014-12-11 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file implements a simple standalone program used to stress the ** SQLite library when accessing the same set of databases simultaneously ** from multiple threads in shared-cache mode. ** ** This test program runs on unix-like systems only. It uses pthreads. ** To compile: ** ** gcc -o tt4 -I. threadtest4.c sqlite3.c -ldl -lpthread ** ** To run: ** ** ./tt4 10 ** ** The argument is the number of threads. */ #include "sqlite3.h" #include <pthread.h> #include <sched.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <stdarg.h> /* ** An instance of the following structure is passed into each worker ** thread. */ typedef struct WorkerInfo WorkerInfo; struct WorkerInfo { int tid; /* Thread ID */ unsigned wkrFlags; /* Flags */ sqlite3 *mainDb; /* Database connection of the main thread */ sqlite3 *db; /* Database connection of this thread */ int nErr; /* Number of errors seen by this thread */ int nTest; /* Number of tests run by this thread */ char *zMsg; /* Message returned by this thread */ pthread_t id; /* Thread id */ pthread_mutex_t *pWrMutex; /* Hold this mutex while writing */ }; /* ** Allowed values for WorkerInfo.wkrFlags */ #define TT4_SERIALIZED 0x0000001 /* The --serialized option is used */ #define TT4_WAL 0x0000002 /* WAL mode in use */ #define TT4_TRACE 0x0000004 /* Trace activity */ /* ** Report an OOM error and die if the argument is NULL */ static void check_oom(void *x){ if( x==0 ){ fprintf(stderr, "out of memory\n"); exit(1); } } /* ** Allocate memory. If the allocation fails, print an error message and ** kill the process. */ static void *safe_malloc(int sz){ void *x = sqlite3_malloc(sz>0?sz:1); check_oom(x); return x; } /* ** Print a trace message for a worker */ static void worker_trace(WorkerInfo *p, const char *zFormat, ...){ va_list ap; char *zMsg; if( (p->wkrFlags & TT4_TRACE)==0 ) return; va_start(ap, zFormat); zMsg = sqlite3_vmprintf(zFormat, ap); check_oom(zMsg); va_end(ap); fprintf(stderr, "TRACE(%02d): %s\n", p->tid, zMsg); sqlite3_free(zMsg); } /* ** Prepare a single SQL query */ static sqlite3_stmt *prep_sql(sqlite3 *db, const char *zFormat, ...){ va_list ap; char *zSql; int rc; sqlite3_stmt *pStmt = 0; va_start(ap, zFormat); zSql = sqlite3_vmprintf(zFormat, ap); va_end(ap); check_oom(zSql); rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); if( rc!=SQLITE_OK ){ fprintf(stderr, "SQL error (%d,%d): %s\nWhile preparing: [%s]\n", rc, sqlite3_extended_errcode(db), sqlite3_errmsg(db), zSql); exit(1); } sqlite3_free(zSql); return pStmt; } /* ** Run a SQL statements. Panic if unable. */ static void run_sql(WorkerInfo *p, const char *zFormat, ...){ va_list ap; char *zSql; int rc; sqlite3_stmt *pStmt = 0; int nRetry = 0; va_start(ap, zFormat); zSql = sqlite3_vmprintf(zFormat, ap); va_end(ap); check_oom(zSql); rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0); if( rc!=SQLITE_OK ){ fprintf(stderr, "SQL error (%d,%d): %s\nWhile preparing: [%s]\n", rc, sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db), zSql); exit(1); } worker_trace(p, "running [%s]", zSql); while( (rc = sqlite3_step(pStmt))!=SQLITE_DONE ){ if( (rc&0xff)==SQLITE_BUSY || (rc&0xff)==SQLITE_LOCKED ){ sqlite3_reset(pStmt); nRetry++; if( nRetry<10 ){ worker_trace(p, "retry %d for [%s]", nRetry, zSql); sched_yield(); continue; }else{ fprintf(stderr, "Deadlock in thread %d while running [%s]\n", p->tid, zSql); exit(1); } } if( rc!=SQLITE_ROW ){ fprintf(stderr, "SQL error (%d,%d): %s\nWhile running [%s]\n", rc, sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db), zSql); exit(1); } } sqlite3_free(zSql); sqlite3_finalize(pStmt); } /* ** Open the database connection for WorkerInfo. The order in which ** the files are opened is a function of the tid value. */ static void worker_open_connection(WorkerInfo *p, int iCnt){ char *zFile; int x; int rc; static const unsigned char aOrder[6][3] = { { 1, 2, 3}, { 1, 3, 2}, { 2, 1, 3}, { 2, 3, 1}, { 3, 1, 2}, { 3, 2, 1} }; x = (p->tid + iCnt) % 6; zFile = sqlite3_mprintf("tt4-test%d.db", aOrder[x][0]); check_oom(zFile); worker_trace(p, "open %s", zFile); rc = sqlite3_open_v2(zFile, &p->db, SQLITE_OPEN_READWRITE|SQLITE_OPEN_SHAREDCACHE, 0); if( rc!=SQLITE_OK ){ fprintf(stderr, "sqlite_open_v2(%s) failed on thread %d\n", zFile, p->tid); exit(1); } sqlite3_free(zFile); run_sql(p, "PRAGMA read_uncommitted=ON;"); sqlite3_busy_timeout(p->db, 10000); run_sql(p, "PRAGMA synchronous=OFF;"); run_sql(p, "ATTACH 'tt4-test%d.db' AS aux1", aOrder[x][1]); run_sql(p, "ATTACH 'tt4-test%d.db' AS aux2", aOrder[x][2]); } /* ** Close the worker database connection */ static void worker_close_connection(WorkerInfo *p){ if( p->db ){ worker_trace(p, "close"); sqlite3_close(p->db); p->db = 0; } } /* ** Delete all content in the three databases associated with a ** single thread. Make this happen all in a single transaction if ** inTrans is true, or separately for each database if inTrans is ** false. */ static void worker_delete_all_content(WorkerInfo *p, int inTrans){ if( inTrans ){ pthread_mutex_lock(p->pWrMutex); run_sql(p, "BEGIN"); run_sql(p, "DELETE FROM t1 WHERE tid=%d", p->tid); run_sql(p, "DELETE FROM t2 WHERE tid=%d", p->tid); run_sql(p, "DELETE FROM t3 WHERE tid=%d", p->tid); run_sql(p, "COMMIT"); pthread_mutex_unlock(p->pWrMutex); p->nTest++; }else{ pthread_mutex_lock(p->pWrMutex); run_sql(p, "DELETE FROM t1 WHERE tid=%d", p->tid); pthread_mutex_unlock(p->pWrMutex); p->nTest++; pthread_mutex_lock(p->pWrMutex); run_sql(p, "DELETE FROM t2 WHERE tid=%d", p->tid); pthread_mutex_unlock(p->pWrMutex); p->nTest++; pthread_mutex_lock(p->pWrMutex); run_sql(p, "DELETE FROM t3 WHERE tid=%d", p->tid); pthread_mutex_unlock(p->pWrMutex); p->nTest++; } } /* ** Create rows mn through mx in table iTab for the given worker */ static void worker_add_content(WorkerInfo *p, int mn, int mx, int iTab){ char *zTabDef; switch( iTab ){ case 1: zTabDef = "t1(tid,sp,a,b,c)"; break; case 2: zTabDef = "t2(tid,sp,d,e,f)"; break; case 3: zTabDef = "t3(tid,sp,x,y,z)"; break; } pthread_mutex_lock(p->pWrMutex); run_sql(p, "WITH RECURSIVE\n" " c(i) AS (VALUES(%d) UNION ALL SELECT i+1 FROM c WHERE i<%d)\n" "INSERT INTO %s SELECT %d, zeroblob(3000), i, printf('%%d',i), i FROM c;", mn, mx, zTabDef, p->tid ); pthread_mutex_unlock(p->pWrMutex); p->nTest++; } /* ** Set an error message on a worker */ static void worker_error(WorkerInfo *p, const char *zFormat, ...){ va_list ap; p->nErr++; sqlite3_free(p->zMsg); va_start(ap, zFormat); p->zMsg = sqlite3_vmprintf(zFormat, ap); va_end(ap); } /* ** Each thread runs the following function. */ static void *worker_thread(void *pArg){ WorkerInfo *p = (WorkerInfo*)pArg; int iOuter; int i; int rc; sqlite3_stmt *pStmt; printf("worker %d startup\n", p->tid); fflush(stdout); for(iOuter=1; iOuter<=4; iOuter++){ worker_open_connection(p, iOuter); for(i=0; i<4; i++){ worker_add_content(p, i*100+1, (i+1)*100, (p->tid+iOuter)%3 + 1); worker_add_content(p, i*100+1, (i+1)*100, (p->tid+iOuter+1)%3 + 1); worker_add_content(p, i*100+1, (i+1)*100, (p->tid+iOuter+2)%3 + 1); } pStmt = prep_sql(p->db, "SELECT count(a) FROM t1 WHERE tid=%d", p->tid); worker_trace(p, "query [%s]", sqlite3_sql(pStmt)); rc = sqlite3_step(pStmt); if( rc!=SQLITE_ROW ){ worker_error(p, "Failed to step: %s", sqlite3_sql(pStmt)); }else if( sqlite3_column_int(pStmt, 0)!=400 ){ worker_error(p, "Wrong result: %d", sqlite3_column_int(pStmt,0)); } if( p->nErr ) break; sqlite3_finalize(pStmt); worker_delete_all_content(p, (p->tid+iOuter)%2); worker_close_connection(p); p->db = 0; } worker_close_connection(p); printf("worker %d finished\n", p->tid); fflush(stdout); return 0; } int main(int argc, char **argv){ int nWorker = 0; /* Number of worker threads */ int i; /* Loop counter */ WorkerInfo *aInfo; /* Information for each worker */ unsigned wkrFlags = 0; /* Default worker flags */ int nErr = 0; /* Number of errors */ int nTest = 0; /* Number of tests */ int rc; /* Return code */ sqlite3 *db = 0; /* Main database connection */ pthread_mutex_t wrMutex; /* The write serialization mutex */ WorkerInfo infoTop; /* WorkerInfo for the main thread */ WorkerInfo *p; /* Pointer to infoTop */ sqlite3_config(SQLITE_CONFIG_MULTITHREAD); for(i=1; i<argc; i++){ const char *z = argv[i]; if( z[0]=='-' ){ if( z[1]=='-' && z[2]!=0 ) z++; if( strcmp(z,"-multithread")==0 ){ sqlite3_config(SQLITE_CONFIG_MULTITHREAD); wkrFlags &= ~TT4_SERIALIZED; }else if( strcmp(z,"-serialized")==0 ){ sqlite3_config(SQLITE_CONFIG_SERIALIZED); wkrFlags |= TT4_SERIALIZED; }else if( strcmp(z,"-wal")==0 ){ wkrFlags |= TT4_WAL; }else if( strcmp(z,"-trace")==0 ){ wkrFlags |= TT4_TRACE; }else{ fprintf(stderr, "unknown command-line option: %s\n", argv[i]); exit(1); } }else if( z[0]>='1' && z[0]<='9' && nWorker==0 ){ nWorker = atoi(z); if( nWorker<2 ){ fprintf(stderr, "minimum of 2 threads\n"); exit(1); } }else{ fprintf(stderr, "extra command-line argument: \"%s\"\n", argv[i]); exit(1); } } if( nWorker==0 ){ fprintf(stderr, "usage: %s ?OPTIONS? N\n" "N is the number of threads and must be at least 2.\n" "Options:\n" " --serialized\n" " --multithread\n" ,argv[0] ); exit(1); } if( !sqlite3_threadsafe() ){ fprintf(stderr, "requires a threadsafe build of SQLite\n"); exit(1); } sqlite3_initialize(); sqlite3_enable_shared_cache(1); pthread_mutex_init(&wrMutex, 0); /* Initialize the test database files */ (void)unlink("tt4-test1.db"); (void)unlink("tt4-test2.db"); (void)unlink("tt4-test3.db"); rc = sqlite3_open("tt4-test1.db", &db); if( rc!=SQLITE_OK ){ fprintf(stderr, "Unable to open test database: tt4-test2.db\n"); exit(1); } memset(&infoTop, 0, sizeof(infoTop)); infoTop.db = db; infoTop.wkrFlags = wkrFlags; p = &infoTop; if( wkrFlags & TT4_WAL ){ run_sql(p, "PRAGMA journal_mode=WAL"); } run_sql(p, "PRAGMA synchronous=OFF"); run_sql(p, "CREATE TABLE IF NOT EXISTS t1(tid INTEGER, sp, a, b, c)"); run_sql(p, "CREATE INDEX t1tid ON t1(tid)"); run_sql(p, "CREATE INDEX t1ab ON t1(a,b)"); run_sql(p, "ATTACH 'tt4-test2.db' AS 'test2'"); run_sql(p, "CREATE TABLE IF NOT EXISTS test2.t2(tid INTEGER, sp, d, e, f)"); run_sql(p, "CREATE INDEX test2.t2tid ON t2(tid)"); run_sql(p, "CREATE INDEX test2.t2de ON t2(d,e)"); run_sql(p, "ATTACH 'tt4-test3.db' AS 'test3'"); run_sql(p, "CREATE TABLE IF NOT EXISTS test3.t3(tid INTEGER, sp, x, y, z)"); run_sql(p, "CREATE INDEX test3.t3tid ON t3(tid)"); run_sql(p, "CREATE INDEX test3.t3xy ON t3(x,y)"); aInfo = safe_malloc( sizeof(*aInfo)*nWorker ); memset(aInfo, 0, sizeof(*aInfo)*nWorker); for(i=0; i<nWorker; i++){ aInfo[i].tid = i+1; aInfo[i].wkrFlags = wkrFlags; aInfo[i].mainDb = db; aInfo[i].pWrMutex = &wrMutex; rc = pthread_create(&aInfo[i].id, 0, worker_thread, &aInfo[i]); if( rc!=0 ){ fprintf(stderr, "thread creation failed for thread %d\n", i+1); exit(1); } sched_yield(); } for(i=0; i<nWorker; i++){ pthread_join(aInfo[i].id, 0); printf("Joined thread %d: %d errors in %d tests", aInfo[i].tid, aInfo[i].nErr, aInfo[i].nTest); if( aInfo[i].zMsg ){ printf(": %s\n", aInfo[i].zMsg); }else{ printf("\n"); } nErr += aInfo[i].nErr; nTest += aInfo[i].nTest; fflush(stdout); } sqlite3_close(db); sqlite3_free(aInfo); printf("Total %d errors in %d tests\n", nErr, nTest); return nErr; } |