From: mistachkin Date: Thu, 16 Apr 2015 03:24:38 +0000 (+0000) Subject: Merge updates from trunk. Make OSTRACE changes work on Linux. X-Git-Tag: version-3.8.10~33^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb383e9229461dd883852418b6489c091cdce3cd;p=thirdparty%2Fsqlite.git Merge updates from trunk. Make OSTRACE changes work on Linux. FossilOrigin-Name: cd1542664eb3eb46d486664ded49cd9c4bef3948 --- fb383e9229461dd883852418b6489c091cdce3cd diff --cc manifest index e2d9993f0b,5e32fe4ffc..f3d2bc3b41 --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ - C Enhance\sthe\s'releasetest.tcl'\stool\sto\ssupport\sMSVC. - D 2015-04-04T00:02:07.856 -C When\sparsing\sthe\sschema,\signore\sany\sSQL\sthat\sdoes\snot\sbegin\swith\s"CREATE". -D 2015-04-16T00:26:03.247 ++C Merge\supdates\sfrom\strunk.\s\sMake\sOSTRACE\schanges\swork\son\sLinux. ++D 2015-04-16T03:24:38.672 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4 + F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc a95303d8bd37f8cf176be19cb5542355cc3c243b + F Makefile.msc 11cb5361e34b80e9c5b417ed6a6deee099c5b5f3 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866 - F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60 + F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 @@@ -195,7 -195,7 +195,7 @@@ F src/journal.c b4124532212b6952f42eb2c F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660 - F src/main.c 1ce947628ff241608fd4a122976fa29d36b8838f -F src/main.c 40e333960d53f7d50ee8ce09d40431c87ea653f2 ++F src/main.c df3cbe6ebe9df0bea291e649cea3dfcaa6a18cb7 F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987 @@@ -212,10 -212,10 +212,10 @@@ F src/mutex_w32.c 61660ada28d8308ad190f F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7 F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf - F src/os_common.h 05c8d05b4f1bce4262c9e2e74ab10c2d0dec964a -F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 ++F src/os_common.h 4613f59778954663f1db6b9a68f091be9310d6ae F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa - F src/os_unix.c a4dadbc2da41599e99093e91e276c38c17a73b89 - F src/os_win.c eeb317cd504f39ef2dbcf50eb228bc9dd301d024 -F src/os_unix.c 5ed7e2e453c2980909a6b2c80dc55764b50819a8 -F src/os_win.c 03d27be3a20048ef52a648d5f0a15f5edda9f2a3 ++F src/os_unix.c cf45d7b1cd27341ba8699e62c4902062b6297039 ++F src/os_win.c c2f0b0b3541906e310588b9e95080df4df75b674 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77 @@@ -223,19 -223,19 +223,19 @@@ F src/parse.y 1299c66e7b1707322ccd8af43 F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4 F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8 F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9 - F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100 + F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88 F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f - F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9 - F src/printf.c 8fff88d299f00e114e1a5afc90aa4c8744bf8877 + F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3 + F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 - F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b + F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e - F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5 - F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa - F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a + F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3 + F src/shell.c 72b61a9d41ba12b67ea06fe9267abcc012c6c5bb + F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d - F src/sqliteInt.h 75e86ef580cae23a36c4acfc2f664f528f8aee91 -F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379 ++F src/sqliteInt.h 2c4f9e8a3ebebdcecc4a214638eb190eb56932a4 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179 F src/table.c e7a09215315a978057fb42c640f890160dbcc45e @@@ -1248,7 -1250,7 +1250,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 5f6e35802fcf7b5e9fc3dd4424e9074523fa8ad3 - R beb5360693babbdb25b957a67e8a7b0e -P e018f4bf1f27f7838342940ad89a12d7f1536e8e -R 9772cd879deb52a3e48d7b6cb0b29092 -U drh -Z 089490261a72224f9edd48b4acf9b866 ++P f664bfdc82597a4530d4f4938bb96557b43b171b d3c00d61581c8ba6dce5618391432d3af8d324d4 ++R fc38550e22f348cd0d3d2f2ddf7d63af +U mistachkin - Z 6aedfad85a42d725bf8ce314c14e99d1 ++Z ee67c55d1a8d246e247c4904241d9e6b diff --cc manifest.uuid index 3312a66aa2,e0b027b22a..979b90634e --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - f664bfdc82597a4530d4f4938bb96557b43b171b -d3c00d61581c8ba6dce5618391432d3af8d324d4 ++cd1542664eb3eb46d486664ded49cd9c4bef3948 diff --cc src/main.c index a2177fd796,d9ee77fab2..043f3e14d0 --- a/src/main.c +++ b/src/main.c @@@ -55,19 -55,6 +55,18 @@@ int sqlite3_libversion_number(void){ re */ int sqlite3_threadsafe(void){ return SQLITE_THREADSAFE; } +/* +** When compiling the test fixture or with debugging enabled (on Win32), +** this variable being set to non-zero will cause OSTRACE macros to emit +** extra diagnostic information. +*/ - #if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \ - (defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)) ++#ifdef SQLITE_HAVE_OS_TRACE +# ifndef SQLITE_DEBUG_OS_TRACE +# define SQLITE_DEBUG_OS_TRACE 0 +# endif + int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE; +#endif + #if !defined(SQLITE_OMIT_TRACE) && defined(SQLITE_ENABLE_IOTRACE) /* ** If the following function pointer is not NULL and if @@@ -1207,8 -1194,7 +1206,7 @@@ void sqlite3RollbackAll(sqlite3 *db, in ** Return a static string containing the name corresponding to the error code ** specified in the argument. */ - #if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \ - (defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)) -#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || defined(SQLITE_TEST) ++#ifdef SQLITE_HAVE_OS_TRACE const char *sqlite3ErrName(int rc){ const char *zName = 0; int i, origRc = rc; diff --cc src/os_common.h index 3ff4411992,f6c3e7ff89..837f947143 --- a/src/os_common.h +++ b/src/os_common.h @@@ -29,14 -29,13 +29,16 @@@ # error "The MEMORY_DEBUG macro is obsolete. Use SQLITE_DEBUG instead." #endif -#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) -# ifndef SQLITE_DEBUG_OS_TRACE -# define SQLITE_DEBUG_OS_TRACE 0 -# endif - int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE; +/* +** Declarations used for tracing the operating system interfaces. +*/ +#if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \ - (defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)) ++ defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE) + extern int sqlite3OSTrace; # define OSTRACE(X) if( sqlite3OSTrace ) sqlite3DebugPrintf X ++# define SQLITE_HAVE_OS_TRACE #else ++# undef SQLITE_HAVE_OS_TRACE # define OSTRACE(X) #endif diff --cc src/os_unix.c index a9c883a935,188c025336..93657f6898 --- a/src/os_unix.c +++ b/src/os_unix.c @@@ -630,7 -641,7 +641,7 @@@ static int unixMutexHeld(void) #endif --#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG) ++#ifdef SQLITE_HAVE_OS_TRACE /* ** Helper function for printing out trace information from debugging ** binaries. This returns the string representation of the supplied diff --cc src/os_win.c index 33a92b156e,ef2f553f33..3a8c4cbdbf --- a/src/os_win.c +++ b/src/os_win.c @@@ -2765,7 -2757,7 +2757,7 @@@ static int winSync(sqlite3_file *id, in BOOL rc; #endif #if !defined(NDEBUG) || !defined(SQLITE_NO_SYNC) || \ - defined(SQLITE_WIN32_HAS_OS_TRACE) - (defined(SQLITE_TEST) && defined(SQLITE_DEBUG)) ++ defined(SQLITE_HAVE_OS_TRACE) /* ** Used when SQLITE_NO_SYNC is not defined and by the assert() and/or ** OSTRACE() macros. @@@ -3442,7 -3434,7 +3434,7 @@@ struct winShmNode int nRef; /* Number of winShm objects pointing to this */ winShm *pFirst; /* All winShm objects pointing to this */ winShmNode *pNext; /* Next in list of all winShmNode objects */ - #if defined(SQLITE_DEBUG) || defined(SQLITE_WIN32_HAS_OS_TRACE) -#ifdef SQLITE_DEBUG ++#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 nextShmId; /* Next available winShm.id value */ #endif }; @@@ -3473,7 -3465,7 +3465,7 @@@ struct winShm u8 hasMutex; /* True if holding the winShmNode mutex */ u16 sharedMask; /* Mask of shared locks held */ u16 exclMask; /* Mask of exclusive locks held */ - #if defined(SQLITE_DEBUG) || defined(SQLITE_WIN32_HAS_OS_TRACE) -#ifdef SQLITE_DEBUG ++#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) u8 id; /* Id of this connection with its winShmNode */ #endif }; @@@ -3664,7 -3656,7 +3656,7 @@@ static int winOpenSharedMemory(winFile /* Make the new connection a child of the winShmNode */ p->pShmNode = pShmNode; - #if defined(SQLITE_DEBUG) || defined(SQLITE_WIN32_HAS_OS_TRACE) -#ifdef SQLITE_DEBUG ++#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE) p->id = pShmNode->nextShmId++; #endif pShmNode->nRef++; diff --cc src/sqliteInt.h index 45250bfd10,ee24342919..e22da91e5b --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@@ -3491,8 -3493,7 +3493,7 @@@ void *sqlite3HexToBlob(sqlite3*, const u8 sqlite3HexToInt(int h); int sqlite3TwoPartName(Parse *, Token *, Token *, Token **); - #if (defined(SQLITE_DEBUG) && SQLITE_OS_WIN) || \ - (defined(SQLITE_TEST) || defined(SQLITE_FORCE_OS_TRACE)) -#if defined(SQLITE_TEST) ++#ifdef SQLITE_HAVE_OS_TRACE const char *sqlite3ErrName(int); #endif