Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Revise how the SQLiteLog class is used in the default debug builds (i.e. when INTEROP_LOG is enabled). |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
1affdac1446f77fbd6d9b773abd214b6 |
| User & Date: | mistachkin 2014-05-27 05:33:05 |
Context
|
2014-05-27
| ||
| 18:34 | Rename the script used for testing builds for Windows CE 200x. check-in: 32f6c0410c user: mistachkin tags: trunk | |
| 05:34 | Merge updates from trunk. check-in: e7d0d8c183 user: mistachkin tags: tkt-3c00ec5b52 | |
| 05:33 | Revise how the SQLiteLog class is used in the default debug builds (i.e. when INTEROP_LOG is enabled). check-in: 1affdac144 user: mistachkin tags: trunk | |
| 05:31 | Revise the file names for debug setup packages. check-in: 3993817e35 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
#if INTEROP_LOG
if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(
SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
}
#else
SQLiteLog.Initialize();
#endif
string version =
#if NET_40 || NET_45 || NET_451
"4.0.0.0";
#else
"3.5.0.0";
#endif
|
| | | |
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
#if INTEROP_LOG
if (UnsafeNativeMethods.sqlite3_config_log_interop() == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(
SQLiteErrorCode.Ok, SQLiteConvert.ToUTF8("logging initialized."));
}
#endif
SQLiteLog.Initialize();
string version =
#if NET_40 || NET_45 || NET_451
"4.0.0.0";
#else
"3.5.0.0";
#endif
|
Changes to System.Data.SQLite/SQLiteBase.cs.
1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 |
LogAll = LogPrepare | LogPreBind | LogBind |
LogCallbackException | LogBackup | LogModuleError |
LogModuleException,
/// <summary>
/// The default extra flags for new connections.
/// </summary>
Default = LogCallbackException | LogModuleException
}
// These are the options to the internal sqlite3_config call.
internal enum SQLiteConfigOpsEnum
{
SQLITE_CONFIG_NONE = 0, // nil
SQLITE_CONFIG_SINGLETHREAD = 1, // nil
|
| > > > > > |
1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 |
LogAll = LogPrepare | LogPreBind | LogBind |
LogCallbackException | LogBackup | LogModuleError |
LogModuleException,
/// <summary>
/// The default extra flags for new connections.
/// </summary>
Default = LogCallbackException | LogModuleException,
/// <summary>
/// The default extra flags for new connections with all logging enabled.
/// </summary>
DefaultAndLogAll = Default | LogAll
}
// These are the options to the internal sqlite3_config call.
internal enum SQLiteConfigOpsEnum
{
SQLITE_CONFIG_NONE = 0, // nil
SQLITE_CONFIG_SINGLETHREAD = 1, // nil
|
Changes to System.Data.SQLite/SQLiteConnection.cs.
587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 |
/// </param>
public SQLiteConnection(string connectionString, bool parseViaFramework)
{
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.Initialize();
#endif
#if !INTEROP_LOG
SQLiteLog.Initialize();
#endif
#if !PLATFORM_COMPACTFRAMEWORK && !INTEROP_LEGACY_CLOSE && SQLITE_STANDARD
//
// NOTE: Check if the sqlite3_close_v2() native API should be available
// to use. This must be done dynamically because the delegate set
// here is used by the SQLiteConnectionHandle class, which is a
// CriticalHandle derived class (i.e. protected by a constrained
|
< < |
587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 |
/// </param>
public SQLiteConnection(string connectionString, bool parseViaFramework)
{
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.Initialize();
#endif
SQLiteLog.Initialize();
#if !PLATFORM_COMPACTFRAMEWORK && !INTEROP_LEGACY_CLOSE && SQLITE_STANDARD
//
// NOTE: Check if the sqlite3_close_v2() native API should be available
// to use. This must be done dynamically because the delegate set
// here is used by the SQLiteConnectionHandle class, which is a
// CriticalHandle derived class (i.e. protected by a constrained
|
Changes to System.Data.SQLite/SQLiteLog.cs.
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 ... 173 174 175 176 177 178 179 180 181 182 183 184 185 186 ... 199 200 201 202 203 204 205 206 207 208 209 210 211 212 ... 238 239 240 241 242 243 244 245 246 247 248 249 250 251 ... 269 270 271 272 273 274 275 276 277 278 279 280 281 282 |
///////////////////////////////////////////////////////////////////////
/// <summary>
/// Member variable to store the application log handler to call.
/// </summary>
private static event SQLiteLogEventHandler _handlers;
///////////////////////////////////////////////////////////////////////
/// <summary>
/// The default log event handler.
/// </summary>
private static SQLiteLogEventHandler _defaultHandler;
///////////////////////////////////////////////////////////////////////
/// <summary>
/// The log callback passed to native SQLite engine. This must live
/// as long as the SQLite library has a pointer to it.
/// </summary>
private static SQLiteLogCallback _callback;
///////////////////////////////////////////////////////////////////////
/// <summary>
/// The base SQLite object to interop with.
/// </summary>
private static SQLiteBase _sql;
///////////////////////////////////////////////////////////////////////
/// <summary>
/// This will be non-zero if logging is currently enabled.
/// </summary>
private static bool _enabled;
................................................................................
if (_domainUnload == null)
{
_domainUnload = new EventHandler(DomainUnload);
AppDomain.CurrentDomain.DomainUnload += _domainUnload;
}
#endif
//
// NOTE: Create an instance of the SQLite wrapper class.
//
if (_sql == null)
{
_sql = new SQLite3(
SQLiteDateFormats.Default, DateTimeKind.Unspecified,
................................................................................
SQLiteErrorCode rc = _sql.SetLogCallback(_callback);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc,
"Failed to initialize logging.");
}
//
// NOTE: Logging is enabled by default.
//
_enabled = true;
//
................................................................................
//
// NOTE: Disable logging. If necessary, it can be re-enabled
// later by the Initialize method.
//
_enabled = false;
//
// BUGBUG: This will cause serious problems if other AppDomains
// have any open SQLite connections; however, there is
// currently no way around this limitation.
//
if (_sql != null)
{
................................................................................
// cannot allow native code to refer to a delegate that
// has been garbage collected.
//
if (_callback != null)
{
_callback = null;
}
//
// NOTE: Remove the event handler for the DomainUnload event
// that we added earlier.
//
if (_domainUnload != null)
{
|
< > > > > > > |
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 ... 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 ... 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 ... 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 ... 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 |
///////////////////////////////////////////////////////////////////////
/// <summary>
/// Member variable to store the application log handler to call.
/// </summary>
private static event SQLiteLogEventHandler _handlers;
///////////////////////////////////////////////////////////////////////
/// <summary>
/// The default log event handler.
/// </summary>
private static SQLiteLogEventHandler _defaultHandler;
///////////////////////////////////////////////////////////////////////
#if !INTEROP_LOG
/// <summary>
/// The log callback passed to native SQLite engine. This must live
/// as long as the SQLite library has a pointer to it.
/// </summary>
private static SQLiteLogCallback _callback;
///////////////////////////////////////////////////////////////////////
/// <summary>
/// The base SQLite object to interop with.
/// </summary>
private static SQLiteBase _sql;
#endif
///////////////////////////////////////////////////////////////////////
/// <summary>
/// This will be non-zero if logging is currently enabled.
/// </summary>
private static bool _enabled;
................................................................................
if (_domainUnload == null)
{
_domainUnload = new EventHandler(DomainUnload);
AppDomain.CurrentDomain.DomainUnload += _domainUnload;
}
#endif
#if !INTEROP_LOG
//
// NOTE: Create an instance of the SQLite wrapper class.
//
if (_sql == null)
{
_sql = new SQLite3(
SQLiteDateFormats.Default, DateTimeKind.Unspecified,
................................................................................
SQLiteErrorCode rc = _sql.SetLogCallback(_callback);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc,
"Failed to initialize logging.");
}
#endif
//
// NOTE: Logging is enabled by default.
//
_enabled = true;
//
................................................................................
//
// NOTE: Disable logging. If necessary, it can be re-enabled
// later by the Initialize method.
//
_enabled = false;
#if !INTEROP_LOG
//
// BUGBUG: This will cause serious problems if other AppDomains
// have any open SQLite connections; however, there is
// currently no way around this limitation.
//
if (_sql != null)
{
................................................................................
// cannot allow native code to refer to a delegate that
// has been garbage collected.
//
if (_callback != null)
{
_callback = null;
}
#endif
//
// NOTE: Remove the event handler for the DomainUnload event
// that we added earlier.
//
if (_domainUnload != null)
{
|