Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Revise logging integration between the interop assembly and the managed assembly; by default, the native logging callback is now used only when running on the .NET Compact Framework. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f1261d71fd60ae6e3c012c4d91740eb0 |
User & Date: | mistachkin 2012-10-27 04:12:04 |
Context
2012-10-27
| ||
17:43 | Seal the CriticalHandle derived classes and add WasReleasedOk method for accurate backup handle count tracking. Report resource counts for the backup, threading, and stress tests. check-in: b4cd72edae user: mistachkin tags: trunk | |
04:12 | Revise logging integration between the interop assembly and the managed assembly; by default, the native logging callback is now used only when running on the .NET Compact Framework. check-in: f1261d71fd user: mistachkin tags: trunk | |
03:05 | Fix typo in diagnostic message and update version history docs. check-in: de2c4e51b2 user: mistachkin tags: trunk | |
Changes
Changes to SQLite.Interop/src/win/interop.c.
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
...
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
|
sqlite3_mutex_leave(db->mutex); ret = sqlite3_close(db); } return ret; #endif } SQLITE_API int WINAPI sqlite3_open_interop(const char *filename, int flags, sqlite3 **ppdb) { int ret; #if defined(INTEROP_LOG) if( !logConfigured ){ ret = sqlite3_config(SQLITE_CONFIG_LOG, sqlite3InteropLogCallback, 0); if( ret==SQLITE_OK ){ logConfigured = 1; }else{ sqlite3InteropDebug("sqlite3_open_interop(): sqlite3_config(SQLITE_CONFIG_LOG) returned %d.\n", ret); } } #endif #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_OPEN) sqlite3InteropDebug("sqlite3_open_interop(): calling sqlite3_open_v2(\"%s\", %d, %p)...\n", filename, flags, ppdb); #endif ret = sqlite3_open_v2(filename, ppdb, flags, NULL); ................................................................................ return ret; } SQLITE_API int WINAPI sqlite3_open16_interop(const char *filename, int flags, sqlite3 **ppdb) { int ret; #if defined(INTEROP_LOG) if( !logConfigured ){ ret = sqlite3_config(SQLITE_CONFIG_LOG, sqlite3InteropLogCallback, 0); if( ret==SQLITE_OK ){ logConfigured = 1; }else{ sqlite3InteropDebug("sqlite3_open16_interop(): sqlite3_config(SQLITE_CONFIG_LOG) returned %d.\n", ret); } } #endif #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_OPEN16) sqlite3InteropDebug("sqlite3_open16_interop(): calling sqlite3_open_interop(\"%s\", %d, %p)...\n", filename, flags, ppdb); #endif ret = sqlite3_open_interop(filename, flags, ppdb); #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_OPEN16) |
>
|
<
<
|
>
>
>
>
>
>
>
>
<
<
<
<
<
<
<
<
<
<
<
|
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
...
231
232
233
234
235
236
237
238
239
240
241
242
243
244
|
sqlite3_mutex_leave(db->mutex); ret = sqlite3_close(db); } return ret; #endif } #if defined(INTEROP_LOG) SQLITE_API int WINAPI sqlite3_config_log_interop() { int ret; if( !logConfigured ){ ret = sqlite3_config(SQLITE_CONFIG_LOG, sqlite3InteropLogCallback, 0); if( ret==SQLITE_OK ){ logConfigured = 1; }else{ sqlite3InteropDebug("sqlite3_config_log_interop(): sqlite3_config(SQLITE_CONFIG_LOG) returned %d.\n", ret); } }else{ ret = SQLITE_OK; } return ret; } #endif SQLITE_API int WINAPI sqlite3_open_interop(const char *filename, int flags, sqlite3 **ppdb) { int ret; #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_OPEN) sqlite3InteropDebug("sqlite3_open_interop(): calling sqlite3_open_v2(\"%s\", %d, %p)...\n", filename, flags, ppdb); #endif ret = sqlite3_open_v2(filename, ppdb, flags, NULL); ................................................................................ return ret; } SQLITE_API int WINAPI sqlite3_open16_interop(const char *filename, int flags, sqlite3 **ppdb) { int ret; #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_OPEN16) sqlite3InteropDebug("sqlite3_open16_interop(): calling sqlite3_open_interop(\"%s\", %d, %p)...\n", filename, flags, ppdb); #endif ret = sqlite3_open_interop(filename, flags, ppdb); #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_OPEN16) |
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
24 25 26 27 28 29 30 31 32 33 34 35 36 37 |
{ #if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY UnsafeNativeMethods.Initialize(); #endif #if !PLATFORM_COMPACTFRAMEWORK SQLiteLog.Initialize(); #endif string version = #if NET_40 || NET_45 "4.0.0.0"; #else "3.5.0.0"; |
> > > > > > |
24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 |
{ #if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY UnsafeNativeMethods.Initialize(); #endif #if !PLATFORM_COMPACTFRAMEWORK SQLiteLog.Initialize(); #elif INTEROP_LOG if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok) { UnsafeNativeMethods.sqlite3_log( SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized.")); } #endif string version = #if NET_40 || NET_45 "4.0.0.0"; #else "3.5.0.0"; |
Changes to System.Data.SQLite/SQLiteConnection.cs.
476 477 478 479 480 481 482 483 484 485 486 487 488 489 |
_versionNumber = SQLite3.SQLiteVersionNumber; if (_versionNumber >= 3007014) SQLiteConnectionHandle.closeConnection = SQLiteBase.CloseConnectionV2; } } #endif #endif _flags = SQLiteConnectionFlags.Default; _connectionState = ConnectionState.Closed; _connectionString = ""; //_commandList = new List<WeakReference>(); |
> > > > > > |
476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 |
_versionNumber = SQLite3.SQLiteVersionNumber; if (_versionNumber >= 3007014) SQLiteConnectionHandle.closeConnection = SQLiteBase.CloseConnectionV2; } } #endif #elif INTEROP_LOG if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok) { UnsafeNativeMethods.sqlite3_log( SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized.")); } #endif _flags = SQLiteConnectionFlags.Default; _connectionState = ConnectionState.Closed; _connectionString = ""; //_commandList = new List<WeakReference>(); |
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
584 585 586 587 588 589 590 591 592 593 594 595 596 597 |
[DllImport(SQLITE_DLL)] internal static extern IntPtr sqlite3_value_text_interop(IntPtr p, out int len); [DllImport(SQLITE_DLL)] internal static extern IntPtr sqlite3_value_text16_interop(IntPtr p, out int len); #endif // !SQLITE_STANDARD #endregion // These functions add existing functionality on top of SQLite and require a little effort to // get working when using the standard SQLite library. |
> > > > |
584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 |
[DllImport(SQLITE_DLL)] internal static extern IntPtr sqlite3_value_text_interop(IntPtr p, out int len); [DllImport(SQLITE_DLL)] internal static extern IntPtr sqlite3_value_text16_interop(IntPtr p, out int len); #if INTEROP_LOG [DllImport(SQLITE_DLL)] internal static extern SQLiteErrorCode sqlite3_config_log_interop(); #endif #endif // !SQLITE_STANDARD #endregion // These functions add existing functionality on top of SQLite and require a little effort to // get working when using the standard SQLite library. |