System.Data.SQLite: Check-in [c90bf3896e]

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

Overview

Comment:	Support the new SQLITE_FCNTL_WIN32_AV_RETRY file control. Add interop project files for static linking to the VC runtime.
Downloads:	Tarball \| ZIP archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	c90bf3896eb85f55e21058ded52cc44f671f4000
User & Date:	mistachkin 2011-07-13 16:35:05.613

Context

2011-07-13
17:23		Improve and correct embedded doc comments for the new SetAvRetry method. check-in: dbdcdae6ae user: mistachkin tags: trunk
16:35		Support the new SQLITE_FCNTL_WIN32_AV_RETRY file control. Add interop project files for static linking to the VC runtime. check-in: c90bf3896e user: mistachkin tags: trunk
2011-07-12
15:21		Update SQLite interop assembly code to latest trunk changes. check-in: 01781df775 user: mistachkin tags: trunk

Changes

Added SQLite.Interop/SQLite.Interop.2008.static.vcproj.

Added SQLite.Interop/SQLite.Interop.2010.static.vcxproj.

Changes to SQLite.Interop/src/core/sqlite3.c.

Changes to SQLite.Interop/src/core/sqlite3.h.

Changes to System.Data.SQLite/SQLite3.cs.

Changes to System.Data.SQLite/SQLiteBase.cs.

Changes to System.Data.SQLite/SQLiteConnection.cs.

Changes to System.Data.SQLite/UnsafeNativeMethods.cs.

Changes to Tests/basic.eagle.

︙			︙
648 649 650 651 652 653 654 ~~655~~ 656 657 658 659 660 661 662	See also: [sqlite3_libversion()], [sqlite3_libversion_number()], [sqlite3_sourceid()], [sqlite_version()] and [sqlite_source_id()]. / #define SQLITE_VERSION "3.7.7" #define SQLITE_VERSION_NUMBER 3007007 ~~#define SQLITE_SOURCE_ID "2011-07-12 14:38~~:25 02~~07fd9~~b0c0f6ba~~a3c2~~cb8ba588ad585507848b3~~"~~ / CAPI3REF: Run-Time Library Version Numbers KEYWORDS: sqlite3_version, sqlite3_sourceid These interfaces provide the same information as the [SQLITE_VERSION], ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros	\|	648 649 650 651 652 653 654 655 656 657 658 659 660 661 662	See also: [sqlite3_libversion()], [sqlite3_libversion_number()], [sqlite3_sourceid()], [sqlite_version()] and [sqlite_source_id()]. / #define SQLITE_VERSION "3.7.7" #define SQLITE_VERSION_NUMBER 3007007 #define SQLITE_SOURCE_ID "2011-07-13 16:03:46 7aaf0a6ae1238129e07eb191ca3f043df445e27a" / CAPI3REF: Run-Time Library Version Numbers KEYWORDS: sqlite3_version, sqlite3_sourceid These interfaces provide the same information as the [SQLITE_VERSION], ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
︙			︙
1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 ~~1296~~ 1297 1298 1299 1300 1301 1302 1303	when the database connection has [PRAGMA synchronous] set to OFF.)^ Some specialized VFSes need this signal in order to operate correctly when [PRAGMA synchronous \| PRAGMA synchronous=OFF] is set, but most VFSes do not need this signal and should silently ignore this opcode. Applications should not call [sqlite3_file_control()] with this opcode as doing so may disrupt the operation of the specialized VFSes ** that do require it. / #define SQLITE_FCNTL_LOCKSTATE 1 #define SQLITE_GET_LOCKPROXYFILE 2 #define SQLITE_SET_LOCKPROXYFILE 3 #define SQLITE_LAST_ERRNO 4 #define SQLITE_FCNTL_SIZE_HINT 5 #define SQLITE_FCNTL_CHUNK_SIZE 6 #define SQLITE_FCNTL_FILE_POINTER 7 #define SQLITE_FCNTL_SYNC_OMITTED 8 / CAPI3REF: Mutex Handle The mutex module within SQLite defines [sqlite3_mutex] to be an abstract type for a mutex object. The SQLite core never looks ** at the internal representation of an [sqlite3_mutex]. It only	> > > > > > > > > > > > > > > > > \|	1280 1281 1282 1283 1284 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 1313 1314 1315 1316 1317 1318 1319 1320	when the database connection has [PRAGMA synchronous] set to OFF.)^ Some specialized VFSes need this signal in order to operate correctly when [PRAGMA synchronous \| PRAGMA synchronous=OFF] is set, but most VFSes do not need this signal and should silently ignore this opcode. Applications should not call [sqlite3_file_control()] with this opcode as doing so may disrupt the operation of the specialized VFSes that do require it. ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic retry counts and intervals for certain disk I/O operations for the windows [VFS] in order to work to provide robustness against anti-virus programs. By default, the windows VFS will retry file read, file write, and file delete opertions up to 10 times, with a delay of 25 milliseconds before the first retry and with the delay increasing by an additional 25 milliseconds with each subsequent retry. This opcode allows those to values (10 retries and 25 milliseconds of delay) to be adjusted. The values are changed for all database connections within the same process. The argument is a pointer to an array of two integers where the first integer i the new retry count and the second integer is the delay. If either integer is negative, then the setting is not changed but instead the prior value of that setting is written into the array entry, allowing the current retry settings to be interrogated. The zDbName parameter is ignored. / #define SQLITE_FCNTL_LOCKSTATE 1 #define SQLITE_GET_LOCKPROXYFILE 2 #define SQLITE_SET_LOCKPROXYFILE 3 #define SQLITE_LAST_ERRNO 4 #define SQLITE_FCNTL_SIZE_HINT 5 #define SQLITE_FCNTL_CHUNK_SIZE 6 #define SQLITE_FCNTL_FILE_POINTER 7 #define SQLITE_FCNTL_SYNC_OMITTED 8 #define SQLITE_FCNTL_WIN32_AV_RETRY 9 / CAPI3REF: Mutex Handle The mutex module within SQLite defines [sqlite3_mutex] to be an abstract type for a mutex object. The SQLite core never looks ** at the internal representation of an [sqlite3_mutex]. It only
︙			︙
31837 31838 31839 31840 31841 31842 31843 31844 31845 31846 31847 31848 31849 31850 31851 ~~31852~~ 31853 31854 31855 31856 31857 31858 ~~31859~~ 31860 31861 31862 31863 31864 31865 31866 31867 31868 31869 31870 31871 31872 ~~31873~~ 31874 31875 31876 31877 31878 31879 31880	/ #ifndef SQLITE_WIN32_IOERR_RETRY # define SQLITE_WIN32_IOERR_RETRY 10 #endif #ifndef SQLITE_WIN32_IOERR_RETRY_DELAY # define SQLITE_WIN32_IOERR_RETRY_DELAY 25 #endif / If a ReadFile() or WriteFile() error occurs, invoke this routine to see if it should be retried. Return TRUE to retry. Return FALSE ** to give up with an error. / static int retryIoerr(int pnRetry){ DWORD e; ~~if( pnRetry>=~~SQLITE_WIN~~32_IOER~~R_RETRY~~ ){~~ return 0; } e = GetLastError(); if( e==ERROR_ACCESS_DENIED \|\| e==ERROR_LOCK_VIOLATION \|\| e==ERROR_SHARING_VIOLATION ){ ~~Sleep(~~SQLITE_WIN~~32_IOER~~R_RETRY_~~D~~ELAY~~(1+pnRetry));~~ ++pnRetry; return 1; } return 0; } /* ** Log a I/O error retry episode. / static void logIoerr(int nRetry){ if( nRetry ){ sqlite3_log(SQLITE_IOERR, "delayed %dms for lock/sharing conflict", ~~~~SQLITE_WIN~~32_IOER~~R_RETRY_~~D~~ELAY~~nRetry(nRetry+1)/2~~ ); } } #if SQLITE_OS_WINCE /********************************************************************** This section contains code for WinCE only.	> > \| \| \|	31854 31855 31856 31857 31858 31859 31860 31861 31862 31863 31864 31865 31866 31867 31868 31869 31870 31871 31872 31873 31874 31875 31876 31877 31878 31879 31880 31881 31882 31883 31884 31885 31886 31887 31888 31889 31890 31891 31892 31893 31894 31895 31896 31897 31898 31899	/ #ifndef SQLITE_WIN32_IOERR_RETRY # define SQLITE_WIN32_IOERR_RETRY 10 #endif #ifndef SQLITE_WIN32_IOERR_RETRY_DELAY # define SQLITE_WIN32_IOERR_RETRY_DELAY 25 #endif static int win32IoerrRetry = SQLITE_WIN32_IOERR_RETRY; static int win32IoerrRetryDelay = SQLITE_WIN32_IOERR_RETRY_DELAY; / If a ReadFile() or WriteFile() error occurs, invoke this routine to see if it should be retried. Return TRUE to retry. Return FALSE ** to give up with an error. / static int retryIoerr(int pnRetry){ DWORD e; if( pnRetry>=win32IoerrRetry ){ return 0; } e = GetLastError(); if( e==ERROR_ACCESS_DENIED \|\| e==ERROR_LOCK_VIOLATION \|\| e==ERROR_SHARING_VIOLATION ){ Sleep(win32IoerrRetryDelay(1+pnRetry)); ++pnRetry; return 1; } return 0; } /* ** Log a I/O error retry episode. / static void logIoerr(int nRetry){ if( nRetry ){ sqlite3_log(SQLITE_IOERR, "delayed %dms for lock/sharing conflict", win32IoerrRetryDelaynRetry(nRetry+1)/2 ); } } #if SQLITE_OS_WINCE /********************************************************************** This section contains code for WinCE only.
︙			︙
32777 32778 32779 32780 32781 32782 32783 32784 32785 32786 32787 32788 32789 32790	SimulateIOErrorBenign(1); winTruncate(id, sz); SimulateIOErrorBenign(0); return SQLITE_OK; } case SQLITE_FCNTL_SYNC_OMITTED: { return SQLITE_OK; } } return SQLITE_NOTFOUND; } /* ** Return the sector size in bytes of the underlying block device for	> > > > > > > > > > > > > >	32796 32797 32798 32799 32800 32801 32802 32803 32804 32805 32806 32807 32808 32809 32810 32811 32812 32813 32814 32815 32816 32817 32818 32819 32820 32821 32822 32823	SimulateIOErrorBenign(1); winTruncate(id, sz); SimulateIOErrorBenign(0); return SQLITE_OK; } case SQLITE_FCNTL_SYNC_OMITTED: { return SQLITE_OK; } case SQLITE_FCNTL_WIN32_AV_RETRY: { int a = (int)pArg; if( a[0]>0 ){ win32IoerrRetry = a[0]; }else{ a[0] = win32IoerrRetry; } if( a[1]>0 ){ win32IoerrRetryDelay = a[1]; }else{ a[1] = win32IoerrRetryDelay; } return SQLITE_OK; } } return SQLITE_NOTFOUND; } /* ** Return the sector size in bytes of the underlying block device for
︙			︙

︙			︙
105 106 107 108 109 110 111 ~~112~~ 113 114 115 116 117 118 119	See also: [sqlite3_libversion()], [sqlite3_libversion_number()], [sqlite3_sourceid()], [sqlite_version()] and [sqlite_source_id()]. / #define SQLITE_VERSION "3.7.7" #define SQLITE_VERSION_NUMBER 3007007 ~~#define SQLITE_SOURCE_ID "2011-07-12 14:38~~:25 02~~07fd9~~b0c0f6ba~~a3c2~~cb8ba588ad585507848b3~~"~~ / CAPI3REF: Run-Time Library Version Numbers KEYWORDS: sqlite3_version, sqlite3_sourceid These interfaces provide the same information as the [SQLITE_VERSION], ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros	\|	105 106 107 108 109 110 111 112 113 114 115 116 117 118 119	See also: [sqlite3_libversion()], [sqlite3_libversion_number()], [sqlite3_sourceid()], [sqlite_version()] and [sqlite_source_id()]. / #define SQLITE_VERSION "3.7.7" #define SQLITE_VERSION_NUMBER 3007007 #define SQLITE_SOURCE_ID "2011-07-13 16:03:46 7aaf0a6ae1238129e07eb191ca3f043df445e27a" / CAPI3REF: Run-Time Library Version Numbers KEYWORDS: sqlite3_version, sqlite3_sourceid These interfaces provide the same information as the [SQLITE_VERSION], ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
︙			︙
737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 ~~753~~ 754 755 756 757 758 759 760	when the database connection has [PRAGMA synchronous] set to OFF.)^ Some specialized VFSes need this signal in order to operate correctly when [PRAGMA synchronous \| PRAGMA synchronous=OFF] is set, but most VFSes do not need this signal and should silently ignore this opcode. Applications should not call [sqlite3_file_control()] with this opcode as doing so may disrupt the operation of the specialized VFSes ** that do require it. / #define SQLITE_FCNTL_LOCKSTATE 1 #define SQLITE_GET_LOCKPROXYFILE 2 #define SQLITE_SET_LOCKPROXYFILE 3 #define SQLITE_LAST_ERRNO 4 #define SQLITE_FCNTL_SIZE_HINT 5 #define SQLITE_FCNTL_CHUNK_SIZE 6 #define SQLITE_FCNTL_FILE_POINTER 7 #define SQLITE_FCNTL_SYNC_OMITTED 8 / CAPI3REF: Mutex Handle The mutex module within SQLite defines [sqlite3_mutex] to be an abstract type for a mutex object. The SQLite core never looks ** at the internal representation of an [sqlite3_mutex]. It only	> > > > > > > > > > > > > > > > > \|	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 764 765 766 767 768 769 770 771 772 773 774 775 776 777	when the database connection has [PRAGMA synchronous] set to OFF.)^ Some specialized VFSes need this signal in order to operate correctly when [PRAGMA synchronous \| PRAGMA synchronous=OFF] is set, but most VFSes do not need this signal and should silently ignore this opcode. Applications should not call [sqlite3_file_control()] with this opcode as doing so may disrupt the operation of the specialized VFSes that do require it. ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic retry counts and intervals for certain disk I/O operations for the windows [VFS] in order to work to provide robustness against anti-virus programs. By default, the windows VFS will retry file read, file write, and file delete opertions up to 10 times, with a delay of 25 milliseconds before the first retry and with the delay increasing by an additional 25 milliseconds with each subsequent retry. This opcode allows those to values (10 retries and 25 milliseconds of delay) to be adjusted. The values are changed for all database connections within the same process. The argument is a pointer to an array of two integers where the first integer i the new retry count and the second integer is the delay. If either integer is negative, then the setting is not changed but instead the prior value of that setting is written into the array entry, allowing the current retry settings to be interrogated. The zDbName parameter is ignored. / #define SQLITE_FCNTL_LOCKSTATE 1 #define SQLITE_GET_LOCKPROXYFILE 2 #define SQLITE_SET_LOCKPROXYFILE 3 #define SQLITE_LAST_ERRNO 4 #define SQLITE_FCNTL_SIZE_HINT 5 #define SQLITE_FCNTL_CHUNK_SIZE 6 #define SQLITE_FCNTL_FILE_POINTER 7 #define SQLITE_FCNTL_SYNC_OMITTED 8 #define SQLITE_FCNTL_WIN32_AV_RETRY 9 / CAPI3REF: Mutex Handle The mutex module within SQLite defines [sqlite3_mutex] to be an abstract type for a mutex object. The SQLite core never looks ** at the internal representation of an [sqlite3_mutex]. It only
︙			︙

︙			︙
148 149 150 151 152 153 154 155 156 157 158 159 160 161	/// <description>N</description> /// <description>False</description> /// </item> /// </list> /// </remarks> public sealed partial class SQLiteConnection : DbConnection, ICloneable { private const string _dataDirectory = "\|DataDirectory\|"; private const string _masterdb = "sqlite_master"; private const string _tempmasterdb = "sqlite_temp_master"; /// <summary> /// State of the current connection /// </summary>	> >	148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163	/// <description>N</description> /// <description>False</description> /// </item> /// </list> /// </remarks> public sealed partial class SQLiteConnection : DbConnection, ICloneable { private const int SQLITE_FCNTL_WIN32_AV_RETRY = 9; private const string _dataDirectory = "\|DataDirectory\|"; private const string _masterdb = "sqlite_master"; private const string _tempmasterdb = "sqlite_temp_master"; /// <summary> /// State of the current connection /// </summary>
︙			︙
1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097	throw new InvalidOperationException("Password can only be set before the database is opened."); if (databasePassword != null) if (databasePassword.Length == 0) databasePassword = null; _password = databasePassword; } /// <summary> /// Expand the filename of the data source, resolving the \|DataDirectory\| macro as appropriate. /// </summary> /// <param name="sourceFile">The database filename to expand</param> /// <returns>The expanded path and filename of the filename</returns> private string ExpandFileName(string sourceFile)	> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >	1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 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 1136 1137 1138 1139	throw new InvalidOperationException("Password can only be set before the database is opened."); if (databasePassword != null) if (databasePassword.Length == 0) databasePassword = null; _password = databasePassword; } /// <summary> /// Queries or modifies the number of retries or the retry interval (in milliseconds) for /// certain I/O operations that may fail due to anti-virus software. /// </summary> /// <param name="count">The number of times to retry the I/O operation.</param> /// <param name="interval">The number of milliseconds to wait before retrying the I/O operation.</param> /// <returns></returns> public int SetAvRetry(ref int count, ref int interval) { if (_connectionState != ConnectionState.Open) throw new InvalidOperationException( "Database must be opened before changing the AV retry parameters."); int rc; IntPtr pArg = IntPtr.Zero; try { pArg = Marshal.AllocHGlobal(sizeof(int) * 2); Marshal.WriteInt32(pArg, 0, count); Marshal.WriteInt32(pArg, sizeof(int), interval); rc = _sql.FileControl(null, SQLITE_FCNTL_WIN32_AV_RETRY, pArg); if (rc == 0) { count = Marshal.ReadInt32(pArg, 0); interval = Marshal.ReadInt32(pArg, sizeof(int)); } } finally { if (pArg != IntPtr.Zero) Marshal.FreeHGlobal(pArg); } return rc; } /// <summary> /// Expand the filename of the data source, resolving the \|DataDirectory\| macro as appropriate. /// </summary> /// <param name="sourceFile">The database filename to expand</param> /// <returns>The expanded path and filename of the filename</returns> private string ExpandFileName(string sourceFile)
︙			︙