Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch 2-size-lookaside Excluding Merge-Ins
This is equivalent to a diff from 907f7965 to 9496b4d3
2019-10-18
| ||
22:54 | Use an allocation count and freelist instead of a membership bitfield in the mini lookaside allocator (Leaf check-in: 9496b4d3 user: numist tags: 2-size-lookaside) | |
2019-10-09
| ||
18:36 | Do not allow users to effectively disable fts5 crisismerge operations by setting the crisismerge threshold to higher than the maximum allowable segment b-trees on a single level. Fix for [d392017c]. (check-in: 86e49720 user: dan tags: trunk) | |
17:38 | Merge recent fixes and enhancements from trunk. (check-in: 553258c2 user: drh tags: 2-size-lookaside) | |
15:37 | An improved fix for the dbsqlfuzz-discovered ALWAYS() failure following OOM in sqlite3ExprCollSeq(). This time with a test case (engineered by Dan). (check-in: 907f7965 user: drh tags: trunk) | |
15:26 | Disallow fts5 page sizes greater than 65536 bytes - as there are 16-bit offsets used in the page header. Fix for [81a7f7b9]. (check-in: 75775c5a user: dan tags: trunk) | |
15:00 | Change sqlite3SelectDup() to always return NULL if an OOM has occurred. (check-in: 01ba4641 user: drh tags: trunk) | |
Changes to Makefile.in.
︙ | ︙ | |||
230 231 232 233 234 235 236 237 238 239 240 241 242 243 | $(TOP)/src/global.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ $(TOP)/src/insert.c \ $(TOP)/src/legacy.c \ $(TOP)/src/loadext.c \ $(TOP)/src/main.c \ $(TOP)/src/malloc.c \ $(TOP)/src/mem0.c \ $(TOP)/src/mem1.c \ $(TOP)/src/mem2.c \ $(TOP)/src/mem3.c \ $(TOP)/src/mem5.c \ | > > | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | $(TOP)/src/global.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ $(TOP)/src/insert.c \ $(TOP)/src/legacy.c \ $(TOP)/src/loadext.c \ $(TOP)/src/lookaside.c \ $(TOP)/src/lookaside.h \ $(TOP)/src/main.c \ $(TOP)/src/malloc.c \ $(TOP)/src/mem0.c \ $(TOP)/src/mem1.c \ $(TOP)/src/mem2.c \ $(TOP)/src/mem3.c \ $(TOP)/src/mem5.c \ |
︙ | ︙ | |||
521 522 523 524 525 526 527 528 529 530 531 532 533 534 | # HDR = \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ keywordhash.h \ $(TOP)/src/msvc.h \ $(TOP)/src/mutex.h \ opcodes.h \ $(TOP)/src/os.h \ $(TOP)/src/os_common.h \ $(TOP)/src/os_setup.h \ $(TOP)/src/os_win.h \ | > | 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 | # HDR = \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ keywordhash.h \ $(TOP)/src/lookaside.h \ $(TOP)/src/msvc.h \ $(TOP)/src/mutex.h \ opcodes.h \ $(TOP)/src/os.h \ $(TOP)/src/os_common.h \ $(TOP)/src/os_setup.h \ $(TOP)/src/os_win.h \ |
︙ | ︙ | |||
865 866 867 868 869 870 871 872 873 874 875 876 877 878 | legacy.lo: $(TOP)/src/legacy.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/legacy.c loadext.lo: $(TOP)/src/loadext.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/loadext.c main.lo: $(TOP)/src/main.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/main.c malloc.lo: $(TOP)/src/malloc.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/malloc.c mem0.lo: $(TOP)/src/mem0.c $(HDR) | > > > | 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 | legacy.lo: $(TOP)/src/legacy.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/legacy.c loadext.lo: $(TOP)/src/loadext.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/loadext.c lookaside.lo: $(TOP)/src/lookaside.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/lookaside.c main.lo: $(TOP)/src/main.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/main.c malloc.lo: $(TOP)/src/malloc.c $(HDR) $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/malloc.c mem0.lo: $(TOP)/src/mem0.c $(HDR) |
︙ | ︙ |
Changes to Makefile.msc.
︙ | ︙ | |||
1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 | $(TOP)\src\fkey.c \ $(TOP)\src\func.c \ $(TOP)\src\global.c \ $(TOP)\src\hash.c \ $(TOP)\src\insert.c \ $(TOP)\src\legacy.c \ $(TOP)\src\loadext.c \ $(TOP)\src\main.c \ $(TOP)\src\malloc.c \ $(TOP)\src\mem0.c \ $(TOP)\src\mem1.c \ $(TOP)\src\mem2.c \ $(TOP)\src\mem3.c \ $(TOP)\src\mem5.c \ | > | 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 | $(TOP)\src\fkey.c \ $(TOP)\src\func.c \ $(TOP)\src\global.c \ $(TOP)\src\hash.c \ $(TOP)\src\insert.c \ $(TOP)\src\legacy.c \ $(TOP)\src\loadext.c \ $(TOP)\src\lookaside.c \ $(TOP)\src\main.c \ $(TOP)\src\malloc.c \ $(TOP)\src\mem0.c \ $(TOP)\src\mem1.c \ $(TOP)\src\mem2.c \ $(TOP)\src\mem3.c \ $(TOP)\src\mem5.c \ |
︙ | ︙ | |||
1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 | # Core header files, part 1. # SRC04 = \ $(TOP)\src\btree.h \ $(TOP)\src\btreeInt.h \ $(TOP)\src\hash.h \ $(TOP)\src\hwtime.h \ $(TOP)\src\msvc.h \ $(TOP)\src\mutex.h \ $(TOP)\src\os.h \ $(TOP)\src\os_common.h \ $(TOP)\src\os_setup.h \ $(TOP)\src\os_win.h | > | 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 | # Core header files, part 1. # SRC04 = \ $(TOP)\src\btree.h \ $(TOP)\src\btreeInt.h \ $(TOP)\src\hash.h \ $(TOP)\src\hwtime.h \ $(TOP)\src\lookaside.h \ $(TOP)\src\msvc.h \ $(TOP)\src\mutex.h \ $(TOP)\src\os.h \ $(TOP)\src\os_common.h \ $(TOP)\src\os_setup.h \ $(TOP)\src\os_win.h |
︙ | ︙ | |||
1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 | # Header files used by all library source files. # HDR = \ $(TOP)\src\btree.h \ $(TOP)\src\btreeInt.h \ $(TOP)\src\hash.h \ $(TOP)\src\hwtime.h \ keywordhash.h \ $(TOP)\src\msvc.h \ $(TOP)\src\mutex.h \ opcodes.h \ $(TOP)\src\os.h \ $(TOP)\src\os_common.h \ $(TOP)\src\os_setup.h \ | > | 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 | # Header files used by all library source files. # HDR = \ $(TOP)\src\btree.h \ $(TOP)\src\btreeInt.h \ $(TOP)\src\hash.h \ $(TOP)\src\hwtime.h \ $(TOP)\src\lookaside.h \ keywordhash.h \ $(TOP)\src\msvc.h \ $(TOP)\src\mutex.h \ opcodes.h \ $(TOP)\src\os.h \ $(TOP)\src\os_common.h \ $(TOP)\src\os_setup.h \ |
︙ | ︙ | |||
1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 | legacy.lo: $(TOP)\src\legacy.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\legacy.c loadext.lo: $(TOP)\src\loadext.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\loadext.c main.lo: $(TOP)\src\main.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\main.c malloc.lo: $(TOP)\src\malloc.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\malloc.c mem0.lo: $(TOP)\src\mem0.c $(HDR) | > > > | 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 | legacy.lo: $(TOP)\src\legacy.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\legacy.c loadext.lo: $(TOP)\src\loadext.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\loadext.c lookaside.lo: $(TOP)\src\lookaside.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\lookaside.c main.lo: $(TOP)\src\main.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\main.c malloc.lo: $(TOP)\src\malloc.c $(HDR) $(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\malloc.c mem0.lo: $(TOP)\src\mem0.c $(HDR) |
︙ | ︙ |
Changes to main.mk.
︙ | ︙ | |||
107 108 109 110 111 112 113 114 115 116 117 118 119 120 | $(TOP)/src/global.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ $(TOP)/src/insert.c \ $(TOP)/src/legacy.c \ $(TOP)/src/loadext.c \ $(TOP)/src/main.c \ $(TOP)/src/malloc.c \ $(TOP)/src/mem0.c \ $(TOP)/src/mem1.c \ $(TOP)/src/mem2.c \ $(TOP)/src/mem3.c \ $(TOP)/src/mem5.c \ | > > | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | $(TOP)/src/global.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ $(TOP)/src/insert.c \ $(TOP)/src/legacy.c \ $(TOP)/src/loadext.c \ $(TOP)/src/lookaside.c \ $(TOP)/src/lookaside.h \ $(TOP)/src/main.c \ $(TOP)/src/malloc.c \ $(TOP)/src/mem0.c \ $(TOP)/src/mem1.c \ $(TOP)/src/mem2.c \ $(TOP)/src/mem3.c \ $(TOP)/src/mem5.c \ |
︙ | ︙ | |||
439 440 441 442 443 444 445 446 447 448 449 450 451 452 | # HDR = \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ keywordhash.h \ $(TOP)/src/msvc.h \ $(TOP)/src/mutex.h \ opcodes.h \ $(TOP)/src/os.h \ $(TOP)/src/os_common.h \ $(TOP)/src/os_setup.h \ $(TOP)/src/os_win.h \ | > | 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 | # HDR = \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/hash.h \ $(TOP)/src/hwtime.h \ keywordhash.h \ $(TOP)/src/lookaside.h \ $(TOP)/src/msvc.h \ $(TOP)/src/mutex.h \ opcodes.h \ $(TOP)/src/os.h \ $(TOP)/src/os_common.h \ $(TOP)/src/os_setup.h \ $(TOP)/src/os_win.h \ |
︙ | ︙ |
Changes to src/analyze.c.
︙ | ︙ | |||
137 138 139 140 141 142 143 144 145 146 147 148 149 150 | ** of a blob encoding of the complete index key as is found in ** sqlite_stat4.sample. The nEq, nLt, and nDLt entries of sqlite_stat3 ** all contain just a single integer which is the same as the first ** integer in the equivalent columns in sqlite_stat4. */ #ifndef SQLITE_OMIT_ANALYZE #include "sqliteInt.h" #if defined(SQLITE_ENABLE_STAT4) # define IsStat4 1 #else # define IsStat4 0 # undef SQLITE_STAT4_SAMPLES # define SQLITE_STAT4_SAMPLES 1 | > | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | ** of a blob encoding of the complete index key as is found in ** sqlite_stat4.sample. The nEq, nLt, and nDLt entries of sqlite_stat3 ** all contain just a single integer which is the same as the first ** integer in the equivalent columns in sqlite_stat4. */ #ifndef SQLITE_OMIT_ANALYZE #include "sqliteInt.h" #include "lookaside.h" #if defined(SQLITE_ENABLE_STAT4) # define IsStat4 1 #else # define IsStat4 0 # undef SQLITE_STAT4_SAMPLES # define SQLITE_STAT4_SAMPLES 1 |
︙ | ︙ | |||
1658 1659 1660 1661 1662 1663 1664 | ){ int rc; /* Result codes from subroutines */ sqlite3_stmt *pStmt = 0; /* An SQL statement being run */ char *zSql; /* Text of the SQL statement */ Index *pPrevIdx = 0; /* Previous index in the loop */ IndexSample *pSample; /* A slot in pIdx->aSample[] */ | | | 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 | ){ int rc; /* Result codes from subroutines */ sqlite3_stmt *pStmt = 0; /* An SQL statement being run */ char *zSql; /* Text of the SQL statement */ Index *pPrevIdx = 0; /* Previous index in the loop */ IndexSample *pSample; /* A slot in pIdx->aSample[] */ assert( sqlite3LookasideDisabled(&db->lookaside) ); zSql = sqlite3MPrintf(db, zSql1, zDb); if( !zSql ){ return SQLITE_NOMEM_BKPT; } rc = sqlite3_prepare(db, zSql, -1, &pStmt, 0); sqlite3DbFree(db, zSql); if( rc ) return rc; |
︙ | ︙ | |||
1769 1770 1771 1772 1773 1774 1775 | /* ** Load content from the sqlite_stat4 table into ** the Index.aSample[] arrays of all indices. */ static int loadStat4(sqlite3 *db, const char *zDb){ int rc = SQLITE_OK; /* Result codes from subroutines */ | | | 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 | /* ** Load content from the sqlite_stat4 table into ** the Index.aSample[] arrays of all indices. */ static int loadStat4(sqlite3 *db, const char *zDb){ int rc = SQLITE_OK; /* Result codes from subroutines */ assert( sqlite3LookasideDisabled(&db->lookaside) ); if( sqlite3FindTable(db, "sqlite_stat4", zDb) ){ rc = loadStatTbl(db, "SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx", "SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4", zDb ); } |
︙ | ︙ | |||
1850 1851 1852 1853 1854 1855 1856 | Index *pIdx = sqliteHashData(i); if( !pIdx->hasStat1 ) sqlite3DefaultRowEst(pIdx); } /* Load the statistics from the sqlite_stat4 table. */ #ifdef SQLITE_ENABLE_STAT4 if( rc==SQLITE_OK ){ | | | | 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 | Index *pIdx = sqliteHashData(i); if( !pIdx->hasStat1 ) sqlite3DefaultRowEst(pIdx); } /* Load the statistics from the sqlite_stat4 table. */ #ifdef SQLITE_ENABLE_STAT4 if( rc==SQLITE_OK ){ sqlite3LookasideDisable(&db->lookaside); rc = loadStat4(db, sInfo.zDatabase); sqlite3LookasideEnable(&db->lookaside); } for(i=sqliteHashFirst(&pSchema->idxHash); i; i=sqliteHashNext(i)){ Index *pIdx = sqliteHashData(i); sqlite3_free(pIdx->aiRowEst); pIdx->aiRowEst = 0; } #endif |
︙ | ︙ |
Changes to src/build.c.
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | ** DROP INDEX ** creating ID lists ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK */ #include "sqliteInt.h" #ifndef SQLITE_OMIT_SHARED_CACHE /* ** The TableLock structure is only used by the sqlite3TableLock() and ** codeTableLocks() functions. */ struct TableLock { | > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ** DROP INDEX ** creating ID lists ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK */ #include "sqliteInt.h" #include "lookaside.h" #ifndef SQLITE_OMIT_SHARED_CACHE /* ** The TableLock structure is only used by the sqlite3TableLock() and ** codeTableLocks() functions. */ struct TableLock { |
︙ | ︙ | |||
622 623 624 625 626 627 628 | ** lookaside, this number should not change. ** ** If malloc has already failed, it may be that it failed while allocating ** a Table object that was going to be marked ephemeral. So do not check ** that no lookaside memory is used in this case either. */ int nLookaside = 0; if( db && !db->mallocFailed && (pTable->tabFlags & TF_Ephemeral)==0 ){ | | | 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 | ** lookaside, this number should not change. ** ** If malloc has already failed, it may be that it failed while allocating ** a Table object that was going to be marked ephemeral. So do not check ** that no lookaside memory is used in this case either. */ int nLookaside = 0; if( db && !db->mallocFailed && (pTable->tabFlags & TF_Ephemeral)==0 ){ nLookaside = sqlite3LookasideUsed(&db->lookaside, 0); } #endif /* Delete all indices associated with this table. */ for(pIndex = pTable->pIndex; pIndex; pIndex=pNext){ pNext = pIndex->pNext; assert( pIndex->pSchema==pTable->pSchema |
︙ | ︙ | |||
658 659 660 661 662 663 664 | sqlite3ExprListDelete(db, pTable->pCheck); #ifndef SQLITE_OMIT_VIRTUALTABLE sqlite3VtabClear(db, pTable); #endif sqlite3DbFree(db, pTable); /* Verify that no lookaside memory was used by schema tables */ | | | 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 | sqlite3ExprListDelete(db, pTable->pCheck); #ifndef SQLITE_OMIT_VIRTUALTABLE sqlite3VtabClear(db, pTable); #endif sqlite3DbFree(db, pTable); /* Verify that no lookaside memory was used by schema tables */ assert( nLookaside==0 || nLookaside==sqlite3LookasideUsed(&db->lookaside,0) ); } void sqlite3DeleteTable(sqlite3 *db, Table *pTable){ /* Do not delete the table until the reference count reaches zero. */ if( !pTable ) return; if( ((!db || db->pnBytesFreed==0) && (--pTable->nTabRef)>0) ) return; deleteTable(db, pTable); } |
︙ | ︙ |
Changes to src/fkey.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code used by the compiler to add foreign key ** support to compiled SQL statements. */ #include "sqliteInt.h" #ifndef SQLITE_OMIT_FOREIGN_KEY #ifndef SQLITE_OMIT_TRIGGER /* ** Deferred and Immediate FKs ** -------------------------- | > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains code used by the compiler to add foreign key ** support to compiled SQL statements. */ #include "sqliteInt.h" #include "lookaside.h" #ifndef SQLITE_OMIT_FOREIGN_KEY #ifndef SQLITE_OMIT_TRIGGER /* ** Deferred and Immediate FKs ** -------------------------- |
︙ | ︙ | |||
1295 1296 1297 1298 1299 1300 1301 | pWhere, 0, 0, 0, 0, 0 ); pWhere = 0; } /* Disable lookaside memory allocation */ | | | 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 | pWhere, 0, 0, 0, 0, 0 ); pWhere = 0; } /* Disable lookaside memory allocation */ sqlite3LookasideDisable(&db->lookaside); pTrigger = (Trigger *)sqlite3DbMallocZero(db, sizeof(Trigger) + /* struct Trigger */ sizeof(TriggerStep) + /* Single step in trigger program */ nFrom + 1 /* Space for pStep->zTarget */ ); if( pTrigger ){ |
︙ | ︙ | |||
1317 1318 1319 1320 1321 1322 1323 | if( pWhen ){ pWhen = sqlite3PExpr(pParse, TK_NOT, pWhen, 0); pTrigger->pWhen = sqlite3ExprDup(db, pWhen, EXPRDUP_REDUCE); } } /* Re-enable the lookaside buffer, if it was disabled earlier. */ | | | 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 | if( pWhen ){ pWhen = sqlite3PExpr(pParse, TK_NOT, pWhen, 0); pTrigger->pWhen = sqlite3ExprDup(db, pWhen, EXPRDUP_REDUCE); } } /* Re-enable the lookaside buffer, if it was disabled earlier. */ sqlite3LookasideEnable(&db->lookaside); sqlite3ExprDelete(db, pWhere); sqlite3ExprDelete(db, pWhen); sqlite3ExprListDelete(db, pList); sqlite3SelectDelete(db, pSelect); if( db->mallocFailed==1 ){ fkTriggerDelete(db, pTrigger); |
︙ | ︙ |
Added src/lookaside.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 | /* ** 2019-10-02 ** ** 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. ** ************************************************************************* ** ** Lookaside memory allocation functions used throughout sqlite. */ #include "sqliteInt.h" #include "lookaside.h" /* ** Return the number of LookasideSlot elements on the linked list */ static u32 countLookasideSlots(LookasideSlot *p){ u32 cnt = 0; while( p ){ p = p->pNext; cnt++; } return cnt; } /* ** Count the number of slots of lookaside memory that are outstanding */ int sqlite3LookasideUsed(Lookaside *pLookaside, int *pHighwater){ u32 nInit = countLookasideSlots(pLookaside->pInit); u32 nFree = countLookasideSlots(pLookaside->pFree); if( pHighwater ) *pHighwater = pLookaside->nSlot - nInit; return pLookaside->nSlot - (nInit+nFree); } void sqlite3LookasideResetUsed(Lookaside *pLookaside){ LookasideSlot *p = pLookaside->pFree; if( p ){ while( p->pNext ) p = p->pNext; p->pNext = pLookaside->pInit; pLookaside->pInit = pLookaside->pFree; pLookaside->pFree = 0; } } #ifndef SQLITE_OMIT_LOOKASIDE static void *lookasideSlotAlloc(Lookaside *pLookaside){ LookasideSlot *pBuf; if( (pBuf = pLookaside->pFree)!=0 ){ pLookaside->pFree = pBuf->pNext; pLookaside->anStat[0]++; return (void*)pBuf; }else if( (pBuf = pLookaside->pInit)!=0 ){ pLookaside->pInit = pBuf->pNext; pLookaside->anStat[0]++; return (void*)pBuf; }else{ pLookaside->anStat[2]++; return 0; } } static void lookasideSlotFree(Lookaside *pLookaside, void *p){ LookasideSlot *pBuf = (LookasideSlot*)p; # ifdef SQLITE_DEBUG /* Scribble over the content in the buffer being freed */ memset(p, 0xaa, pLookaside->szTrue); # endif pBuf->pNext = pLookaside->pFree; pLookaside->pFree = pBuf; } # ifndef SQLITE_OMIT_MINI_LOOKASIDE # ifndef SQLITE_MINI_LOOKASIDE_MIN_SLOT_SIZE # define SQLITE_MINI_LOOKASIDE_MIN_SLOT_SIZE 128 # endif static void *miniLookasideAlloc(Lookaside *pLookaside){ LookasideSlot *pMiniSlot; LookasideSlot *pSlot; int iMiniSlot; if( !pLookaside->pMini ){ pSlot = lookasideSlotAlloc(pLookaside); if( !pSlot ){ return 0; } bzero(pSlot, sizeof(LookasideSlot)); pLookaside->pMini = pSlot; }else{ pSlot = pLookaside->pMini; assert( pSlot->nAlloc ); } assert( pSlot->nAlloc < pLookaside->nMini ); if( (pMiniSlot = pSlot->pFree) ){ pSlot->pFree = pMiniSlot->pNext; }else{ iMiniSlot = pSlot->nAlloc; assert(iMiniSlot < pLookaside->nMini); pMiniSlot = (LookasideSlot *)((char *)pSlot + sizeof(LookasideSlot) + (pLookaside->szMini * iMiniSlot)); } /* Remove slot from pMini if it is full of sub-allocations */ if( ++(pSlot->nAlloc) == pLookaside->nMini ){ /* Slot is full, dequeue from list */ if( pSlot->pNext ){ assert( pSlot->pNext->pPrev == pSlot ); pSlot->pNext->pPrev = pSlot->pPrev; } if( pSlot->pPrev ){ assert( pSlot->pPrev->pNext == pSlot ); pSlot->pPrev->pNext = pSlot->pNext; }else{ assert( pLookaside->pMini == pSlot ); pLookaside->pMini = pSlot->pNext; } pSlot->pNext = pSlot->pPrev = 0; } return pMiniSlot; } static void miniLookasideFree(Lookaside *pLookaside, void *p){ int iSlotNum = ((u8*)p - (u8*)pLookaside->pStart) / pLookaside->szTrue; LookasideSlot *pSlot = (LookasideSlot *)(iSlotNum * pLookaside->szTrue + (u8*)pLookaside->pStart); LookasideSlot *pMiniSlot = (LookasideSlot *)p; assert( pSlot->nAlloc ); assert( pSlot->nAlloc <= pLookaside->nMini ); assert( iMiniSlot<pLookaside->nMini ); /* Return slot to pMini list if it was full */ if( pSlot->nAlloc==pLookaside->nMini ){ assert( pSlot->pNext == pSlot->pPrev && pSlot->pPrev == 0 ); if( pLookaside->pMini ){ assert( !pLookaside->pMini->pPrev ); pSlot->pNext = pLookaside->pMini; pSlot->pNext->pPrev = pSlot; } pLookaside->pMini = pSlot; } #ifdef SQLITE_DEBUG memset(p, 0xaa, pLookaside->szMini); #endif pSlot->nAlloc--; pMiniSlot->pNext = pSlot->pFree; pSlot->pFree = pMiniSlot; /* Return slot to the lookaside pool if it is empty */ if( pSlot->nAlloc == 0 ){ if( pSlot->pNext ){ assert( pSlot->pNext->pPrev == pSlot ); pSlot->pNext->pPrev = pSlot->pPrev; } if( pSlot->pPrev ){ assert( pSlot->pPrev->pNext == pSlot ); pSlot->pPrev->pNext = pSlot->pNext; }else{ assert( pLookaside->pMini==pSlot ); pLookaside->pMini = pSlot->pNext; } lookasideSlotFree(pLookaside, pSlot); } } # else # define miniLookasideAlloc(A) lookasideSlotAlloc(A) # define miniLookasideFree(A, B) lookasideSlotFree(A, B) # endif /* !SQLITE_OMIT_MINI_LOOKASIDE */ int sqlite3LookasideOpen(void *pBuf, int sz, int cnt, Lookaside *pLookaside){ void *pStart; if( sqlite3LookasideUsed(pLookaside,0)>0 ){ return SQLITE_BUSY; } /* Free any existing lookaside buffer for this handle before ** allocating a new one so we don't have to have space for ** both at the same time. */ if( pLookaside->bMalloced ){ sqlite3_free(pLookaside->pStart); } /* The size of a lookaside slot after ROUNDDOWN8 needs to be larger ** than sizeof(LookasideSlot) to be useful. */ sz = ROUNDDOWN8(sz); /* IMP: R-33038-09382 */ if( sz<=(int)sizeof(LookasideSlot*) ) sz = 0; if( cnt<0 ) cnt = 0; if( sz==0 || cnt==0 ){ sz = 0; pStart = 0; }else if( pBuf==0 ){ sqlite3BeginBenignMalloc(); pStart = sqlite3Malloc( sz*(sqlite3_int64)cnt ); /* IMP: R-61949-35727 */ sqlite3EndBenignMalloc(); if( pStart ) cnt = sqlite3MallocSize(pStart)/sz; }else{ pStart = pBuf; } pLookaside->pStart = pStart; pLookaside->pInit = 0; pLookaside->pFree = 0; pLookaside->sz = (u16)sz; pLookaside->szTrue = (u16)sz; #ifndef SQLITE_OMIT_MINILOOKASIDE pLookaside->pMini = 0; pLookaside->nMini = (sz - sizeof(LookasideSlot)) / SQLITE_MINI_LOOKASIDE_MIN_SLOT_SIZE; if( pLookaside->nMini ){ pLookaside->szMini = ((sz - sizeof(LookasideSlot)) / pLookaside->nMini) & ~(sizeof(void *) - 1); }else{ pLookaside->szMini = 0; } #endif /* SQLITE_OMIT_MINILOOKASIDE */ if( pStart ){ int i; LookasideSlot *p; assert( sz > (int)sizeof(LookasideSlot*) ); pLookaside->nSlot = cnt; p = (LookasideSlot*)pStart; for(i=cnt-1; i>=0; i--){ p->pNext = pLookaside->pInit; pLookaside->pInit = p; p = (LookasideSlot*)&((u8*)p)[sz]; } pLookaside->pEnd = p; pLookaside->bDisable = 0; pLookaside->bMalloced = pBuf==0 ?1:0; }else{ pLookaside->pStart = 0; pLookaside->pEnd = 0; pLookaside->bDisable = 1; pLookaside->bMalloced = 0; pLookaside->nSlot = 0; } return SQLITE_OK; } void sqlite3LookasideClose(Lookaside *pLookaside){ assert( sqlite3LookasideUsed(pLookaside,0)==0 ); if( pLookaside->bMalloced ){ sqlite3_free(pLookaside->pStart); } } int sqlite3IsLookaside(Lookaside *pLookaside, void *p){ return SQLITE_WITHIN(p, pLookaside->pStart, pLookaside->pEnd); } /* ** Returns a pointer to a region at least n bytes in size, or NULL if the ** lookaside allocator has exhausted its available memory. */ void *sqlite3LookasideAlloc(Lookaside *pLookaside, u64 n){ if( n>pLookaside->sz ){ if( !pLookaside->bDisable ){ pLookaside->anStat[1]++; } return 0; } if( n<=pLookaside->szMini && pLookaside->nMini > 1 ){ return miniLookasideAlloc(pLookaside); } return lookasideSlotAlloc(pLookaside); } /* ** Free memory previously obtained from sqlite3LookasideAlloc(). */ void sqlite3LookasideFree(Lookaside *pLookaside, void *p){ assert( sqlite3IsLookaside(pLookaside, p) ); if( ((u8*)p - (u8*)pLookaside->pStart) % pLookaside->szTrue == 0 ){ lookasideSlotFree(pLookaside, p); }else{ miniLookasideFree(pLookaside, p); } } /* ** Return the size of a memory allocation previously obtained from ** sqlite3LookasideAlloc(). */ int sqlite3LookasideSize(Lookaside *pLookaside, void *p){ assert(sqlite3IsLookaside(pLookaside, p)); # ifndef SQLITE_OMIT_MINI_LOOKASIDE if( ((u8*)p - (u8*)pLookaside->pStart) % pLookaside->szTrue != 0 ){ return pLookaside->szMini; }else #endif /* SQLITE_OMIT_MINI_LOOKASIDE */ { return pLookaside->szTrue; } } #endif /* !SQLITE_OMIT_LOOKASIDE */ |
Added src/lookaside.h.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | /* ** 2019-10-02 ** ** 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. ** ************************************************************************* ** Header file for the lookaside allocator ** ** This header defines the interface to the lookaside allocator. ** The lookaside allocator implements a two-size memory allocator using a ** buffer provided at initialization-time to exploit the fact that 75% of ** SQLite's allocations are <=128B. */ #ifndef SQLITE_LOOKASIDE_H #define SQLITE_LOOKASIDE_H /* ** Count the number of slots of lookaside memory that are outstanding */ int sqlite3LookasideUsed(Lookaside *pLookaside, int *pHighwater); void sqlite3LookasideResetUsed(Lookaside *pLookaside); #define sqlite3LookasideDisable(pLookaside) do{(pLookaside)->bDisable++;\ (pLookaside)->sz=0;}while(0) #define sqlite3LookasideEnable(pLookaside) do{(pLookaside)->bDisable--;\ (pLookaside)->sz=(pLookaside)->bDisable?0:(pLookaside)->szTrue;} while(0) #define sqlite3LookasideEnableCnt(pLookaside, CNT) do{(pLookaside)->bDisable -= (CNT);\ (pLookaside)->sz=(pLookaside)->bDisable?0:(pLookaside)->szTrue;} while(0) #define sqlite3LookasideDisabled(pLookaside) ((pLookaside)->bDisable) # ifndef SQLITE_OMIT_LOOKASIDE /* ** Set up a lookaside allocator. ** Returns SQLITE_OK on success. ** If lookaside is already active, return SQLITE_BUSY. ** ** If pStart is NULL the space for the lookaside memory is obtained from ** sqlite3_malloc(). If pStart is not NULL then it is sz*cnt bytes of memory ** to use for the lookaside memory. */ int sqlite3LookasideOpen( void *pBuf, /* NULL or sz*cnt bytes of memory */ int sz, /* Number of bytes in each lookaside slot */ int cnt, /* Number of slots */ Lookaside *pLookaside /* Preallocated space for the Lookaside */ ); /* Reset and close the lookaside object */ void sqlite3LookasideClose(Lookaside *pLookaside); /* ** Returns TRUE if p is a lookaside memory allocation from db */ int sqlite3IsLookaside(Lookaside *pLookaside, void *p); /* ** Returns a pointer to a region at least n bytes in size, or NULL if the ** lookaside allocator has exhausted its available memory. */ void *sqlite3LookasideAlloc(Lookaside *pLookaside, u64 n); /* ** Free memory previously obtained from sqlite3LookasideAlloc(). */ void sqlite3LookasideFree(Lookaside *pLookaside, void *p); /* ** Return the size of a memory allocation previously obtained from ** sqlite3LookasideAlloc(). */ int sqlite3LookasideSize(Lookaside *pLookaside, void *p); # else # define sqlite3LookasideOpen(A, B, C, D) SQLITE_OK # define sqlite3LookasideClose(A) # define sqlite3IsLookaside(A, B) 0 # define sqlite3LookasideAlloc(A, B) 0 # define sqlite3LookasideFree(A, B) assert(0); # define sqlite3LookasideSize(A, B) -1 # endif #endif /* SQLITE_LOOKASIDE_H */ |
Changes to src/main.c.
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. */ #include "sqliteInt.h" #ifdef SQLITE_ENABLE_FTS3 # include "fts3.h" #endif #ifdef SQLITE_ENABLE_RTREE # include "rtree.h" #endif | > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. */ #include "sqliteInt.h" #include "lookaside.h" #ifdef SQLITE_ENABLE_FTS3 # include "fts3.h" #endif #ifdef SQLITE_ENABLE_RTREE # include "rtree.h" #endif |
︙ | ︙ | |||
665 666 667 668 669 670 671 | break; } } va_end(ap); return rc; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 666 667 668 669 670 671 672 673 674 675 676 677 678 679 | break; } } va_end(ap); return rc; } /* ** Return the mutex associated with a database connection. */ sqlite3_mutex *sqlite3_db_mutex(sqlite3 *db){ #ifdef SQLITE_ENABLE_API_ARMOR if( !sqlite3SafetyCheckOk(db) ){ (void)SQLITE_MISUSE_BKPT; |
︙ | ︙ | |||
824 825 826 827 828 829 830 | rc = SQLITE_OK; break; } case SQLITE_DBCONFIG_LOOKASIDE: { void *pBuf = va_arg(ap, void*); /* IMP: R-26835-10964 */ int sz = va_arg(ap, int); /* IMP: R-47871-25994 */ int cnt = va_arg(ap, int); /* IMP: R-04460-53386 */ | | | 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 | rc = SQLITE_OK; break; } case SQLITE_DBCONFIG_LOOKASIDE: { void *pBuf = va_arg(ap, void*); /* IMP: R-26835-10964 */ int sz = va_arg(ap, int); /* IMP: R-47871-25994 */ int cnt = va_arg(ap, int); /* IMP: R-04460-53386 */ rc = sqlite3LookasideOpen(pBuf, sz, cnt, &db->lookaside); break; } default: { static const struct { int op; /* The opcode */ u32 mask; /* Mask of the bit in sqlite3.flags to set/clear */ } aFlagOp[] = { |
︙ | ︙ | |||
1260 1261 1262 1263 1264 1265 1266 | ** the same sqliteMalloc() as the one that allocates the database ** structure? */ sqlite3DbFree(db, db->aDb[1].pSchema); sqlite3_mutex_leave(db->mutex); db->magic = SQLITE_MAGIC_CLOSED; sqlite3_mutex_free(db->mutex); | | < < < | 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 | ** the same sqliteMalloc() as the one that allocates the database ** structure? */ sqlite3DbFree(db, db->aDb[1].pSchema); sqlite3_mutex_leave(db->mutex); db->magic = SQLITE_MAGIC_CLOSED; sqlite3_mutex_free(db->mutex); sqlite3LookasideClose(&db->lookaside); sqlite3_free(db); } /* ** Rollback all database files. If tripCode is not SQLITE_OK, then ** any write cursors are invalidated ("tripped" - as in "tripping a circuit ** breaker") and made to return tripCode if there are any further |
︙ | ︙ | |||
3061 3062 3063 3064 3065 3066 3067 | } } sqlite3_mutex_enter(db->mutex); db->errMask = 0xff; db->nDb = 2; db->magic = SQLITE_MAGIC_BUSY; db->aDb = db->aDbStatic; | < | | 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 | } } sqlite3_mutex_enter(db->mutex); db->errMask = 0xff; db->nDb = 2; db->magic = SQLITE_MAGIC_BUSY; db->aDb = db->aDbStatic; sqlite3LookasideDisable(&db->lookaside); assert( sizeof(db->aLimit)==sizeof(aHardLimit) ); memcpy(db->aLimit, aHardLimit, sizeof(db->aLimit)); db->aLimit[SQLITE_LIMIT_WORKER_THREADS] = SQLITE_DEFAULT_WORKER_THREADS; db->autoCommit = 1; db->nextAutovac = -1; db->szMmap = sqlite3GlobalConfig.szMmap; |
︙ | ︙ | |||
3319 3320 3321 3322 3323 3324 3325 | sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt), SQLITE_DEFAULT_LOCKING_MODE); #endif if( rc ) sqlite3Error(db, rc); /* Enable the lookaside-malloc subsystem */ | | | | 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 | sqlite3PagerLockingMode(sqlite3BtreePager(db->aDb[0].pBt), SQLITE_DEFAULT_LOCKING_MODE); #endif if( rc ) sqlite3Error(db, rc); /* Enable the lookaside-malloc subsystem */ sqlite3LookasideOpen(0, sqlite3GlobalConfig.szLookaside, sqlite3GlobalConfig.nLookaside, &db->lookaside); sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT); opendb_out: if( db ){ assert( db->mutex!=0 || isThreadsafe==0 || sqlite3GlobalConfig.bFullMutex==0 ); |
︙ | ︙ |
Changes to src/malloc.c.
︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** Memory allocation functions used throughout sqlite. */ #include "sqliteInt.h" #include <stdarg.h> /* ** Attempt to release up to n bytes of non-essential memory currently ** held by SQLite. An example of non-essential memory is memory used to ** cache database pages that are not currently in use. */ | > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** Memory allocation functions used throughout sqlite. */ #include "sqliteInt.h" #include "lookaside.h" #include <stdarg.h> /* ** Attempt to release up to n bytes of non-essential memory currently ** held by SQLite. An example of non-essential memory is memory used to ** cache database pages that are not currently in use. */ |
︙ | ︙ | |||
260 261 262 263 264 265 266 | void *sqlite3_malloc64(sqlite3_uint64 n){ #ifndef SQLITE_OMIT_AUTOINIT if( sqlite3_initialize() ) return 0; #endif return sqlite3Malloc(n); } | < < < < < < < < < < < | | | 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 | void *sqlite3_malloc64(sqlite3_uint64 n){ #ifndef SQLITE_OMIT_AUTOINIT if( sqlite3_initialize() ) return 0; #endif return sqlite3Malloc(n); } /* ** Return the size of a memory allocation previously obtained from ** sqlite3Malloc() or sqlite3_malloc(). */ int sqlite3MallocSize(void *p){ assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) ); return sqlite3GlobalConfig.m.xSize(p); } int sqlite3DbMallocSize(sqlite3 *db, void *p){ assert( p!=0 ); if( db==0 || !sqlite3IsLookaside(&db->lookaside,p) ){ #ifdef SQLITE_DEBUG if( db==0 ){ assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) ); assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) ); }else{ assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) ); assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) ); } #endif return sqlite3GlobalConfig.m.xSize(p); }else{ assert( sqlite3_mutex_held(db->mutex) ); return sqlite3LookasideSize(&db->lookaside, p); } } sqlite3_uint64 sqlite3_msize(void *p){ assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) ); assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) ); return p ? sqlite3GlobalConfig.m.xSize(p) : 0; } |
︙ | ︙ | |||
342 343 344 345 346 347 348 | assert( db==0 || sqlite3_mutex_held(db->mutex) ); assert( p!=0 ); if( db ){ if( db->pnBytesFreed ){ measureAllocationSize(db, p); return; } | < < < < < < | | | 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 | assert( db==0 || sqlite3_mutex_held(db->mutex) ); assert( p!=0 ); if( db ){ if( db->pnBytesFreed ){ measureAllocationSize(db, p); return; } if( sqlite3IsLookaside(&db->lookaside, p) ){ sqlite3LookasideFree(&db->lookaside, p); return; } } assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) ); assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) ); assert( db!=0 || sqlite3MemdebugNoType(p, MEMTYPE_LOOKASIDE) ); sqlite3MemdebugSetType(p, MEMTYPE_HEAP); |
︙ | ︙ | |||
464 465 466 467 468 469 470 471 472 473 | /* Finish the work of sqlite3DbMallocRawNN for the unusual and ** slower case when the allocation cannot be fulfilled using lookaside. */ static SQLITE_NOINLINE void *dbMallocRawFinish(sqlite3 *db, u64 n){ void *p; assert( db!=0 ); p = sqlite3Malloc(n); if( !p ) sqlite3OomFault(db); sqlite3MemdebugSetType(p, | > | | 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 | /* Finish the work of sqlite3DbMallocRawNN for the unusual and ** slower case when the allocation cannot be fulfilled using lookaside. */ static SQLITE_NOINLINE void *dbMallocRawFinish(sqlite3 *db, u64 n){ void *p; assert( db!=0 ); if( db->mallocFailed ){ return 0; } p = sqlite3Malloc(n); if( !p ) sqlite3OomFault(db); sqlite3MemdebugSetType(p, sqlite3LookasideDisabled(&db->lookaside) ? MEMTYPE_HEAP : MEMTYPE_LOOKASIDE); return p; } /* ** Allocate memory, either lookaside (if possible) or heap. ** If the allocation fails, set the mallocFailed flag in ** the connection pointer. |
︙ | ︙ | |||
501 502 503 504 505 506 507 | void *p; if( db ) return sqlite3DbMallocRawNN(db, n); p = sqlite3Malloc(n); sqlite3MemdebugSetType(p, MEMTYPE_HEAP); return p; } void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){ | < < | < | < < < < < < < < < < < < < < > | | | | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 | void *p; if( db ) return sqlite3DbMallocRawNN(db, n); p = sqlite3Malloc(n); sqlite3MemdebugSetType(p, MEMTYPE_HEAP); return p; } void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){ assert( db!=0 ); assert( sqlite3_mutex_held(db->mutex) ); assert( db->pnBytesFreed==0 ); #ifndef SQLITE_OMIT_LOOKASIDE return sqlite3LookasideAlloc(&db->lookaside, n) ?: dbMallocRawFinish(db, n); #else assert( db!=0 ); assert( sqlite3_mutex_held(db->mutex) ); assert( db->pnBytesFreed==0 ); if( db->mallocFailed ){ return 0; } return dbMallocRawFinish(db, n); #endif } /* Forward declaration */ static SQLITE_NOINLINE void *dbReallocFinish(sqlite3 *db, void *p, u64 n); /* ** Resize the block of memory pointed to by p to n bytes. If the ** resize fails, set the mallocFailed flag in the connection object. */ void *sqlite3DbRealloc(sqlite3 *db, void *p, u64 n){ assert( db!=0 ); if( p==0 ) return sqlite3DbMallocRawNN(db, n); assert( sqlite3_mutex_held(db->mutex) ); if( sqlite3IsLookaside(&db->lookaside,p) && n<=sqlite3LookasideSize(&db->lookaside, p) ) return p; return dbReallocFinish(db, p, n); } static SQLITE_NOINLINE void *dbReallocFinish(sqlite3 *db, void *p, u64 n){ void *pNew = 0; assert( db!=0 ); assert( p!=0 ); if( db->mallocFailed==0 ){ if( sqlite3IsLookaside(&db->lookaside,p) ){ pNew = sqlite3DbMallocRawNN(db, n); if( pNew ){ memcpy(pNew, p, sqlite3LookasideSize(&db->lookaside, p)); sqlite3DbFree(db, p); } }else{ assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) ); assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) ); sqlite3MemdebugSetType(p, MEMTYPE_HEAP); pNew = sqlite3_realloc64(p, n); if( !pNew ){ sqlite3OomFault(db); } sqlite3MemdebugSetType(p, sqlite3LookasideDisabled(&db->lookaside) ? MEMTYPE_HEAP : MEMTYPE_LOOKASIDE); } } return pNew; } /* ** Attempt to reallocate p. If the reallocation fails, then free p |
︙ | ︙ | |||
644 645 646 647 648 649 650 | void sqlite3SetString(char **pz, sqlite3 *db, const char *zNew){ sqlite3DbFree(db, *pz); *pz = sqlite3DbStrDup(db, zNew); } /* ** Call this routine to record the fact that an OOM (out-of-memory) error | | < | | | 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 | void sqlite3SetString(char **pz, sqlite3 *db, const char *zNew){ sqlite3DbFree(db, *pz); *pz = sqlite3DbStrDup(db, zNew); } /* ** Call this routine to record the fact that an OOM (out-of-memory) error ** has happened. This routine will set db->mallocFailed and interrupt ** any running VDBEs. */ void sqlite3OomFault(sqlite3 *db){ if( db->mallocFailed==0 && db->bBenignMalloc==0 ){ db->mallocFailed = 1; if( db->nVdbeExec>0 ){ db->u1.isInterrupted = 1; } sqlite3LookasideDisable(&db->lookaside);; if( db->pParse ){ db->pParse->rc = SQLITE_NOMEM_BKPT; } } } /* ** This routine reactivates the memory allocator and clears the ** db->mallocFailed flag as necessary. ** ** The memory allocator is not restarted if there are running ** VDBEs. */ void sqlite3OomClear(sqlite3 *db){ if( db->mallocFailed && db->nVdbeExec==0 ){ db->mallocFailed = 0; db->u1.isInterrupted = 0; assert( sqlite3LookasideDisabled(&db->lookaside) ); EnableLookaside; } } /* ** Take actions at the end of an API call to indicate an OOM error */ |
︙ | ︙ |
Changes to src/parse.y.
︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 | %name sqlite3Parser // The following text is included near the beginning of the C source // code file that implements the parser. // %include { #include "sqliteInt.h" /* ** Disable all error recovery processing in the parser push-down ** automaton. */ #define YYNOERRORRECOVERY 1 | > | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | %name sqlite3Parser // The following text is included near the beginning of the C source // code file that implements the parser. // %include { #include "sqliteInt.h" #include "lookaside.h" /* ** Disable all error recovery processing in the parser push-down ** automaton. */ #define YYNOERRORRECOVERY 1 |
︙ | ︙ | |||
104 105 106 107 108 109 110 | /* ** Disable lookaside memory allocation for objects that might be ** shared across database connections. */ static void disableLookaside(Parse *pParse){ sqlite3 *db = pParse->db; pParse->disableLookaside++; | | | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | /* ** Disable lookaside memory allocation for objects that might be ** shared across database connections. */ static void disableLookaside(Parse *pParse){ sqlite3 *db = pParse->db; pParse->disableLookaside++; sqlite3LookasideDisable(&db->lookaside); } } // end %include // Input is a single SQL command input ::= cmdlist. cmdlist ::= cmdlist ecmd. |
︙ | ︙ |
Changes to src/prepare.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ** ************************************************************************* ** This file contains the implementation of the sqlite3_prepare() ** interface, and routines that contribute to loading the database schema ** from disk. */ #include "sqliteInt.h" /* ** Fill the InitData structure with an error message that indicates ** that the database is corrupt. */ static void corruptSchema( InitData *pData, /* Initialization context */ | > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** This file contains the implementation of the sqlite3_prepare() ** interface, and routines that contribute to loading the database schema ** from disk. */ #include "sqliteInt.h" #include "lookaside.h" /* ** Fill the InitData structure with an error message that indicates ** that the database is corrupt. */ static void corruptSchema( InitData *pData, /* Initialization context */ |
︙ | ︙ | |||
534 535 536 537 538 539 540 | ** Free all memory allocations in the pParse object */ void sqlite3ParserReset(Parse *pParse){ sqlite3 *db = pParse->db; sqlite3DbFree(db, pParse->aLabel); sqlite3ExprListDelete(db, pParse->pConstExpr); if( db ){ | | | < | 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 | ** Free all memory allocations in the pParse object */ void sqlite3ParserReset(Parse *pParse){ sqlite3 *db = pParse->db; sqlite3DbFree(db, pParse->aLabel); sqlite3ExprListDelete(db, pParse->pConstExpr); if( db ){ assert( sqlite3LookasideDisabled(&db->lookaside) >= pParse->disableLookaside ); sqlite3LookasideEnableCnt(&db->lookaside, pParse->disableLookaside); } pParse->disableLookaside = 0; } /* ** Compile the UTF-8 encoded SQL statement zSql into a statement handle. */ |
︙ | ︙ | |||
570 571 572 573 574 575 576 | assert( sqlite3_mutex_held(db->mutex) ); /* For a long-term use prepared statement avoid the use of ** lookaside memory. */ if( prepFlags & SQLITE_PREPARE_PERSISTENT ){ sParse.disableLookaside++; | | | 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 | assert( sqlite3_mutex_held(db->mutex) ); /* For a long-term use prepared statement avoid the use of ** lookaside memory. */ if( prepFlags & SQLITE_PREPARE_PERSISTENT ){ sParse.disableLookaside++; sqlite3LookasideDisable(&db->lookaside); } sParse.disableVtab = (prepFlags & SQLITE_PREPARE_NO_VTAB)!=0; /* Check to verify that it is possible to get a read lock on all ** database schemas. The inability to get a read lock indicates that ** some other database connection is holding a write-lock, which in ** turn means that the other connection has made uncommitted changes |
︙ | ︙ |
Changes to src/select.c.
︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. */ #include "sqliteInt.h" /* ** Trace output macros */ #if SELECTTRACE_ENABLED /***/ int sqlite3SelectTrace = 0; # define SELECTTRACE(K,P,S,X) \ | > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. */ #include "sqliteInt.h" #include "lookaside.h" /* ** Trace output macros */ #if SELECTTRACE_ENABLED /***/ int sqlite3SelectTrace = 0; # define SELECTTRACE(K,P,S,X) \ |
︙ | ︙ |
Changes to src/sqliteInt.h.
︙ | ︙ | |||
1285 1286 1287 1288 1289 1290 1291 1292 1293 | u8 bMalloced; /* True if pStart obtained from sqlite3_malloc() */ u32 nSlot; /* Number of lookaside slots allocated */ u32 anStat[3]; /* 0: hits. 1: size misses. 2: full misses */ LookasideSlot *pInit; /* List of buffers not previously used */ LookasideSlot *pFree; /* List of available buffers */ void *pStart; /* First byte of available memory space */ void *pEnd; /* First byte past end of available space */ }; struct LookasideSlot { | > > > > > | > > > > > > | 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 | u8 bMalloced; /* True if pStart obtained from sqlite3_malloc() */ u32 nSlot; /* Number of lookaside slots allocated */ u32 anStat[3]; /* 0: hits. 1: size misses. 2: full misses */ LookasideSlot *pInit; /* List of buffers not previously used */ LookasideSlot *pFree; /* List of available buffers */ void *pStart; /* First byte of available memory space */ void *pEnd; /* First byte past end of available space */ #ifndef SQLITE_OMIT_MINILOOKASIDE LookasideSlot *pMini; /* List of buffers used by mini allocator */ u16 szMini; /* Size of each mini-allocator buffer in bytes */ u16 nMini; /* Number of mini-allocator buffers per slot */ #endif /* SQLITE_OMIT_MINILOOKASIDE */ }; struct LookasideSlot { LookasideSlot *pNext; /* Next buffer in the list of buffers */ #ifndef SQLITE_OMIT_MINILOOKASIDE /* The members below are only valid for slots inside the mini-allocator */ LookasideSlot *pPrev; /* Previous partially-used buffer in the list */ u16 nAlloc; /* Number of sub-allocations ever returned from this slot */ LookasideSlot *pFree; /* List of freed sub-allocations */ #endif /* SQLITE_OMIT_MINILOOKASIDE */ }; #define DisableLookaside db->lookaside.bDisable++;db->lookaside.sz=0 #define EnableLookaside db->lookaside.bDisable--;\ db->lookaside.sz=db->lookaside.bDisable?0:db->lookaside.szTrue /* |
︙ | ︙ | |||
3821 3822 3823 3824 3825 3826 3827 | # define sqlite3MemoryBarrier() #endif sqlite3_int64 sqlite3StatusValue(int); void sqlite3StatusUp(int, int); void sqlite3StatusDown(int, int); void sqlite3StatusHighwater(int, int); | < | 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 | # define sqlite3MemoryBarrier() #endif sqlite3_int64 sqlite3StatusValue(int); void sqlite3StatusUp(int, int); void sqlite3StatusDown(int, int); void sqlite3StatusHighwater(int, int); /* Access to mutexes used by sqlite3_status() */ sqlite3_mutex *sqlite3Pcache1Mutex(void); sqlite3_mutex *sqlite3MallocMutex(void); #if defined(SQLITE_ENABLE_MULTITHREADED_CHECKS) && !defined(SQLITE_MUTEX_OMIT) void sqlite3MutexWarnOnContention(sqlite3_mutex*); |
︙ | ︙ |
Changes to src/status.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ** ************************************************************************* ** ** This module implements the sqlite3_status() interface and related ** functionality. */ #include "sqliteInt.h" #include "vdbeInt.h" /* ** Variables in which to record status information. */ #if SQLITE_PTRSIZE>4 typedef sqlite3_int64 sqlite3StatValueType; | > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** ** This module implements the sqlite3_status() interface and related ** functionality. */ #include "sqliteInt.h" #include "lookaside.h" #include "vdbeInt.h" /* ** Variables in which to record status information. */ #if SQLITE_PTRSIZE>4 typedef sqlite3_int64 sqlite3StatValueType; |
︙ | ︙ | |||
166 167 168 169 170 171 172 | if( rc==0 ){ *pCurrent = (int)iCur; *pHighwater = (int)iHwtr; } return rc; } | < < < < < < < < < < < < < < < < < < < < < < | < < < < < | < | 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 | if( rc==0 ){ *pCurrent = (int)iCur; *pHighwater = (int)iHwtr; } return rc; } /* ** Query status information for a single database connection */ int sqlite3_db_status( sqlite3 *db, /* The database connection whose status is desired */ int op, /* Status verb */ int *pCurrent, /* Write current value here */ int *pHighwater, /* Write high-water mark here */ int resetFlag /* Reset high-water mark if true */ ){ int rc = SQLITE_OK; /* Return code */ #ifdef SQLITE_ENABLE_API_ARMOR if( !sqlite3SafetyCheckOk(db) || pCurrent==0|| pHighwater==0 ){ return SQLITE_MISUSE_BKPT; } #endif sqlite3_mutex_enter(db->mutex); switch( op ){ case SQLITE_DBSTATUS_LOOKASIDE_USED: { *pCurrent = sqlite3LookasideUsed(&db->lookaside, pHighwater); if( resetFlag ){ sqlite3LookasideResetUsed(&db->lookaside); } break; } case SQLITE_DBSTATUS_LOOKASIDE_HIT: case SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE: case SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL: { |
︙ | ︙ |
Changes to tool/mksqlite3c-noext.tcl.
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | # foreach hdr { btree.h btreeInt.h hash.h hwtime.h keywordhash.h msvc.h mutex.h opcodes.h os_common.h os_setup.h os_win.h os.h | > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | # foreach hdr { btree.h btreeInt.h hash.h hwtime.h keywordhash.h lookaside.h msvc.h mutex.h opcodes.h os_common.h os_setup.h os_win.h os.h |
︙ | ︙ | |||
279 280 281 282 283 284 285 286 287 288 289 290 291 292 | global.c ctime.c status.c date.c os.c fault.c mem0.c mem1.c mem2.c mem3.c mem5.c mutex.c mutex_noop.c | > | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 | global.c ctime.c status.c date.c os.c fault.c lookaside.c mem0.c mem1.c mem2.c mem3.c mem5.c mutex.c mutex_noop.c |
︙ | ︙ |
Changes to tool/mksqlite3c.tcl.
︙ | ︙ | |||
99 100 101 102 103 104 105 106 107 108 109 110 111 112 | fts3Int.h fts3_hash.h fts3_tokenizer.h geopoly.c hash.h hwtime.h keywordhash.h msvc.h mutex.h opcodes.h os_common.h os_setup.h os_win.h os.h | > | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 | fts3Int.h fts3_hash.h fts3_tokenizer.h geopoly.c hash.h hwtime.h keywordhash.h lookaside.h msvc.h mutex.h opcodes.h os_common.h os_setup.h os_win.h os.h |
︙ | ︙ | |||
296 297 298 299 300 301 302 303 304 305 306 307 308 309 | global.c status.c date.c os.c fault.c mem0.c mem1.c mem2.c mem3.c mem5.c mutex.c mutex_noop.c | > | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | global.c status.c date.c os.c fault.c lookaside.c mem0.c mem1.c mem2.c mem3.c mem5.c mutex.c mutex_noop.c |
︙ | ︙ |
Changes to tool/mksqlite3internalh.tcl.
︙ | ︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | # foreach hdr { btree.h btreeInt.h hash.h hwtime.h keywordhash.h msvc.h opcodes.h os_common.h os_setup.h os_win.h os.h pager.h | > | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | # foreach hdr { btree.h btreeInt.h hash.h hwtime.h keywordhash.h lookaside.h msvc.h opcodes.h os_common.h os_setup.h os_win.h os.h pager.h |
︙ | ︙ |