Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More reform to the logging subsystem. Move interop log callback into the SQLiteLog class. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 4a9980ac1dd1910d0d792bc8c10bedf7 |
| User & Date: | mistachkin 2018-07-26 07:56:30 |
Context
|
2018-07-26
| ||
| 08:18 | Update 'vendor.eagle' to account for changes missing from check-in [7ffb245069b22e2e]. check-in: de528e1be1 user: mistachkin tags: trunk | |
| 07:56 | More reform to the logging subsystem. Move interop log callback into the SQLiteLog class. check-in: 4a9980ac1d user: mistachkin tags: trunk | |
| 07:24 | Fixes to the new SQLiteLog initialization handling and associated test suite infrastructure updates. check-in: 04d60edbdf user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
static SQLiteFactory()
{
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.Initialize();
#endif
#if USE_INTEROP_DLL && INTEROP_LOG
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_config_log_interop();
if (rc == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(
rc, SQLiteConvert.ToUTF8("logging initialized via SQLiteFactory."));
}
#endif
SQLiteLog.Initialize();
string version =
#if NET_40 || NET_45 || NET_451 || NET_452 || NET_46 || NET_461 || NET_462 || NET_47 || NET_471 || NET_472
"4.0.0.0";
#else
"3.5.0.0";
#endif
|
< < < < < < < < < < | |
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 |
static SQLiteFactory()
{
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.Initialize();
#endif
SQLiteLog.Initialize(typeof(SQLiteFactory).Name);
string version =
#if NET_40 || NET_45 || NET_451 || NET_452 || NET_46 || NET_461 || NET_462 || NET_47 || NET_471 || NET_472
"4.0.0.0";
#else
"3.5.0.0";
#endif
|
Changes to System.Data.SQLite/SQLite3.cs.
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
....
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
|
/// initialized for the current process.
/// </returns>
internal override bool IsInitialized()
{
return StaticIsInitialized();
}
/// <summary>
/// Determines if the SQLite core library has been initialized for the
/// current process.
/// </summary>
/// <returns>
/// A boolean indicating whether or not the SQLite core library has been
/// initialized for the current process.
................................................................................
}
finally
{
SQLiteLog.Enabled = savedEnabled;
}
}
}
/// <summary>
/// Helper function to retrieve a column of data from an active statement.
/// </summary>
/// <param name="stmt">The statement being step()'d through</param>
/// <param name="flags">The flags associated with the connection.</param>
/// <param name="index">The column index to retrieve</param>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
....
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
|
/// initialized for the current process.
/// </returns>
internal override bool IsInitialized()
{
return StaticIsInitialized();
}
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Determines if the SQLite core library has been initialized for the
/// current process.
/// </summary>
/// <returns>
/// A boolean indicating whether or not the SQLite core library has been
/// initialized for the current process.
................................................................................
}
finally
{
SQLiteLog.Enabled = savedEnabled;
}
}
}
///////////////////////////////////////////////////////////////////////////////////////////////
#if USE_INTEROP_DLL && INTEROP_LOG
internal static SQLiteErrorCode TryConfigureLogForInterop(
string className
)
{
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_config_log_interop();
if (rc == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(rc, SQLiteConvert.ToUTF8(
HelperMethods.StringFormat(CultureInfo.InvariantCulture,
"logging initialized via \"{0}\".", className)));
}
return rc;
}
#endif
///////////////////////////////////////////////////////////////////////////////////////////////
/// <summary>
/// Helper function to retrieve a column of data from an active statement.
/// </summary>
/// <param name="stmt">The statement being step()'d through</param>
/// <param name="flags">The flags associated with the connection.</param>
/// <param name="index">The column index to retrieve</param>
|
Changes to System.Data.SQLite/SQLiteConnection.cs.
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
....
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
|
{
_noDispose = false;
#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
................................................................................
if (_versionNumber >= 3007014)
SQLiteConnectionHandle.closeConnection = SQLiteBase.CloseConnectionV2;
}
}
#endif
#if USE_INTEROP_DLL && INTEROP_LOG
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3_config_log_interop();
if (rc == SQLiteErrorCode.Ok)
{
UnsafeNativeMethods.sqlite3_log(
rc, SQLiteConvert.ToUTF8("logging initialized via SQLiteConnection."));
}
#endif
_cachedSettings = new Dictionary<string, object>(
new TypeNameStringComparer());
_typeNames = new SQLiteDbTypeMap();
_typeCallbacks = new SQLiteTypeCallbacksMap();
_parseViaFramework = parseViaFramework;
_flags = SQLiteConnectionFlags.None;
|
|
<
<
<
<
<
<
<
<
<
<
|
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
....
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
|
{
_noDispose = false;
#if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY
UnsafeNativeMethods.Initialize();
#endif
SQLiteLog.Initialize(typeof(SQLiteConnection).Name);
#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
................................................................................
if (_versionNumber >= 3007014)
SQLiteConnectionHandle.closeConnection = SQLiteBase.CloseConnectionV2;
}
}
#endif
_cachedSettings = new Dictionary<string, object>(
new TypeNameStringComparer());
_typeNames = new SQLiteDbTypeMap();
_typeCallbacks = new SQLiteTypeCallbacksMap();
_parseViaFramework = parseViaFramework;
_flags = SQLiteConnectionFlags.None;
|
Changes to System.Data.SQLite/SQLiteLog.cs.
137 138 139 140 141 142 143 144 145 146 147 148 149 150 ... 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 ... 181 182 183 184 185 186 187 188 189 190 191 192 193 194 ... 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 ... 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 |
///////////////////////////////////////////////////////////////////////
/// <summary>
/// Initializes the SQLite logging facilities.
/// </summary>
public static void Initialize()
{
//
// NOTE: First, check if the managed logging subsystem is always
// supposed to at least attempt to initialize itself. In
// order to do this, several fairly complex steps must be
// taken, including calling a P/Invoke (interop) method;
// therefore, by default, attempt to perform these steps
................................................................................
if (Interlocked.Increment(ref _attemptedInitialize) > 1)
{
Interlocked.Decrement(ref _attemptedInitialize);
return;
}
}
//
// BUFXIX: We cannot initialize the logging interface if the SQLite
// core library has already been initialized anywhere in
// the process (see ticket [2ce0870fad]).
//
if (SQLite3.StaticIsInitialized())
return;
#if !PLATFORM_COMPACTFRAMEWORK
//
// BUGFIX: To avoid nasty situations where multiple AppDomains are
// attempting to initialize and/or shutdown what is really
// a shared native resource (i.e. the SQLite core library
// is loaded per-process and has only one logging callback,
................................................................................
//
if (!AppDomain.CurrentDomain.IsDefaultAppDomain() &&
UnsafeNativeMethods.GetSettingValue("Force_SQLiteLog", null) == null)
{
return;
}
#endif
lock (syncRoot)
{
#if !PLATFORM_COMPACTFRAMEWORK
//
// NOTE: Add an event handler for the DomainUnload event so
// that we can unhook our logging managed function
................................................................................
if (_domainUnload == null)
{
_domainUnload = new EventHandler(DomainUnload);
AppDomain.CurrentDomain.DomainUnload += _domainUnload;
}
#endif
#if !USE_INTEROP_DLL || !INTEROP_LOG
//
// NOTE: Create an instance of the SQLite wrapper class.
//
if (_sql == null)
{
_sql = new SQLite3(
SQLiteDateFormats.Default, DateTimeKind.Unspecified,
................................................................................
if (_callback == null)
{
_callback = new SQLiteLogCallback(LogCallback);
SQLiteErrorCode rc = _sql.SetLogCallback(_callback);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc,
"Failed to initialize logging.");
}
#endif
//
// NOTE: Logging is enabled by default unless the configuration
// setting "Disable_SQLiteLog" is present.
//
if (UnsafeNativeMethods.GetSettingValue(
"Disable_SQLiteLog", null) == null)
{
_enabled = true;
}
//
// NOTE: For now, always setup the default log event handler.
//
AddDefaultHandler();
}
}
|
> > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > < > | > > > > > |
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 ... 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 ... 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 ... 223 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 249 250 251 252 253 254 ... 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 |
///////////////////////////////////////////////////////////////////////
/// <summary>
/// Initializes the SQLite logging facilities.
/// </summary>
public static void Initialize()
{
Initialize(null);
}
///////////////////////////////////////////////////////////////////////
/// <summary>
/// Initializes the SQLite logging facilities.
/// </summary>
/// <param name="className">
/// The name of the managed class that called this method. This
/// parameter may be null.
/// </param>
internal static void Initialize(
string className
)
{
//
// NOTE: First, check if the managed logging subsystem is always
// supposed to at least attempt to initialize itself. In
// order to do this, several fairly complex steps must be
// taken, including calling a P/Invoke (interop) method;
// therefore, by default, attempt to perform these steps
................................................................................
if (Interlocked.Increment(ref _attemptedInitialize) > 1)
{
Interlocked.Decrement(ref _attemptedInitialize);
return;
}
}
///////////////////////////////////////////////////////////////////
//
// BUFXIX: We cannot initialize the logging interface if the SQLite
// core library has already been initialized anywhere in
// the process (see ticket [2ce0870fad]).
//
if (SQLite3.StaticIsInitialized())
return;
///////////////////////////////////////////////////////////////////
#if !PLATFORM_COMPACTFRAMEWORK
//
// BUGFIX: To avoid nasty situations where multiple AppDomains are
// attempting to initialize and/or shutdown what is really
// a shared native resource (i.e. the SQLite core library
// is loaded per-process and has only one logging callback,
................................................................................
//
if (!AppDomain.CurrentDomain.IsDefaultAppDomain() &&
UnsafeNativeMethods.GetSettingValue("Force_SQLiteLog", null) == null)
{
return;
}
#endif
///////////////////////////////////////////////////////////////////
lock (syncRoot)
{
#if !PLATFORM_COMPACTFRAMEWORK
//
// NOTE: Add an event handler for the DomainUnload event so
// that we can unhook our logging managed function
................................................................................
if (_domainUnload == null)
{
_domainUnload = new EventHandler(DomainUnload);
AppDomain.CurrentDomain.DomainUnload += _domainUnload;
}
#endif
///////////////////////////////////////////////////////////////
#if USE_INTEROP_DLL && INTEROP_LOG
//
// NOTE: Attempt to setup interop assembly log callback.
// This may fail, e.g. if the SQLite core library
// has somehow been initialized. An exception will
// be raised in that case.
//
SQLiteErrorCode rc = SQLite3.TryConfigureLogForInterop(
className);
if (rc != SQLiteErrorCode.Ok)
{
throw new SQLiteException(rc,
"Failed to configure interop assembly logging.");
}
#else
//
// NOTE: Create an instance of the SQLite wrapper class.
//
if (_sql == null)
{
_sql = new SQLite3(
SQLiteDateFormats.Default, DateTimeKind.Unspecified,
................................................................................
if (_callback == null)
{
_callback = new SQLiteLogCallback(LogCallback);
SQLiteErrorCode rc = _sql.SetLogCallback(_callback);
if (rc != SQLiteErrorCode.Ok)
{
throw new SQLiteException(rc,
"Failed to configure managed assembly logging.");
}
}
#endif
///////////////////////////////////////////////////////////////
//
// NOTE: Logging is enabled by default unless the configuration
// setting "Disable_SQLiteLog" is present.
//
if (UnsafeNativeMethods.GetSettingValue(
"Disable_SQLiteLog", null) == null)
{
_enabled = true;
}
///////////////////////////////////////////////////////////////
//
// NOTE: For now, always setup the default log event handler.
//
AddDefaultHandler();
}
}
|