Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Comment and function naming tweaks to pcache. No functionality changes. (CVS 5572) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
4b0e67d397236c740bea88ad3a5912ab |
User & Date: | drh 2008-08-20 21:47:46.000 |
Context
2008-08-20
| ||
22:06 | Modify the sqlite3VdbeUnpackRecord() interface to force the temporary space to be 8-byte aligned. This might be important for Sparc. Ticket #3318. (CVS 5573) (check-in: 00b177985e user: drh tags: trunk) | |
21:47 | Comment and function naming tweaks to pcache. No functionality changes. (CVS 5572) (check-in: 4b0e67d397 user: drh tags: trunk) | |
17:48 | Modify the lemon parser template to avoid using zero-initialized constants when compiled with C++. Ticket #3288. (CVS 5571) (check-in: 71992f4a37 user: drh tags: trunk) | |
Changes
Changes to src/pager.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** ** @(#) $Id: pager.c,v 1.471 2008/08/20 21:47:46 drh Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" /* ** Macros for troubleshooting. Normally turned off */ |
︙ | ︙ | |||
486 487 488 489 490 491 492 | || (pPg->flags&PGHDR_DIRTY) || pPg->pageHash==pager_pagehash(pPg) ); } #else #define pager_datahash(X,Y) 0 #define pager_pagehash(X) 0 #define CHECK_PAGE(x) | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | || (pPg->flags&PGHDR_DIRTY) || pPg->pageHash==pager_pagehash(pPg) ); } #else #define pager_datahash(X,Y) 0 #define pager_pagehash(X) 0 #define CHECK_PAGE(x) #endif /* SQLITE_CHECK_PAGES */ /* ** When this is called the journal file for pager pPager must be open. ** The master journal file name is read from the end of the file and ** written into memory supplied by the caller. ** ** zMaster must point to a buffer of at least nMaster bytes allocated by |
︙ | ︙ | |||
1864 1865 1866 1867 1868 1869 1870 | */ if( !pPager || !pPager->pTmpSpace ){ sqlite3OsClose(pPager->fd); sqlite3_free(pPager); return ((rc==SQLITE_OK)?SQLITE_NOMEM:rc); } nExtra = FORCE_ALIGNMENT(nExtra); | | > | 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 | */ if( !pPager || !pPager->pTmpSpace ){ sqlite3OsClose(pPager->fd); sqlite3_free(pPager); return ((rc==SQLITE_OK)?SQLITE_NOMEM:rc); } nExtra = FORCE_ALIGNMENT(nExtra); sqlite3PcacheOpen(szPageDflt, nExtra, !memDb, xDesc, !memDb?pagerStress:0, (void *)pPager, pPager->pPCache); PAGERTRACE3("OPEN %d %s\n", FILEHANDLEID(pPager->fd), pPager->zFilename); IOTRACE(("OPEN %p %s\n", pPager, pPager->zFilename)) /* Fill in Pager.zDirectory[] */ memcpy(pPager->zDirectory, pPager->zFilename, nPathname+1); for(i=strlen(pPager->zDirectory); i>0 && pPager->zDirectory[i-1]!='/'; i--){} |
︙ | ︙ |
Changes to src/pcache.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* ** 2008 August 05 ** ** 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 that page cache. ** | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* ** 2008 August 05 ** ** 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 that page cache. ** ** @(#) $Id: pcache.c,v 1.2 2008/08/20 21:47:46 drh Exp $ */ #include "sqliteInt.h" /* ** A complete page cache is an instance of this structure. */ struct PCache { |
︙ | ︙ | |||
61 62 63 64 65 66 67 | static struct PCacheGlobal { int isInit; /* True when initialized */ sqlite3_mutex *mutex_mem2; /* static mutex MUTEX_STATIC_MEM2 */ sqlite3_mutex *mutex_lru; /* static mutex MUTEX_STATIC_LRU */ PCache *pAll; /* list of all page caches */ int nPage; /* Number of pages */ int nPurgeable; /* Number of pages in purgable caches */ | | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | static struct PCacheGlobal { int isInit; /* True when initialized */ sqlite3_mutex *mutex_mem2; /* static mutex MUTEX_STATIC_MEM2 */ sqlite3_mutex *mutex_lru; /* static mutex MUTEX_STATIC_LRU */ PCache *pAll; /* list of all page caches */ int nPage; /* Number of pages */ int nPurgeable; /* Number of pages in purgable caches */ int mxPage; /* Globally configured page maximum */ int mxPagePurgeable; /* Purgeable page maximum */ PgHdr *pLruHead, *pLruTail; /* Global LRU list of unused pages */ int szSlot; /* Size of each free slot */ void *pStart, *pEnd; /* Bounds of pagecache malloc range */ PgFreeslot *pFree; /* Free page blocks */ } pcache = {0}; |
︙ | ︙ | |||
95 96 97 98 99 100 101 | ** underway. ** ** Before the xStress callback of a pager-cache (PCache) is invoked, the ** SQLITE_MUTEX_STATIC_MEM2 mutex is obtained and the SQLITE_MUTEX_STATIC_LRU ** mutex released (in that order) before making the call. */ | | | | > > > > > > | > | | | > | | | 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 | ** underway. ** ** Before the xStress callback of a pager-cache (PCache) is invoked, the ** SQLITE_MUTEX_STATIC_MEM2 mutex is obtained and the SQLITE_MUTEX_STATIC_LRU ** mutex released (in that order) before making the call. */ #define pcacheEnterGlobal() sqlite3_mutex_enter(pcache.mutex_lru) #define pcacheExitGlobal() sqlite3_mutex_leave(pcache.mutex_lru) /* ** Increment the reference count on both page p and its cache by n. */ static void pcacheRef(PgHdr *p, int n){ /* This next block assert()s that the number of references to the ** PCache is the sum of the number of references to all pages in ** the PCache. This is a bit expensive to leave turned on all the ** time, even in debugging builds. */ #if 0 PgHdr *pHdr; int nRef = 0; for(pHdr=p->pCache->pClean; pHdr; pHdr=pHdr->pNext) nRef += pHdr->nRef; for(pHdr=p->pCache->pDirty; pHdr; pHdr=pHdr->pNext) nRef += pHdr->nRef; assert( p->pCache->nRef==nRef ); #endif p->nRef += n; p->pCache->nRef += n; } /********************************** Linked List Management ********************/ #ifndef NDEBUG /* ** This routine verifies that the number of entries in the hash table ** is pCache->nPage. This routine is used within assert() statements ** only and is therefore disabled during production builds. */ static int pcacheCheckHashCount(PCache *pCache){ int i; int nPage = 0; for(i=0; i<pCache->nHash; i++){ PgHdr *p; for(p=pCache->apHash[i]; p; p=p->pNextHash){ nPage++; } } assert( nPage==pCache->nPage ); return 1; } #endif /* ** Remove a page from its hash table (PCache.apHash[]). */ static void pcacheRemoveFromHash(PgHdr *pPage){ if( pPage->pPrevHash ){ pPage->pPrevHash->pNextHash = pPage->pNextHash; }else{ PCache *pCache = pPage->pCache; u32 h = pPage->pgno % pCache->nHash; assert( pCache->apHash[h]==pPage ); pCache->apHash[h] = pPage->pNextHash; } if( pPage->pNextHash ){ pPage->pNextHash->pPrevHash = pPage->pPrevHash; } pPage->pCache->nPage--; assert( pcacheCheckHashCount(pPage->pCache) ); } /* ** Insert a page into the hash table */ static void pcacheAddToHash(PgHdr *pPage){ PCache *pCache = pPage->pCache; u32 h = pPage->pgno % pCache->nHash; pPage->pNextHash = pCache->apHash[h]; pPage->pPrevHash = 0; if( pCache->apHash[h] ){ pCache->apHash[h]->pPrevHash = pPage; } pCache->apHash[h] = pPage; pCache->nPage++; assert( pcacheCheckHashCount(pCache) ); } /* ** Attempt to increase the size the hash table to contain ** at least nHash buckets. */ static int pcacheResizeHash(PCache *pCache, int nHash){ #ifdef SQLITE_MALLOC_SOFT_LIMIT if( nHash*sizeof(PgHdr*)>SQLITE_MALLOC_SOFT_LIMIT ){ nHash = SQLITE_MALLOC_SOFT_LIMIT/sizeof(PgHdr *); } #endif if( nHash>pCache->nHash ){ PgHdr *p; PgHdr **pNew = (PgHdr **)sqlite3_malloc(sizeof(PgHdr*)*nHash); if( !pNew ){ return SQLITE_NOMEM; } memset(pNew, 0, sizeof(PgHdr *)*nHash); sqlite3_free(pCache->apHash); pCache->apHash = pNew; pCache->nHash = nHash; |
︙ | ︙ | |||
329 330 331 332 333 334 335 | sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz); } return p; } } void *sqlite3PageMalloc(sz){ void *p; | | | | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz); } return p; } } void *sqlite3PageMalloc(sz){ void *p; pcacheEnterGlobal(); p = pcacheMalloc(sz); pcacheExitGlobal(); return p; } /* ** Release a pager memory allocation */ void pcacheFree(void *p){ |
︙ | ︙ | |||
354 355 356 357 358 359 360 | }else{ int iSize = sqlite3MallocSize(p); sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -iSize); sqlite3_free(p); } } void sqlite3PageFree(void *p){ | | | | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 | }else{ int iSize = sqlite3MallocSize(p); sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -iSize); sqlite3_free(p); } } void sqlite3PageFree(void *p){ pcacheEnterGlobal(); pcacheFree(p); pcacheExitGlobal(); } /* ** Allocate a new page. */ static PgHdr *pcachePageAlloc(int szPage, int szExtra, int bPurgeable){ PgHdr *p; |
︙ | ︙ | |||
411 412 413 414 415 416 417 | int szPage = pCache->szPage; int szExtra = pCache->szExtra; int bPurg = pCache->bPurgeable; assert( pcache.isInit ); assert( sqlite3_mutex_notheld(pcache.mutex_lru) ); | | | | | 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 | int szPage = pCache->szPage; int szExtra = pCache->szExtra; int bPurg = pCache->bPurgeable; assert( pcache.isInit ); assert( sqlite3_mutex_notheld(pcache.mutex_lru) ); pcacheEnterGlobal(); if( (pcache.mxPage && pcache.nPage>=pcache.mxPage) || (!pcache.mxPage && bPurg && pcache.nPurgeable>=pcache.mxPagePurgeable) ){ PCache *pCsr; /* If the above test succeeds, then a page will be obtained by recycling ** an existing page. */ if( !pcache.pLruTail && SQLITE_OK==sqlite3_mutex_try(pcache.mutex_mem2) ){ /* Invoke xStress() callbacks until the LRU list contains at least one ** page that can be reused or until the xStress() callback of all ** caches has been invoked. */ for(pCsr=pcache.pAll; pCsr&&!pcache.pLruTail; pCsr=pCsr->pNextAll){ assert( pCsr->iInUseMM==0 ); pCsr->iInUseMM = 1; if( pCsr->xStress && (pCsr->iInUseDB==0 || pCache==pCsr) ){ pcacheExitGlobal(); pCsr->xStress(pCsr->pStress); pcacheEnterGlobal(); } pCsr->iInUseMM = 0; } sqlite3_mutex_leave(pcache.mutex_mem2); } |
︙ | ︙ | |||
468 469 470 471 472 473 474 | } if( !p ){ /* Allocate a new page object. */ p = pcachePageAlloc(szPage, szExtra, bPurg); } | | | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 | } if( !p ){ /* Allocate a new page object. */ p = pcachePageAlloc(szPage, szExtra, bPurg); } pcacheExitGlobal(); return p; } /*************************************************** General Interfaces ****** ** ** Initialize and shutdown the page cache subsystem. Neither of these ** functions are threadsafe. |
︙ | ︙ | |||
523 524 525 526 527 528 529 | p->bPurgeable = bPurgeable; p->xDestroy = xDestroy; p->xStress = xStress; p->pStress = pStress; p->nMax = 100; if( bPurgeable ){ | | | > > > > | 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 | p->bPurgeable = bPurgeable; p->xDestroy = xDestroy; p->xStress = xStress; p->pStress = pStress; p->nMax = 100; if( bPurgeable ){ pcacheEnterGlobal(); pcache.mxPagePurgeable += p->nMax; pcacheExitGlobal(); } /* Add the new pager-cache to the list of caches starting at pcache.pAll */ sqlite3_mutex_enter(pcache.mutex_mem2); p->pNextAll = pcache.pAll; if( pcache.pAll ){ pcache.pAll->pPrevAll = p; } p->pPrevAll = 0; pcache.pAll = p; sqlite3_mutex_leave(pcache.mutex_mem2); } /* ** Change the page size for PCache object. This can only happen ** when the cache is empty. */ void sqlite3PcacheSetPageSize(PCache *pCache, int szPage){ assert(pCache->nPage==0); pCache->szPage = szPage; } /* ** Try to obtain a page from the cache. |
︙ | ︙ | |||
565 566 567 568 569 570 571 | /* Search the hash table for the requested page. Exit early if it is found. */ if( pCache->apHash ){ u32 h = pgno % pCache->nHash; for(pPage=pCache->apHash[h]; pPage; pPage=pPage->pNextHash){ if( pPage->pgno==pgno ){ if( pPage->nRef==0 && (pPage->flags & PGHDR_DIRTY)==0 ){ | | | | | 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | /* Search the hash table for the requested page. Exit early if it is found. */ if( pCache->apHash ){ u32 h = pgno % pCache->nHash; for(pPage=pCache->apHash[h]; pPage; pPage=pPage->pNextHash){ if( pPage->pgno==pgno ){ if( pPage->nRef==0 && (pPage->flags & PGHDR_DIRTY)==0 ){ pcacheEnterGlobal(); pcacheRemoveFromLruList(pPage); pcacheExitGlobal(); } pcacheRef(pPage, 1); *ppPage = pPage; return SQLITE_OK; } } } if( createFlag ){ |
︙ | ︙ | |||
596 597 598 599 600 601 602 | pPage->pPager = 0; pPage->flags = 0; pPage->pDirty = 0; pPage->nRef = 0; pPage->pgno = pgno; pPage->pCache = pCache; | | | | | | | | | 608 609 610 611 612 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 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 | pPage->pPager = 0; pPage->flags = 0; pPage->pDirty = 0; pPage->nRef = 0; pPage->pgno = pgno; pPage->pCache = pCache; pcacheRef(pPage, 1); pcacheAddToList(&pCache->pClean, pPage); pcacheAddToHash(pPage); }else{ *ppPage = 0; } return SQLITE_OK; } /* ** Dereference a page. When the reference count reaches zero, ** move the page to the LRU list if it is clean. */ void sqlite3PcacheRelease(PgHdr *p){ assert( p->nRef>0 ); assert( p->pCache->iInUseDB || p->pCache->iInUseMM ); pcacheRef(p, -1); if( p->nRef!=0 ) return; if( p->pCache->xDestroy ){ p->pCache->xDestroy(p); } if( (p->flags & PGHDR_DIRTY)!=0 ) return; pcacheEnterGlobal(); pcacheAddToLruList(p); pcacheExitGlobal(); } void sqlite3PcacheRef(PgHdr *p){ assert(p->nRef>=0); pcacheRef(p, 1); } /* ** Drop a page from the cache. This should be the only reference to ** the page. */ void sqlite3PcacheDrop(PgHdr *p){ PCache *pCache; assert( p->pCache->iInUseDB ); assert( p->nRef==1 ); pCache = p->pCache; pCache->nRef--; if( p->flags & PGHDR_DIRTY ){ pcacheRemoveFromList(&pCache->pDirty, p); }else{ pcacheRemoveFromList(&pCache->pClean, p); } pcacheRemoveFromHash(p); pcacheEnterGlobal(); pcachePageFree(p); pcacheExitGlobal(); } /* ** Make sure the page is marked as dirty. If it isn't dirty already, ** make it so. */ void sqlite3PcacheMakeDirty(PgHdr *p){ |
︙ | ︙ | |||
682 683 684 685 686 687 688 | assert( p->flags & PGHDR_DIRTY ); /* assert( p->nRef>0 ); */ pCache = p->pCache; pcacheRemoveFromList(&pCache->pDirty, p); pcacheAddToList(&pCache->pClean, p); p->flags &= ~PGHDR_DIRTY; if( p->nRef==0 ){ | | | | | | | | | | 694 695 696 697 698 699 700 701 702 703 704 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 | assert( p->flags & PGHDR_DIRTY ); /* assert( p->nRef>0 ); */ pCache = p->pCache; pcacheRemoveFromList(&pCache->pDirty, p); pcacheAddToList(&pCache->pClean, p); p->flags &= ~PGHDR_DIRTY; if( p->nRef==0 ){ pcacheEnterGlobal(); pcacheAddToLruList(p); pcacheExitGlobal(); } } /* ** Make every page in the cache clean. */ void sqlite3PcacheCleanAll(PCache *pCache){ PgHdr *p; assert( pCache->iInUseDB ); while( (p = pCache->pDirty)!=0 ){ assert( p->apSave[0]==0 && p->apSave[1]==0 ); pcacheRemoveFromList(&pCache->pDirty, p); pcacheAddToList(&pCache->pClean, p); p->flags &= ~PGHDR_DIRTY; if( p->nRef==0 ){ pcacheEnterGlobal(); pcacheAddToLruList(p); pcacheExitGlobal(); } } } /* ** Change the page number of page p to newPgno. If newPgno is 0, then the ** page object is added to the clean-list and the PGHDR_REUSE_UNLIKELY ** flag set. */ void sqlite3PcacheMove(PgHdr *p, Pgno newPgno){ assert( p->pCache->iInUseDB ); pcacheRemoveFromHash(p); p->pgno = newPgno; if( newPgno==0 ){ p->flags |= PGHDR_REUSE_UNLIKELY; pcacheEnterGlobal(); pcacheFree(p->apSave[0]); pcacheFree(p->apSave[1]); pcacheExitGlobal(); p->apSave[0] = 0; p->apSave[1] = 0; sqlite3PcacheMakeClean(p); } pcacheAddToHash(p); } /* ** Set the global maximum number of pages. Return the previous value. */ void sqlite3PcacheGlobalMax(int mx){ pcacheEnterGlobal(); pcache.mxPage = mx; pcacheExitGlobal(); } /* ** Remove all content from a page cache */ void pcacheClear(PCache *pCache){ PgHdr *p, *pNext; |
︙ | ︙ | |||
767 768 769 770 771 772 773 | /* ** Drop every cache entry whose page number is greater than "pgno". */ void sqlite3PcacheTruncate(PCache *pCache, Pgno pgno){ PgHdr *p, *pNext; PgHdr *pDirty = pCache->pDirty; assert( pCache->iInUseDB ); | | | 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 | /* ** Drop every cache entry whose page number is greater than "pgno". */ void sqlite3PcacheTruncate(PCache *pCache, Pgno pgno){ PgHdr *p, *pNext; PgHdr *pDirty = pCache->pDirty; assert( pCache->iInUseDB ); pcacheEnterGlobal(); for(p=pCache->pClean; p||pDirty; p=pNext){ if( !p ){ p = pDirty; pDirty = 0; } pNext = p->pNext; if( p->pgno>pgno ){ |
︙ | ︙ | |||
792 793 794 795 796 797 798 | /* If there are references to the page, it cannot be freed. In this ** case, zero the page content instead. */ memset(p->pData, 0, pCache->szPage); } } } | | | | | 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 | /* If there are references to the page, it cannot be freed. In this ** case, zero the page content instead. */ memset(p->pData, 0, pCache->szPage); } } } pcacheExitGlobal(); } /* ** Close a cache. */ void sqlite3PcacheClose(PCache *pCache){ assert( pCache->iInUseDB==1 ); /* Free all the pages used by this pager and remove them from the LRU ** list. This requires the protection of the MUTEX_STATIC_LRU mutex. */ pcacheEnterGlobal(); pcacheClear(pCache); if( pCache->bPurgeable ){ pcache.mxPagePurgeable -= pCache->nMax; } sqlite3_free(pCache->apHash); pcacheExitGlobal(); /* Now remove the pager-cache structure itself from the list of ** all such structures headed by pcache.pAll. This required the ** MUTEX_STATIC_MEM2 mutex. */ sqlite3_mutex_enter(pcache.mutex_mem2); assert(pCache==pcache.pAll || pCache->pPrevAll); |
︙ | ︙ | |||
861 862 863 864 865 866 867 | /* ** Commit a change previously preserved. */ void sqlite3PcacheCommit(PCache *pCache, int idJournal){ PgHdr *p; assert( pCache->iInUseDB ); | | | | | | 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 | /* ** Commit a change previously preserved. */ void sqlite3PcacheCommit(PCache *pCache, int idJournal){ PgHdr *p; assert( pCache->iInUseDB ); pcacheEnterGlobal(); /* Mutex is required to call pcacheFree() */ for(p=pCache->pDirty; p; p=p->pNext){ if( p->apSave[idJournal] ){ pcacheFree(p->apSave[idJournal]); p->apSave[idJournal] = 0; } } pcacheExitGlobal(); } /* ** Rollback a change previously preserved. */ void sqlite3PcacheRollback(PCache *pCache, int idJournal){ PgHdr *p; int sz; assert( pCache->iInUseDB ); pcacheEnterGlobal(); /* Mutex is required to call pcacheFree() */ sz = pCache->szPage; for(p=pCache->pDirty; p; p=p->pNext){ if( p->apSave[idJournal] ){ memcpy(p->pData, p->apSave[idJournal], sz); pcacheFree(p->apSave[idJournal]); p->apSave[idJournal] = 0; } } pcacheExitGlobal(); } /* ** Assert flags settings on all pages. Debugging only. */ void sqlite3PcacheAssertFlags(PCache *pCache, int trueMask, int falseMask){ PgHdr *p; |
︙ | ︙ | |||
912 913 914 915 916 917 918 | /* ** Discard the contents of the cache. */ int sqlite3PcacheClear(PCache *pCache){ assert( pCache->iInUseDB ); assert(pCache->nRef==0); | | | | 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 | /* ** Discard the contents of the cache. */ int sqlite3PcacheClear(PCache *pCache){ assert( pCache->iInUseDB ); assert(pCache->nRef==0); pcacheEnterGlobal(); pcacheClear(pCache); pcacheExitGlobal(); return SQLITE_OK; } /* ** Merge two lists of pages connected by pDirty and in pgno order. ** Do not both fixing the pPrevDirty pointers. */ |
︙ | ︙ | |||
1096 1097 1098 1099 1100 1101 1102 | ** Set the suggested cache-size value. */ void sqlite3PcacheSetCachesize(PCache *pCache, int mxPage){ if( mxPage<10 ){ mxPage = 10; } if( pCache->bPurgeable ){ | | | | 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 | ** Set the suggested cache-size value. */ void sqlite3PcacheSetCachesize(PCache *pCache, int mxPage){ if( mxPage<10 ){ mxPage = 10; } if( pCache->bPurgeable ){ pcacheEnterGlobal(); pcache.mxPagePurgeable -= pCache->nMax; pcache.mxPagePurgeable += mxPage; pcacheExitGlobal(); } pCache->nMax = mxPage; } /* ** Lock a pager-cache. */ |
︙ | ︙ | |||
1125 1126 1127 1128 1129 1130 1131 | /* ** Unlock a pager-cache. */ void sqlite3PcacheUnlock(PCache *pCache){ pCache->iInUseDB--; assert( pCache->iInUseDB>=0 ); } | < | 1137 1138 1139 1140 1141 1142 1143 | /* ** Unlock a pager-cache. */ void sqlite3PcacheUnlock(PCache *pCache){ pCache->iInUseDB--; assert( pCache->iInUseDB>=0 ); } |