/ Check-in [37853665]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Adjust the winMemInit return code handling used when resetting the Win32 native heap.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | win32heap
Files: files | file ages | folders
SHA1:37853665e75fc92b4d15e6db0b3346722527e799
User & Date: mistachkin 2013-11-08 18:52:45
Context
2013-11-08
19:51
Disable use of HeapCompact on Windows CE as it is not available on all versions. check-in: e9694b87 user: mistachkin tags: win32heap
18:52
Adjust the winMemInit return code handling used when resetting the Win32 native heap. check-in: 37853665 user: mistachkin tags: win32heap
18:37
Minor corrections to logging for sqlite3_win32_compact_heap(). check-in: 71347d02 user: mistachkin tags: win32heap
Changes
Hide Diffs Unified Diffs Show Whitespace Changes Patch

Changes to src/os_win.c.

1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
    ** At this point, there should be no outstanding memory allocations on
    ** the heap.  Also, since both the master and memsys locks are currently
    ** being held by us, no other function (i.e. from another thread) should
    ** be able to even access the heap.  Attempt to destroy and recreate our
    ** isolated Win32 native heap now.
    */
    winMemShutdown(winMemGetDataPtr());
    winMemInit(winMemGetDataPtr());
    rc = SQLITE_OK;
  }else{
    /*
    ** The Win32 native heap cannot be modified because it may be in use.
    */
    rc = SQLITE_BUSY;
  }
  sqlite3_mutex_leave(pMem);







|
<







1149
1150
1151
1152
1153
1154
1155
1156

1157
1158
1159
1160
1161
1162
1163
    ** At this point, there should be no outstanding memory allocations on
    ** the heap.  Also, since both the master and memsys locks are currently
    ** being held by us, no other function (i.e. from another thread) should
    ** be able to even access the heap.  Attempt to destroy and recreate our
    ** isolated Win32 native heap now.
    */
    winMemShutdown(winMemGetDataPtr());
    rc = winMemInit(winMemGetDataPtr());

  }else{
    /*
    ** The Win32 native heap cannot be modified because it may be in use.
    */
    rc = SQLITE_BUSY;
  }
  sqlite3_mutex_leave(pMem);