From: drh Date: Thu, 18 Feb 2010 18:45:09 +0000 (+0000) Subject: Add a new, experimental logging interface designed to aid in debugging of X-Git-Tag: version-3.7.2~600 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f280701095c788a830a80927cc0af9ae9cfd036;p=thirdparty%2Fsqlite.git Add a new, experimental logging interface designed to aid in debugging of deeply embedded projects that use SQLite. FossilOrigin-Name: 103321e37ae46eacfad4e127d13477ad5dd02bab --- diff --git a/manifest b/manifest index 6ed19049b8..58fc3f466d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Allow\sstatements\slike\s"REPLACE\sINTO\stbl(rowid)\sVALUES(...)"\sto\srun\swithout\sa\sstatement\sjournal\sas\slong\sas\sthere\sare\sno\striggers,\sforeign\skeys\sor\sindexes. -D 2010-02-18T08:19:20 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Add\sa\snew,\sexperimental\slogging\sinterface\sdesigned\sto\said\sin\sdebugging\sof\ndeeply\sembedded\sprojects\sthat\suse\sSQLite. +D 2010-02-18T18:45:10 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -121,7 +124,7 @@ F src/expr.c d0a345e1d8995e142bc5d9f39a97b9981d7d8f23 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0 F src/func.c 3864490a90a03ab1d657cdd04da78879c18b18d1 -F src/global.c 75946a4a2ab41c6ae58f10ca0ed31b3449694b26 +F src/global.c 5a9c1e3c93213ca574786ac1caa976ce8f709105 F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 @@ -130,7 +133,7 @@ F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c F src/legacy.c 16f385490f377c2c80a6c7357391d499087defed F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581 -F src/main.c a0f6dfbdd79e01baf75ad62bdbfdeae9e560eb96 +F src/main.c 36c1c11ee2677ae247e0c947f9293749ee5ac85f F src/malloc.c 5fa175797f982b178eaf38afba9c588a866be729 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 86f33483a343873bab8ae1b648c2eac55462da74 @@ -159,15 +162,15 @@ F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8 F src/pragma.c 5febf8b5d88cc331effb3f2e14d0473488649b1e F src/prepare.c d4cd38ccfb51f1424d0e61d4878a810b7e1ebb60 -F src/printf.c 2c2702dc4955394dae554b7c45f45656eb42de7f +F src/printf.c 35d62dffdcae3d905561fdeb78eb0f17049a103e F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/resolve.c 56ecd50851afa9dbcc1803ef86a9b17b3f3d3b89 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c 0109b993c360d649857523abb72919e1794f9b45 F src/shell.c 56521a172567f5f9f59f528599bf63380e150ac4 -F src/sqlite.h.in 2afdca943d145f84f55468b1ab608df0d719c318 +F src/sqlite.h.in 7725ebcd19ea2bc3cb64631682dda9b773a31b6b F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 -F src/sqliteInt.h a1df33a2c9a0c5062088b655ddf10237f1bcef2f +F src/sqliteInt.h f86cce6239b02a913aad6bf8052c2541a2c0e813 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6 F src/status.c e651be6b30d397d86384c6867bc016e4913bcac7 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@ -789,7 +792,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 34a3413a5318050254b246ad859c91c134516a32 -R 9abb5e0ed22f7d06fb4491d50076ada9 -U dan -Z a6ef964fdd6cde6844284b1aa32499cc +P 0e4225804010cb0e3f254e2dbffc4fe0e7d982ce +R e1b84b3199b12981899c4cf8ff08b1fe +U drh +Z 01212a28378b63d61c38823b1b1cabd0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (Darwin) + +iEYEARECAAYFAkt9irYACgkQoxKgR168RlFqLACfTtjHG4O+0YQ6hh1MZq3NFfjO +3wAAn2U6GgjbwSAri4XLyLGkLsGJgnkn +=i25A +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index e82bce46c1..0ead8aa2d9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0e4225804010cb0e3f254e2dbffc4fe0e7d982ce \ No newline at end of file +103321e37ae46eacfad4e127d13477ad5dd02bab \ No newline at end of file diff --git a/src/global.c b/src/global.c index bdfd1ff293..673a274ccc 100644 --- a/src/global.c +++ b/src/global.c @@ -164,6 +164,8 @@ SQLITE_WSD struct Sqlite3Config sqlite3Config = { 0, /* isPCacheInit */ 0, /* pInitMutex */ 0, /* nRefInitMutex */ + 0, /* xLog */ + 0, /* pLogArg */ }; diff --git a/src/main.c b/src/main.c index 07fe15ce72..e4419d269d 100644 --- a/src/main.c +++ b/src/main.c @@ -378,6 +378,16 @@ int sqlite3_config(int op, ...){ sqlite3GlobalConfig.nLookaside = va_arg(ap, int); break; } + + /* Record a pointer to the logger funcction and its first argument. + ** The default is NULL. Logging is disabled if the function pointer is + ** NULL. + */ + case SQLITE_CONFIG_LOG: { + sqlite3GlobalConfig.xLog = va_arg(ap, void(*)(void*,int,const char*)); + sqlite3GlobalConfig.pLogArg = va_arg(ap, void*); + break; + } default: { rc = SQLITE_ERROR; diff --git a/src/printf.c b/src/printf.c index fdd4793c36..2966946f95 100644 --- a/src/printf.c +++ b/src/printf.c @@ -939,6 +939,28 @@ char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){ return z; } +/* +** Format and write a message to the log if logging is enabled. +*/ +void sqlite3_log(int iPriority, const char *zFormat, ...){ + void (*xLog)(void*, int, const char*); /* The global logger function */ + void *pLogArg; /* First argument to the logger */ + va_list ap; /* Vararg list */ + char *zMsg; /* Complete log message */ + + xLog = sqlite3GlobalConfig.xLog; + if( xLog ){ + va_start(ap, zFormat); + sqlite3BeginBenignMalloc(); + zMsg = sqlite3_vmprintf(zFormat, ap); + sqlite3EndBenignMalloc(); + va_end(ap); + pLogArg = sqlite3GlobalConfig.pLogArg; + xLog(pLogArg, iPriority, zMsg ? zMsg : zFormat); + sqlite3_free(zMsg); + } +} + #if defined(SQLITE_DEBUG) /* ** A version of printf() that understands %lld. Used for debugging. diff --git a/src/sqlite.h.in b/src/sqlite.h.in index e1b8dc61fb..bd610834ef 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -914,7 +914,6 @@ int sqlite3_os_end(void); /* ** CAPI3REF: Configuring The SQLite Library -** EXPERIMENTAL ** ** The sqlite3_config() interface is used to make global configuration ** changes to SQLite in order to tune SQLite to the specific needs of @@ -1255,6 +1254,7 @@ struct sqlite3_mem_methods { #define SQLITE_CONFIG_LOOKASIDE 13 /* int int */ #define SQLITE_CONFIG_PCACHE 14 /* sqlite3_pcache_methods* */ #define SQLITE_CONFIG_GETPCACHE 15 /* sqlite3_pcache_methods* */ +#define SQLITE_CONFIG_LOG 16 /* xFunc, void* */ /* ** CAPI3REF: Configuration Options @@ -5663,6 +5663,20 @@ int sqlite3_unlock_notify( */ int sqlite3_strnicmp(const char *, const char *, int); +/* +** CAPI3REF: Error Logging Interface +** EXPERIMENTAL +** +** ^The [sqlite3_log()] interface writes a message into the error log +** established by the [SQLITE_CONFIG_ERRORLOG] option to [sqlite3_config()]. +** +** The sqlite3_log() interface is intended for use by extensions such as +** virtual tables, collating functions, and SQL functions. While there is +** nothing to prevent an application from calling sqlite3_log(), doing so +** is considered bad form. +*/ +void sqlite3_log(int iPriority, const char *zFormat, ...); + /* ** Undo the hack that converts floating point types to integer for ** builds on processors without floating point support. diff --git a/src/sqliteInt.h b/src/sqliteInt.h index ff90e03079..a576dd6823 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2370,6 +2370,8 @@ struct Sqlite3Config { int isPCacheInit; /* True after malloc is initialized */ sqlite3_mutex *pInitMutex; /* Mutex used by sqlite3_initialize() */ int nRefInitMutex; /* Number of users of pInitMutex */ + void (*xLog)(void*,int,const char*); /* Function for logging */ + void *pLogArg; /* First argument to xLog() */ }; /*