Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Further enhancements to threadtest3 stress tests. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ba772cff602ca7c3c0c91451e701f52a |
User & Date: | dan 2014-12-13 17:41:48.275 |
Context
2014-12-15
| ||
08:46 | Fix errors in threadtest3 tests caused by earlier tests neglecting to close database handles. (check-in: 1d44f1b1a9 user: dan tags: trunk) | |
2014-12-13
| ||
17:41 | Further enhancements to threadtest3 stress tests. (check-in: ba772cff60 user: dan tags: trunk) | |
2014-12-12
| ||
23:17 | Add extra tests to threadtest4.c. Fix a benign data race accessing the text encoding using ENC(db). (check-in: d7bb7ea4ab user: drh tags: trunk) | |
Changes
Changes to test/threadtest3.c.
︙ | ︙ | |||
43 44 45 46 47 48 49 | /* Functions to execute SQL */ #define sql_script(x,y,z) (SEL(x), sql_script_x(x,y,z)) #define integrity_check(x,y) (SEL(x), integrity_check_x(x,y)) #define execsql_i64(x,y,...) (SEL(x), execsql_i64_x(x,y,__VA_ARGS__)) #define execsql_text(x,y,z,...) (SEL(x), execsql_text_x(x,y,z,__VA_ARGS__)) #define execsql(x,y,...) (SEL(x), (void)execsql_i64_x(x,y,__VA_ARGS__)) | > > | > | | > > > | 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 | /* Functions to execute SQL */ #define sql_script(x,y,z) (SEL(x), sql_script_x(x,y,z)) #define integrity_check(x,y) (SEL(x), integrity_check_x(x,y)) #define execsql_i64(x,y,...) (SEL(x), execsql_i64_x(x,y,__VA_ARGS__)) #define execsql_text(x,y,z,...) (SEL(x), execsql_text_x(x,y,z,__VA_ARGS__)) #define execsql(x,y,...) (SEL(x), (void)execsql_i64_x(x,y,__VA_ARGS__)) #define sql_script_printf(x,y,z,...) ( \ SEL(x), sql_script_printf_x(x,y,z,__VA_ARGS__) \ ) /* Thread functions */ #define launch_thread(w,x,y,z) (SEL(w), launch_thread_x(w,x,y,z)) #define join_all_threads(y,z) (SEL(y), join_all_threads_x(y,z)) /* Timer functions */ #define setstoptime(y,z) (SEL(y), setstoptime_x(y,z)) #define timetostop(z) (SEL(z), timetostop_x(z)) /* Report/clear errors. */ #define test_error(z, ...) test_error_x(z, sqlite3_mprintf(__VA_ARGS__)) #define clear_error(y,z) clear_error_x(y, z) /* File-system operations */ #define filesize(y,z) (SEL(y), filesize_x(y,z)) #define filecopy(x,y,z) (SEL(x), filecopy_x(x,y,z)) #define PTR2INT(x) ((int)((intptr_t)x)) #define INT2PTR(x) ((void*)((intptr_t)x)) /* ** End of test code/infrastructure interface macros. *************************************************************************/ |
︙ | ︙ | |||
330 331 332 333 334 335 336 | /* Append length in bits and transform */ ((uint32 *)ctx->in)[ 14 ] = ctx->bits[0]; ((uint32 *)ctx->in)[ 15 ] = ctx->bits[1]; MD5Transform(ctx->buf, (uint32 *)ctx->in); byteReverse((unsigned char *)ctx->buf, 4); memcpy(digest, ctx->buf, 16); | | | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 | /* Append length in bits and transform */ ((uint32 *)ctx->in)[ 14 ] = ctx->bits[0]; ((uint32 *)ctx->in)[ 15 ] = ctx->bits[1]; MD5Transform(ctx->buf, (uint32 *)ctx->in); byteReverse((unsigned char *)ctx->buf, 4); memcpy(digest, ctx->buf, 16); memset(ctx, 0, sizeof(*ctx)); /* In case it is sensitive */ } /* ** Convert a 128-bit MD5 digest into a 32-digit base-16 number. */ static void MD5DigestToBase16(unsigned char *digest, char *zBuf){ static char const zEncode[] = "0123456789abcdef"; |
︙ | ︙ | |||
394 395 396 397 398 399 400 | typedef struct Threadset Threadset; typedef struct Thread Thread; /* Total number of errors in this process so far. */ static int nGlobalErr = 0; | < < < | | | 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 437 | typedef struct Threadset Threadset; typedef struct Thread Thread; /* Total number of errors in this process so far. */ static int nGlobalErr = 0; struct Error { int rc; int iLine; char *zErr; }; struct Sqlite { sqlite3 *db; /* Database handle */ Statement *pCache; /* Linked list of cached statements */ int nText; /* Size of array at aText[] */ char **aText; /* Stored text results */ }; struct Statement { sqlite3_stmt *pStmt; /* Pre-compiled statement handle */ Statement *pNext; /* Next statement in linked-list */ }; struct Thread { int iTid; /* Thread number within test */ void* pArg; /* Pointer argument passed by caller */ pthread_t tid; /* Thread id */ char *(*xProc)(int, void*); /* Thread main proc */ Thread *pNext; /* Next in this list of threads */ }; struct Threadset { int iMaxTid; /* Largest iTid value allocated so far */ Thread *pThread; /* Linked list of threads */ }; |
︙ | ︙ | |||
502 503 504 505 506 507 508 509 | Error *pErr, /* IN/OUT: Error code */ Sqlite *pDb, /* OUT: Database handle */ const char *zFile, /* Database file name */ int bDelete /* True to delete db file before opening */ ){ if( pErr->rc==SQLITE_OK ){ int rc; if( bDelete ) unlink(zFile); | > | | 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 | Error *pErr, /* IN/OUT: Error code */ Sqlite *pDb, /* OUT: Database handle */ const char *zFile, /* Database file name */ int bDelete /* True to delete db file before opening */ ){ if( pErr->rc==SQLITE_OK ){ int rc; int flags = SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE | SQLITE_OPEN_URI; if( bDelete ) unlink(zFile); rc = sqlite3_open_v2(zFile, &pDb->db, flags, 0); if( rc ){ sqlite_error(pErr, pDb, "open"); sqlite3_close(pDb->db); pDb->db = 0; }else{ sqlite3_create_function( pDb->db, "md5sum", -1, SQLITE_UTF8, 0, 0, md5step, md5finalize |
︙ | ︙ | |||
551 552 553 554 555 556 557 558 559 560 561 562 563 564 | Sqlite *pDb, /* Database handle */ const char *zSql /* SQL script to execute */ ){ if( pErr->rc==SQLITE_OK ){ pErr->rc = sqlite3_exec(pDb->db, zSql, 0, 0, &pErr->zErr); } } static Statement *getSqlStatement( Error *pErr, /* IN/OUT: Error code */ Sqlite *pDb, /* Database handle */ const char *zSql /* SQL statement */ ){ Statement *pRet; | > > > > > > > > > > > > > > > > | 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 | Sqlite *pDb, /* Database handle */ const char *zSql /* SQL script to execute */ ){ if( pErr->rc==SQLITE_OK ){ pErr->rc = sqlite3_exec(pDb->db, zSql, 0, 0, &pErr->zErr); } } static void sql_script_printf_x( Error *pErr, /* IN/OUT: Error code */ Sqlite *pDb, /* Database handle */ const char *zFormat, /* SQL printf format string */ ... /* Printf args */ ){ va_list ap; /* ... printf arguments */ va_start(ap, zFormat); if( pErr->rc==SQLITE_OK ){ char *zSql = sqlite3_vmprintf(zFormat, ap); pErr->rc = sqlite3_exec(pDb->db, zSql, 0, 0, &pErr->zErr); sqlite3_free(zSql); } va_end(ap); } static Statement *getSqlStatement( Error *pErr, /* IN/OUT: Error code */ Sqlite *pDb, /* Database handle */ const char *zSql /* SQL statement */ ){ Statement *pRet; |
︙ | ︙ | |||
620 621 622 623 624 625 626 | Sqlite *pDb, /* Database handle */ ... /* SQL and pointers to parameter values */ ){ i64 iRet = 0; if( pErr->rc==SQLITE_OK ){ sqlite3_stmt *pStmt; /* SQL statement to execute */ va_list ap; /* ... arguments */ | < < | 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 | Sqlite *pDb, /* Database handle */ ... /* SQL and pointers to parameter values */ ){ i64 iRet = 0; if( pErr->rc==SQLITE_OK ){ sqlite3_stmt *pStmt; /* SQL statement to execute */ va_list ap; /* ... arguments */ va_start(ap, pDb); pStmt = getAndBindSqlStatement(pErr, pDb, ap); if( pStmt ){ int first = 1; while( SQLITE_ROW==sqlite3_step(pStmt) ){ if( first && sqlite3_column_count(pStmt)>0 ){ iRet = sqlite3_column_int64(pStmt, 0); } first = 0; } |
︙ | ︙ | |||
659 660 661 662 663 664 665 | memset(&pDb->aText[pDb->nText], 0, sizeof(char*)*(iSlot+1-pDb->nText)); pDb->nText = iSlot+1; } if( pErr->rc==SQLITE_OK ){ sqlite3_stmt *pStmt; /* SQL statement to execute */ va_list ap; /* ... arguments */ | < < | 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 | memset(&pDb->aText[pDb->nText], 0, sizeof(char*)*(iSlot+1-pDb->nText)); pDb->nText = iSlot+1; } if( pErr->rc==SQLITE_OK ){ sqlite3_stmt *pStmt; /* SQL statement to execute */ va_list ap; /* ... arguments */ va_start(ap, iSlot); pStmt = getAndBindSqlStatement(pErr, pDb, ap); if( pStmt ){ int first = 1; while( SQLITE_ROW==sqlite3_step(pStmt) ){ if( first && sqlite3_column_count(pStmt)>0 ){ zRet = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 0)); sqlite3_free(pDb->aText[iSlot]); pDb->aText[iSlot] = zRet; } |
︙ | ︙ | |||
689 690 691 692 693 694 695 | static void integrity_check_x( Error *pErr, /* IN/OUT: Error code */ Sqlite *pDb /* Database handle */ ){ if( pErr->rc==SQLITE_OK ){ Statement *pStatement; /* Statement to execute */ | < | | | | | | 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 | static void integrity_check_x( Error *pErr, /* IN/OUT: Error code */ Sqlite *pDb /* Database handle */ ){ if( pErr->rc==SQLITE_OK ){ Statement *pStatement; /* Statement to execute */ char *zErr = 0; /* Integrity check error */ pStatement = getSqlStatement(pErr, pDb, "PRAGMA integrity_check"); if( pStatement ){ sqlite3_stmt *pStmt = pStatement->pStmt; while( SQLITE_ROW==sqlite3_step(pStmt) ){ const char *z = (const char*)sqlite3_column_text(pStmt, 0); if( strcmp(z, "ok") ){ if( zErr==0 ){ zErr = sqlite3_mprintf("%s", z); }else{ zErr = sqlite3_mprintf("%z\n%s", zErr, z); } } } sqlite3_reset(pStmt); if( zErr ){ pErr->zErr = zErr; pErr->rc = 1; } } } } static void *launch_thread_main(void *pArg){ Thread *p = (Thread *)pArg; return (void *)p->xProc(p->iTid, p->pArg); } static void launch_thread_x( Error *pErr, /* IN/OUT: Error code */ Threadset *pThreads, /* Thread set */ char *(*xProc)(int, void*), /* Proc to run */ void *pArg /* Argument passed to thread proc */ ){ if( pErr->rc==SQLITE_OK ){ int iTid = ++pThreads->iMaxTid; Thread *p; int rc; p = (Thread *)sqlite3_malloc(sizeof(Thread)); memset(p, 0, sizeof(Thread)); p->iTid = iTid; p->pArg = pArg; p->xProc = xProc; rc = pthread_create(&p->tid, NULL, launch_thread_main, (void *)p); if( rc!=0 ){ system_error(pErr, rc); sqlite3_free(p); }else{ |
︙ | ︙ | |||
891 892 893 894 895 896 897 | ************************************************************************** ** End infrastructure. Begin tests. */ #define WALTHREAD1_NTHREAD 10 #define WALTHREAD3_NTHREAD 6 | | | 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 | ************************************************************************** ** End infrastructure. Begin tests. */ #define WALTHREAD1_NTHREAD 10 #define WALTHREAD3_NTHREAD 6 static char *walthread1_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int nIter = 0; /* Iterations so far */ opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ const char *azSql[] = { |
︙ | ︙ | |||
930 931 932 933 934 935 936 | } closedb(&err, &db); print_and_free_err(&err); return sqlite3_mprintf("%d iterations", nIter); } | | | 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 | } closedb(&err, &db); print_and_free_err(&err); return sqlite3_mprintf("%d iterations", nIter); } static char *walthread1_ckpt_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int nCkpt = 0; /* Checkpoints so far */ opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ usleep(500*1000); |
︙ | ︙ | |||
973 974 975 976 977 978 979 | } launch_thread(&err, &threads, walthread1_ckpt_thread, 0); join_all_threads(&err, &threads); print_and_free_err(&err); } | | > | 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 | } launch_thread(&err, &threads, walthread1_ckpt_thread, 0); join_all_threads(&err, &threads); print_and_free_err(&err); } static char *walthread2_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int anTrans[2] = {0, 0}; /* Number of WAL and Rollback transactions */ int iArg = PTR2INT(pArg); const char *zJournal = "PRAGMA journal_mode = WAL"; if( iArg ){ zJournal = "PRAGMA journal_mode = DELETE"; } while( !timetostop(&err) ){ int journal_exists = 0; int wal_exists = 0; |
︙ | ︙ | |||
1022 1023 1024 1025 1026 1027 1028 | opendb(&err, &db, "test.db", 1); sql_script(&err, &db, "CREATE TABLE t1(x INTEGER PRIMARY KEY, y UNIQUE)"); closedb(&err, &db); setstoptime(&err, nMs); launch_thread(&err, &threads, walthread2_thread, 0); launch_thread(&err, &threads, walthread2_thread, 0); | | | | > | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 | opendb(&err, &db, "test.db", 1); sql_script(&err, &db, "CREATE TABLE t1(x INTEGER PRIMARY KEY, y UNIQUE)"); closedb(&err, &db); setstoptime(&err, nMs); launch_thread(&err, &threads, walthread2_thread, 0); launch_thread(&err, &threads, walthread2_thread, 0); launch_thread(&err, &threads, walthread2_thread, (void*)1); launch_thread(&err, &threads, walthread2_thread, (void*)1); join_all_threads(&err, &threads); print_and_free_err(&err); } static char *walthread3_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ i64 iNextWrite; /* Next value this thread will write */ int iArg = PTR2INT(pArg); opendb(&err, &db, "test.db", 0); sql_script(&err, &db, "PRAGMA wal_autocheckpoint = 10"); iNextWrite = iArg+1; while( 1 ){ i64 sum1; |
︙ | ︙ | |||
1083 1084 1085 1086 1087 1088 1089 | "CREATE INDEX i2 ON t1(sum2);" "INSERT INTO t1 VALUES(0, 0, 0);" ); closedb(&err, &db); setstoptime(&err, nMs); for(i=0; i<WALTHREAD3_NTHREAD; i++){ | | | | | 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 | "CREATE INDEX i2 ON t1(sum2);" "INSERT INTO t1 VALUES(0, 0, 0);" ); closedb(&err, &db); setstoptime(&err, nMs); for(i=0; i<WALTHREAD3_NTHREAD; i++){ launch_thread(&err, &threads, walthread3_thread, INT2PTR(i)); } join_all_threads(&err, &threads); print_and_free_err(&err); } static char *walthread4_reader_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ integrity_check(&err, &db); } closedb(&err, &db); print_and_free_err(&err); return 0; } static char *walthread4_writer_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ i64 iRow = 1; opendb(&err, &db, "test.db", 0); sql_script(&err, &db, "PRAGMA wal_autocheckpoint = 15;"); while( !timetostop(&err) ){ |
︙ | ︙ | |||
1144 1145 1146 1147 1148 1149 1150 | launch_thread(&err, &threads, walthread4_reader_thread, 0); launch_thread(&err, &threads, walthread4_writer_thread, 0); join_all_threads(&err, &threads); print_and_free_err(&err); } | | | 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 | launch_thread(&err, &threads, walthread4_reader_thread, 0); launch_thread(&err, &threads, walthread4_writer_thread, 0); join_all_threads(&err, &threads); print_and_free_err(&err); } static char *walthread5_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ i64 nRow; opendb(&err, &db, "test.db", 0); nRow = execsql_i64(&err, &db, "SELECT count(*) FROM t1"); closedb(&err, &db); |
︙ | ︙ | |||
1276 1277 1278 1279 1280 1281 1282 | ** Test case "dynamic_triggers" ** ** Two threads executing statements that cause deeply nested triggers ** to fire. And one thread busily creating and deleting triggers. This ** is an attempt to find a bug reported to us. */ | | | 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 | ** Test case "dynamic_triggers" ** ** Two threads executing statements that cause deeply nested triggers ** to fire. And one thread busily creating and deleting triggers. This ** is an attempt to find a bug reported to us. */ static char *dynamic_triggers_1(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int nDrop = 0; int nCreate = 0; opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ |
︙ | ︙ | |||
1327 1328 1329 1330 1331 1332 1333 | } } print_and_free_err(&err); return sqlite3_mprintf("%d created, %d dropped", nCreate, nDrop); } | | | 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 | } } print_and_free_err(&err); return sqlite3_mprintf("%d created, %d dropped", nCreate, nDrop); } static char *dynamic_triggers_2(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ i64 iVal = 0; int nInsert = 0; int nDelete = 0; opendb(&err, &db, "test.db", 0); |
︙ | ︙ | |||
1378 1379 1380 1381 1382 1383 1384 | ); setstoptime(&err, nMs); sqlite3_enable_shared_cache(1); launch_thread(&err, &threads, dynamic_triggers_2, 0); launch_thread(&err, &threads, dynamic_triggers_2, 0); | < > | 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 | ); setstoptime(&err, nMs); sqlite3_enable_shared_cache(1); launch_thread(&err, &threads, dynamic_triggers_2, 0); launch_thread(&err, &threads, dynamic_triggers_2, 0); sleep(2); sqlite3_enable_shared_cache(0); launch_thread(&err, &threads, dynamic_triggers_2, 0); launch_thread(&err, &threads, dynamic_triggers_1, 0); join_all_threads(&err, &threads); print_and_free_err(&err); |
︙ | ︙ | |||
1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 | { checkpoint_starvation_1, "checkpoint_starvation_1", 10000 }, { checkpoint_starvation_2, "checkpoint_starvation_2", 10000 }, { create_drop_index_1, "create_drop_index_1", 10000 }, { lookaside1, "lookaside1", 10000 }, { vacuum1, "vacuum1", 10000 }, { stress1, "stress1", 10000 }, }; int i; char *zTest = 0; int nTest = 0; int bTestfound = 0; int bPrefix = 0; if( argc>2 ) goto usage; if( argc==2 ){ zTest = argv[1]; nTest = strlen(zTest); if( zTest[nTest-1]=='*' ){ nTest--; bPrefix = 1; } } sqlite3_config(SQLITE_CONFIG_MULTITHREAD); for(i=0; i<sizeof(aTest)/sizeof(aTest[0]); i++){ char const *z = aTest[i].zTest; int n = strlen(z); if( !zTest || ((bPrefix || n==nTest) && 0==strncmp(zTest, z, nTest)) ){ printf("Running %s for %d seconds...\n", z, aTest[i].nMs/1000); | > > | 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 | { checkpoint_starvation_1, "checkpoint_starvation_1", 10000 }, { checkpoint_starvation_2, "checkpoint_starvation_2", 10000 }, { create_drop_index_1, "create_drop_index_1", 10000 }, { lookaside1, "lookaside1", 10000 }, { vacuum1, "vacuum1", 10000 }, { stress1, "stress1", 10000 }, { stress2, "stress2", 10000 }, }; int i; char *zTest = 0; int nTest = 0; int bTestfound = 0; int bPrefix = 0; if( argc>2 ) goto usage; if( argc==2 ){ zTest = argv[1]; nTest = strlen(zTest); if( zTest[nTest-1]=='*' ){ nTest--; bPrefix = 1; } } sqlite3_config(SQLITE_CONFIG_MULTITHREAD); sqlite3_config(SQLITE_CONFIG_MULTITHREAD); for(i=0; i<sizeof(aTest)/sizeof(aTest[0]); i++){ char const *z = aTest[i].zTest; int n = strlen(z); if( !zTest || ((bPrefix || n==nTest) && 0==strncmp(zTest, z, nTest)) ){ printf("Running %s for %d seconds...\n", z, aTest[i].nMs/1000); |
︙ | ︙ |
Changes to test/tt3_checkpoint.c.
︙ | ︙ | |||
62 63 64 65 66 67 68 | } if( nFrame>=CHECKPOINT_STARVATION_FRAMELIMIT ){ sqlite3_wal_checkpoint_v2(db, zDb, p->eMode, 0, 0); } return SQLITE_OK; } | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | } if( nFrame>=CHECKPOINT_STARVATION_FRAMELIMIT ){ sqlite3_wal_checkpoint_v2(db, zDb, p->eMode, 0, 0); } return SQLITE_OK; } static char *checkpoint_starvation_reader(int iTid, void *pArg){ Error err = {0}; Sqlite db = {0}; opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ i64 iCount1, iCount2; sql_script(&err, &db, "BEGIN"); |
︙ | ︙ |
Changes to test/tt3_index.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** ** create_drop_index_1 */ | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** ** create_drop_index_1 */ static char *create_drop_index_thread(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ while( !timetostop(&err) ){ opendb(&err, &db, "test.db", 0); sql_script(&err, &db, |
︙ | ︙ |
Changes to test/tt3_lookaside1.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | */ /* ** The test in this file attempts to expose a specific race condition ** that is suspected to exist at time of writing. */ | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ /* ** The test in this file attempts to expose a specific race condition ** that is suspected to exist at time of writing. */ static char *lookaside1_thread_reader(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ sqlite3_stmt *pStmt = 0; |
︙ | ︙ | |||
39 40 41 42 43 44 45 | } closedb(&err, &db); print_and_free_err(&err); return sqlite3_mprintf("ok"); } | | | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | } closedb(&err, &db); print_and_free_err(&err); return sqlite3_mprintf("ok"); } static char *lookaside1_thread_writer(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ opendb(&err, &db, "test.db", 0); do{ sql_script(&err, &db, |
︙ | ︙ |
Changes to test/tt3_stress.c.
︙ | ︙ | |||
13 14 15 16 17 18 19 | ** */ /* ** Thread 1. CREATE and DROP a table. */ | | | | | 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 | ** */ /* ** Thread 1. CREATE and DROP a table. */ static char *stress_thread_1(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ sql_script(&err, &db, "CREATE TABLE IF NOT EXISTS t1(a PRIMARY KEY, b)"); clear_error(&err, SQLITE_LOCKED); sql_script(&err, &db, "DROP TABLE IF EXISTS t1"); clear_error(&err, SQLITE_LOCKED); } closedb(&err, &db); print_and_free_err(&err); return sqlite3_mprintf("ok"); } /* ** Thread 2. Open and close database connections. */ static char *stress_thread_2(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ while( !timetostop(&err) ){ opendb(&err, &db, "test.db", 0); sql_script(&err, &db, "SELECT * FROM sqlite_master;"); clear_error(&err, SQLITE_LOCKED); closedb(&err, &db); } print_and_free_err(&err); return sqlite3_mprintf("ok"); } /* ** Thread 3. Attempt many small SELECT statements. */ static char *stress_thread_3(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int i1 = 0; int i2 = 0; opendb(&err, &db, "test.db", 0); |
︙ | ︙ | |||
71 72 73 74 75 76 77 | print_and_free_err(&err); return sqlite3_mprintf("read t1 %d/%d attempts", i2, i1); } /* ** Thread 5. Attempt INSERT statements. */ | | > > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | print_and_free_err(&err); return sqlite3_mprintf("read t1 %d/%d attempts", i2, i1); } /* ** Thread 5. Attempt INSERT statements. */ static char *stress_thread_4(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int i1 = 0; int i2 = 0; int iArg = PTR2INT(pArg); opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ if( iArg ){ closedb(&err, &db); opendb(&err, &db, "test.db", 0); } sql_script(&err, &db, |
︙ | ︙ | |||
99 100 101 102 103 104 105 | print_and_free_err(&err); return sqlite3_mprintf("wrote t1 %d/%d attempts", i2, i1); } /* ** Thread 6. Attempt DELETE operations. */ | | > | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | print_and_free_err(&err); return sqlite3_mprintf("wrote t1 %d/%d attempts", i2, i1); } /* ** Thread 6. Attempt DELETE operations. */ static char *stress_thread_5(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int iArg = PTR2INT(pArg); int i1 = 0; int i2 = 0; opendb(&err, &db, "test.db", 0); while( !timetostop(&err) ){ i64 i = (i1 % 4); |
︙ | ︙ | |||
127 128 129 130 131 132 133 | print_and_free_err(&err); return sqlite3_mprintf("deleted from t1 %d/%d attempts", i2, i1); } static void stress1(int nMs){ Error err = {0}; | < < < | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | print_and_free_err(&err); return sqlite3_mprintf("deleted from t1 %d/%d attempts", i2, i1); } static void stress1(int nMs){ Error err = {0}; Threadset threads = {0}; setstoptime(&err, nMs); sqlite3_enable_shared_cache(1); launch_thread(&err, &threads, stress_thread_1, 0); launch_thread(&err, &threads, stress_thread_1, 0); launch_thread(&err, &threads, stress_thread_2, 0); launch_thread(&err, &threads, stress_thread_2, 0); launch_thread(&err, &threads, stress_thread_3, 0); launch_thread(&err, &threads, stress_thread_3, 0); launch_thread(&err, &threads, stress_thread_4, 0); launch_thread(&err, &threads, stress_thread_4, 0); launch_thread(&err, &threads, stress_thread_5, 0); launch_thread(&err, &threads, stress_thread_5, (void*)1); join_all_threads(&err, &threads); sqlite3_enable_shared_cache(0); print_and_free_err(&err); } /************************************************************************** *************************************************************************** ** Start of test case "stress2" */ /* ** 1. CREATE TABLE statements. ** 2. DROP TABLE statements. ** 3. Small SELECT statements. ** 4. Big SELECT statements. ** 5. Small INSERT statements. ** 6. Big INSERT statements. ** 7. Small UPDATE statements. ** 8. Big UPDATE statements. ** 9. Small DELETE statements. ** 10. Big DELETE statements. ** 11. VACUUM. ** 14. Integrity-check. ** 17. Switch the journal mode from delete to wal and back again. ** 19. Open and close database connections rapidly. */ #define STRESS2_TABCNT 5 static void stress2_workload1(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "CREATE TABLE IF NOT EXISTS t%d(x PRIMARY KEY, y, z);", iTab ); } static void stress2_workload2(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "DROP TABLE IF EXISTS t%d;", iTab); } static void stress2_workload3(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "SELECT * FROM t%d WHERE z = 'small'", iTab); } static void stress2_workload4(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "SELECT * FROM t%d WHERE z = 'big'", iTab); } static void stress2_workload5(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "INSERT INTO t%d VALUES(random(), hex(randomblob(57)), 'small');", iTab ); } static void stress2_workload6(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "INSERT INTO t%d VALUES(random(), hex(randomblob(2000)), 'big');", iTab ); } static void stress2_workload7(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "UPDATE t%d SET y = hex(randomblob(57)) " "WHERE (x %% 5)==(%d %% 5) AND z='small';" ,iTab, i ); } static void stress2_workload8(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "UPDATE t%d SET y = hex(randomblob(2000)) " "WHERE (x %% 5)==(%d %% 5) AND z='big';" ,iTab, i ); } static void stress2_workload9(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "DELETE FROM t%d WHERE (x %% 5)==(%d %% 5) AND z='small';" ,iTab, i ); } static void stress2_workload10(Error *pErr, Sqlite *pDb, int i){ int iTab = (i % STRESS2_TABCNT); sql_script_printf(pErr, pDb, "DELETE FROM t%d WHERE (x %% 5)==(%d %% 5) AND z='big';" ,iTab, i ); } static void stress2_workload11(Error *pErr, Sqlite *pDb, int i){ sql_script(pErr, pDb, "VACUUM"); } static void stress2_workload14(Error *pErr, Sqlite *pDb, int i){ sql_script(pErr, pDb, "PRAGMA integrity_check"); } static void stress2_workload17(Error *pErr, Sqlite *pDb, int i){ sql_script_printf(pErr, pDb, "PRAGMA journal_mode = %q", (i%2) ? "delete" : "wal" ); } static char *stress2_workload19(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ const char *zDb = (const char*)pArg; while( !timetostop(&err) ){ opendb(&err, &db, zDb, 0); sql_script(&err, &db, "SELECT * FROM sqlite_master;"); clear_error(&err, SQLITE_LOCKED); closedb(&err, &db); } print_and_free_err(&err); return sqlite3_mprintf("ok"); } typedef struct Stress2Ctx Stress2Ctx; struct Stress2Ctx { const char *zDb; void (*xProc)(Error*, Sqlite*, int); }; static char *stress2_thread_wrapper(int iTid, void *pArg){ Stress2Ctx *pCtx = (Stress2Ctx*)pArg; Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ int i1 = 0; int i2 = 0; opendb(&err, &db, pCtx->zDb, 0); while( !timetostop(&err) ){ pCtx->xProc(&err, &db, i1); i2 += (err.rc==SQLITE_OK); clear_error(&err, SQLITE_LOCKED); clear_error(&err, SQLITE_ERROR); i1++; } print_and_free_err(&err); return sqlite3_mprintf("ok %d/%d", i2, i1); } static void stress2_launch_thread_loop( Error *pErr, /* IN/OUT: Error code */ Threadset *pThreads, /* Thread set */ const char *zDb, /* Database name */ void (*x)(Error*,Sqlite*,int) /* Run this until error or timeout */ ){ Stress2Ctx *pCtx = sqlite3_malloc(sizeof(Stress2Ctx)); pCtx->zDb = zDb; pCtx->xProc = x; launch_thread(pErr, pThreads, stress2_thread_wrapper, (void*)pCtx); } static void stress2(int nMs){ struct Stress2Task { void (*x)(Error*,Sqlite*,int); } aTask[] = { { stress2_workload1 }, { stress2_workload2 }, { stress2_workload3 }, { stress2_workload4 }, { stress2_workload5 }, { stress2_workload6 }, { stress2_workload7 }, { stress2_workload8 }, { stress2_workload9 }, { stress2_workload10 }, { stress2_workload11 }, { stress2_workload14 }, { stress2_workload17 }, }; const char *azDb[] = { "test.db", "file::memory:?cache=shared" }; int j; for(j=0; j<sizeof(azDb)/sizeof(azDb[0]); j++){ int i; Error err = {0}; Sqlite db = {0}; Threadset threads = {0}; const char *zDb = azDb[j]; /* To make sure the db file is empty before commencing */ opendb(&err, &db, zDb, 1); closedb(&err, &db); setstoptime(&err, nMs); sqlite3_enable_shared_cache(1); for(i=0; i<sizeof(aTask)/sizeof(aTask[0]); i++){ stress2_launch_thread_loop(&err, &threads, zDb, aTask[i].x); } launch_thread(&err, &threads, stress2_workload19, (void*)zDb); launch_thread(&err, &threads, stress2_workload19, (void*)zDb); join_all_threads(&err, &threads); sqlite3_enable_shared_cache(0); print_and_free_err(&err); if( j==0 ){ printf("Running stress2 (again, with in-memory db) for %d seconds...\n", nMs / 1000 ); } } } |
Changes to test/tt3_vacuum.c.
︙ | ︙ | |||
16 17 18 19 20 21 22 | ** Tests: ** ** vacuum1 ** */ | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | ** Tests: ** ** vacuum1 ** */ static char *vacuum1_thread_writer(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ opendb(&err, &db, "test.db", 0); i64 i = 0; while( !timetostop(&err) ){ i++; |
︙ | ︙ | |||
45 46 47 48 49 50 51 | } closedb(&err, &db); print_and_free_err(&err); return sqlite3_mprintf("ok"); } | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | } closedb(&err, &db); print_and_free_err(&err); return sqlite3_mprintf("ok"); } static char *vacuum1_thread_vacuumer(int iTid, void *pArg){ Error err = {0}; /* Error code and message */ Sqlite db = {0}; /* SQLite database connection */ opendb(&err, &db, "test.db", 0); do{ sql_script(&err, &db, "VACUUM"); clear_error(&err, SQLITE_LOCKED); |
︙ | ︙ |