From 4a47761e0dfa3d62feae632d90c6fb22d1d0df3f Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 3 Jan 2017 17:33:43 +0000 Subject: [PATCH 1/5] Make use of the __buildin_OP_overflow() functions from GCC when doing 64-bit signed integer arithmetic. FossilOrigin-Name: 82cbebb8ee4484f13e5f48d305e20e73063f273e --- manifest | 16 +++++++++------- manifest.uuid | 2 +- src/util.c | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index cff39d7dca..7ec2dbb8d2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sexperimental\saffinity()\sSQL\sfunction\swhen\sSQLITE_DEBUG\sis\sdefined. -D 2017-01-03T14:45:35.313 +C Make\suse\sof\sthe\s__buildin_OP_overflow()\sfunctions\sfrom\sGCC\swhen\sdoing\n64-bit\ssigned\sinteger\sarithmetic. +D 2017-01-03T17:33:43.523 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -453,7 +453,7 @@ F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182 F src/update.c 1da7c462110bffed442a42884cb0d528c1db46d8 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c -F src/util.c 1534060bc034cdc51381c040c8bd6252dbcb64c9 +F src/util.c 8c3d2aa11bacd984caf8067ed5b857de3fb53b81 F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16 F src/vdbe.c 88bd6c32b333580d2661ac3afe33369757fb1522 F src/vdbe.h 50ee139f9c68fff91be1d717ed3a6abbd496919c @@ -1541,8 +1541,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 36944be6be5c42096f5da84187ff203af26b08ae f778f58ae4ea3e16f51b94591a2c1e563dcb0cde -R 4de702ec2e06c17a2db8893398d4255a -T +closed f778f58ae4ea3e16f51b94591a2c1e563dcb0cde +P bed0eaa5f50112e64fc97a2afdc9d56cf8f5026a +R 082101997f3f378fcfea5fe538ad3ab9 +T *branch * gnu-safe-math +T *sym-gnu-safe-math * +T -sym-trunk * U drh -Z ab80b4c4af6ffab14c74e7e3612d1ec8 +Z 54548663084083c7fef96c176f102936 diff --git a/manifest.uuid b/manifest.uuid index 1ef467555f..f1ed017db3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bed0eaa5f50112e64fc97a2afdc9d56cf8f5026a \ No newline at end of file +82cbebb8ee4484f13e5f48d305e20e73063f273e \ No newline at end of file diff --git a/src/util.c b/src/util.c index b9684c6c01..4a2266ee69 100644 --- a/src/util.c +++ b/src/util.c @@ -1279,6 +1279,10 @@ int sqlite3SafetyCheckSickOrOk(sqlite3 *db){ ** overflow, leave *pA unchanged and return 1. */ int sqlite3AddInt64(i64 *pA, i64 iB){ +#if !defined(SQLITE_DISABLE_INTRINSIC) \ + && defined(__GNUC__) && GCC_VERSION>=5004000 + return __builtin_add_overflow(*pA, iB, pA); +#else i64 iA = *pA; testcase( iA==0 ); testcase( iA==1 ); testcase( iB==-1 ); testcase( iB==0 ); @@ -1293,8 +1297,13 @@ int sqlite3AddInt64(i64 *pA, i64 iB){ } *pA += iB; return 0; +#endif } int sqlite3SubInt64(i64 *pA, i64 iB){ +#if !defined(SQLITE_DISABLE_INTRINSIC) \ + && defined(__GNUC__) && GCC_VERSION>=5004000 + return __builtin_sub_overflow(*pA, iB, pA); +#else testcase( iB==SMALLEST_INT64+1 ); if( iB==SMALLEST_INT64 ){ testcase( (*pA)==(-1) ); testcase( (*pA)==0 ); @@ -1304,8 +1313,13 @@ int sqlite3SubInt64(i64 *pA, i64 iB){ }else{ return sqlite3AddInt64(pA, -iB); } +#endif } int sqlite3MulInt64(i64 *pA, i64 iB){ +#if !defined(SQLITE_DISABLE_INTRINSIC) \ + && defined(__GNUC__) && GCC_VERSION>=5004000 + return __builtin_mul_overflow(*pA, iB, pA); +#else i64 iA = *pA; if( iB>0 ){ if( iA>LARGEST_INT64/iB ) return 1; @@ -1321,6 +1335,7 @@ int sqlite3MulInt64(i64 *pA, i64 iB){ } *pA = iA*iB; return 0; +#endif } /* From eea46aeafc8ae4ca1f4a86961ac1132cb528a00e Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 3 Jan 2017 18:05:04 +0000 Subject: [PATCH 2/5] Use the GCC built-in __sync_fetch_and_sub() to make the sqlite3StatusDown() routine atomic, and thereby avoid some mutexing. FossilOrigin-Name: f69ce75b3d94331fdbfa2f3a27d61db24c285d2b --- manifest | 19 ++++++++----------- manifest.uuid | 2 +- src/malloc.c | 8 ++++++++ src/sqliteInt.h | 9 +++++++++ src/status.c | 7 ++++++- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index 7ec2dbb8d2..2d378a63aa 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\suse\sof\sthe\s__buildin_OP_overflow()\sfunctions\sfrom\sGCC\swhen\sdoing\n64-bit\ssigned\sinteger\sarithmetic. -D 2017-01-03T17:33:43.523 +C Use\sthe\sGCC\sbuilt-in\s__sync_fetch_and_sub()\sto\smake\sthe\ssqlite3StatusDown()\nroutine\satomic,\sand\sthereby\savoid\ssome\smutexing. +D 2017-01-03T18:05:04.175 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -354,7 +354,7 @@ F src/insert.c 91ba5d0143e66479081536ebbaff1850ec9f57d9 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0 -F src/malloc.c f3fad34cd570022abca558c573f1761fb09a8212 +F src/malloc.c 254c1cf31c2f3783bfe49dc8e7adde3c850f2289 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3 @@ -393,9 +393,9 @@ F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae -F src/sqliteInt.h 2c22eae7a29f17e0dfee9737d4844d7c08cc38cd +F src/sqliteInt.h ae113e82230109e0964c3d93efed55700d8eec5e F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 -F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 +F src/status.c 56174fdb52d1e8a0e9f3976e82d06a5cd0a1c2c3 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/tclsqlite.c 205c66b9b81d97978a155caa3ef5be9c4de2b174 F src/test1.c 8a98191a1da8e100f77cdb5cc716df67d405028d @@ -1541,10 +1541,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P bed0eaa5f50112e64fc97a2afdc9d56cf8f5026a -R 082101997f3f378fcfea5fe538ad3ab9 -T *branch * gnu-safe-math -T *sym-gnu-safe-math * -T -sym-trunk * +P 82cbebb8ee4484f13e5f48d305e20e73063f273e +R 799d9858a7a6a1551985c372ac93d54d U drh -Z 54548663084083c7fef96c176f102936 +Z efd83d8962e4e3c856ce381388686c40 diff --git a/manifest.uuid b/manifest.uuid index f1ed017db3..0aa7e0c273 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -82cbebb8ee4484f13e5f48d305e20e73063f273e \ No newline at end of file +f69ce75b3d94331fdbfa2f3a27d61db24c285d2b \ No newline at end of file diff --git a/src/malloc.c b/src/malloc.c index 84191c78a1..5f2f406425 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -376,12 +376,16 @@ void sqlite3ScratchFree(void *p){ sqlite3MemdebugSetType(p, MEMTYPE_HEAP); if( sqlite3GlobalConfig.bMemstat ){ int iSize = sqlite3MallocSize(p); +#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_enter(mem0.mutex); +#endif sqlite3StatusDown(SQLITE_STATUS_SCRATCH_OVERFLOW, iSize); sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, iSize); sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1); sqlite3GlobalConfig.m.xFree(p); +#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_leave(mem0.mutex); +#endif }else{ sqlite3GlobalConfig.m.xFree(p); } @@ -440,11 +444,15 @@ void sqlite3_free(void *p){ assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) ); assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) ); if( sqlite3GlobalConfig.bMemstat ){ +#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_enter(mem0.mutex); +#endif sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, sqlite3MallocSize(p)); sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1); sqlite3GlobalConfig.m.xFree(p); +#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_leave(mem0.mutex); +#endif }else{ sqlite3GlobalConfig.m.xFree(p); } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 31cedf40e7..c034d6841e 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -228,6 +228,15 @@ # define SQLITE_NOINLINE #endif +/* +** The SQLITE_ATOMIC_STATUS_DOWN macro is defined if and only if +** the sqlite3StatusDown() function is threadsafe. +*/ +#if !defined(SQLITE_DISABLE_INTRINSIC) \ + && defined(__GNUC__) && GCC_VERSION>=4004000 +# define SQLITE_ATOMIC_STATUS_DOWN 1 +#endif + /* ** Make sure that the compiler intrinsics we desire are enabled when ** compiling with an appropriate version of MSVC unless prevented by diff --git a/src/status.c b/src/status.c index 24dcad4572..5e8fbc2ee2 100644 --- a/src/status.c +++ b/src/status.c @@ -100,11 +100,16 @@ void sqlite3StatusUp(int op, int N){ void sqlite3StatusDown(int op, int N){ wsdStatInit; assert( N>=0 ); + assert( op>=0 && op=4004000 + (void)__sync_fetch_and_sub(&wsdStat.nowValue[op], N); +#else assert( op>=0 && op=0 && op Date: Tue, 3 Jan 2017 20:01:24 +0000 Subject: [PATCH 3/5] Use the CLANG_VERSION macro to control clang-specific features. FossilOrigin-Name: f8ebeec211483503e135104ef977b3c384a1d789 --- manifest | 16 ++++++++-------- manifest.uuid | 2 +- src/sqliteInt.h | 10 +++++++++- src/status.c | 2 +- src/util.c | 10 +++++----- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/manifest b/manifest index 2d378a63aa..4393faecba 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\sthe\sGCC\sbuilt-in\s__sync_fetch_and_sub()\sto\smake\sthe\ssqlite3StatusDown()\nroutine\satomic,\sand\sthereby\savoid\ssome\smutexing. -D 2017-01-03T18:05:04.175 +C Use\sthe\sCLANG_VERSION\smacro\sto\scontrol\sclang-specific\sfeatures. +D 2017-01-03T20:01:24.105 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -393,9 +393,9 @@ F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae -F src/sqliteInt.h ae113e82230109e0964c3d93efed55700d8eec5e +F src/sqliteInt.h 898cfcd9e0a40df15258cd86255bf9bee411e36d F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 -F src/status.c 56174fdb52d1e8a0e9f3976e82d06a5cd0a1c2c3 +F src/status.c 1b1e64fbce135bc178a6481433422a32f433ba37 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/tclsqlite.c 205c66b9b81d97978a155caa3ef5be9c4de2b174 F src/test1.c 8a98191a1da8e100f77cdb5cc716df67d405028d @@ -453,7 +453,7 @@ F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182 F src/update.c 1da7c462110bffed442a42884cb0d528c1db46d8 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c -F src/util.c 8c3d2aa11bacd984caf8067ed5b857de3fb53b81 +F src/util.c a88b0466fddf445ce752226d4698ca3faada620a F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16 F src/vdbe.c 88bd6c32b333580d2661ac3afe33369757fb1522 F src/vdbe.h 50ee139f9c68fff91be1d717ed3a6abbd496919c @@ -1541,7 +1541,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 82cbebb8ee4484f13e5f48d305e20e73063f273e -R 799d9858a7a6a1551985c372ac93d54d +P f69ce75b3d94331fdbfa2f3a27d61db24c285d2b +R 576384b00d5b84002b3bf9bfa5fd1c23 U drh -Z efd83d8962e4e3c856ce381388686c40 +Z df7fbae7b850ad1f1ec95f7decb0f63b diff --git a/manifest.uuid b/manifest.uuid index 0aa7e0c273..70bf8dddad 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f69ce75b3d94331fdbfa2f3a27d61db24c285d2b \ No newline at end of file +f8ebeec211483503e135104ef977b3c384a1d789 \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index c034d6841e..e57453e679 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -110,6 +110,14 @@ # define GCC_VERSION 0 #endif +/* What version of CLANG is being used. 0 means GCC is not being used */ +#ifdef __clang__ +# define CLANG_VERSION \ + (__clang_major__*1000000+__clang_minor__*1000+__clang_patchlevel__) +#else +# define CLANG_VERSION 0 +#endif + /* Needed for various definitions... */ #if defined(__GNUC__) && !defined(_GNU_SOURCE) # define _GNU_SOURCE @@ -233,7 +241,7 @@ ** the sqlite3StatusDown() function is threadsafe. */ #if !defined(SQLITE_DISABLE_INTRINSIC) \ - && defined(__GNUC__) && GCC_VERSION>=4004000 + && (GCC_VERSION>=4004000 || CLANG_VERSION>=3000000) # define SQLITE_ATOMIC_STATUS_DOWN 1 #endif diff --git a/src/status.c b/src/status.c index 5e8fbc2ee2..f36f36724d 100644 --- a/src/status.c +++ b/src/status.c @@ -102,7 +102,7 @@ void sqlite3StatusDown(int op, int N){ assert( N>=0 ); assert( op>=0 && op=4004000 + && (GCC_VERSION>=4004000 || CLANG_VERSION>=3000000) (void)__sync_fetch_and_sub(&wsdStat.nowValue[op], N); #else assert( op>=0 && op=4003000 + && (GCC_VERSION>=4003000 || CLANG_VERSION>=3000000) u32 x; memcpy(&x,p,4); return __builtin_bswap32(x); @@ -1159,7 +1159,7 @@ void sqlite3Put4byte(unsigned char *p, u32 v){ #if SQLITE_BYTEORDER==4321 memcpy(p,&v,4); #elif SQLITE_BYTEORDER==1234 && !defined(SQLITE_DISABLE_INTRINSIC) \ - && defined(__GNUC__) && GCC_VERSION>=4003000 + && (GCC_VERSION>=4003000 || CLANG_VERSION>=3000000) u32 x = __builtin_bswap32(v); memcpy(p,&x,4); #elif SQLITE_BYTEORDER==1234 && !defined(SQLITE_DISABLE_INTRINSIC) \ @@ -1280,7 +1280,7 @@ int sqlite3SafetyCheckSickOrOk(sqlite3 *db){ */ int sqlite3AddInt64(i64 *pA, i64 iB){ #if !defined(SQLITE_DISABLE_INTRINSIC) \ - && defined(__GNUC__) && GCC_VERSION>=5004000 + && (GCC_VERSION>=5004000 || CLANG_VERSION>=4000000) return __builtin_add_overflow(*pA, iB, pA); #else i64 iA = *pA; @@ -1301,7 +1301,7 @@ int sqlite3AddInt64(i64 *pA, i64 iB){ } int sqlite3SubInt64(i64 *pA, i64 iB){ #if !defined(SQLITE_DISABLE_INTRINSIC) \ - && defined(__GNUC__) && GCC_VERSION>=5004000 + && (GCC_VERSION>=5004000 || CLANG_VERSION>=4000000) return __builtin_sub_overflow(*pA, iB, pA); #else testcase( iB==SMALLEST_INT64+1 ); @@ -1317,7 +1317,7 @@ int sqlite3SubInt64(i64 *pA, i64 iB){ } int sqlite3MulInt64(i64 *pA, i64 iB){ #if !defined(SQLITE_DISABLE_INTRINSIC) \ - && defined(__GNUC__) && GCC_VERSION>=5004000 + && (GCC_VERSION>=5004000 || CLANG_VERSION>=4000000) return __builtin_mul_overflow(*pA, iB, pA); #else i64 iA = *pA; From 5c6b944d167c673779e5f7e83b0018b278ffe8f4 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 3 Jan 2017 21:03:37 +0000 Subject: [PATCH 4/5] Fix a typo in a comment. FossilOrigin-Name: ae087123db8e7d47b25a8d0a98cfd62e85e42fc6 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqliteInt.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 4393faecba..d9637641de 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Use\sthe\sCLANG_VERSION\smacro\sto\scontrol\sclang-specific\sfeatures. -D 2017-01-03T20:01:24.105 +C Fix\sa\stypo\sin\sa\scomment. +D 2017-01-03T21:03:37.691 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -393,7 +393,7 @@ F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae -F src/sqliteInt.h 898cfcd9e0a40df15258cd86255bf9bee411e36d +F src/sqliteInt.h 7bfbca79001b3553d08a5884278e57696368a794 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 F src/status.c 1b1e64fbce135bc178a6481433422a32f433ba37 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 @@ -1541,7 +1541,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P f69ce75b3d94331fdbfa2f3a27d61db24c285d2b -R 576384b00d5b84002b3bf9bfa5fd1c23 +P f8ebeec211483503e135104ef977b3c384a1d789 +R f0ff94e8e63c383f0258ddac073c3711 U drh -Z df7fbae7b850ad1f1ec95f7decb0f63b +Z daa7f757074b48f5fb7e720dfd32b54f diff --git a/manifest.uuid b/manifest.uuid index 70bf8dddad..dcab54e3d1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f8ebeec211483503e135104ef977b3c384a1d789 \ No newline at end of file +ae087123db8e7d47b25a8d0a98cfd62e85e42fc6 \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index e57453e679..c7be0ecd1c 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -110,7 +110,7 @@ # define GCC_VERSION 0 #endif -/* What version of CLANG is being used. 0 means GCC is not being used */ +/* What version of CLANG is being used. 0 means CLANG is not being used */ #ifdef __clang__ # define CLANG_VERSION \ (__clang_major__*1000000+__clang_minor__*1000+__clang_patchlevel__) From 7433ae5df65c2d1d3fded425c431150b91674144 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 3 Jan 2017 21:50:49 +0000 Subject: [PATCH 5/5] Back out the use of __sync_fetch_and_sub() as it does not appear to work. FossilOrigin-Name: 4c2efd4239bf07eb4b92d4af54edd68ee6312670 --- manifest | 17 +++++++++-------- manifest.uuid | 2 +- src/malloc.c | 8 -------- src/sqliteInt.h | 9 --------- src/status.c | 7 +------ 5 files changed, 11 insertions(+), 32 deletions(-) diff --git a/manifest b/manifest index d9637641de..b1dbc792e4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\stypo\sin\sa\scomment. -D 2017-01-03T21:03:37.691 +C Back\sout\sthe\suse\sof\s__sync_fetch_and_sub()\sas\sit\sdoes\snot\sappear\sto\swork. +D 2017-01-03T21:50:49.166 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -354,7 +354,7 @@ F src/insert.c 91ba5d0143e66479081536ebbaff1850ec9f57d9 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0 -F src/malloc.c 254c1cf31c2f3783bfe49dc8e7adde3c850f2289 +F src/malloc.c f3fad34cd570022abca558c573f1761fb09a8212 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3 @@ -393,9 +393,9 @@ F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae -F src/sqliteInt.h 7bfbca79001b3553d08a5884278e57696368a794 +F src/sqliteInt.h f3450b70cfd99b434304225cf3b95de9cb4a9536 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 -F src/status.c 1b1e64fbce135bc178a6481433422a32f433ba37 +F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/tclsqlite.c 205c66b9b81d97978a155caa3ef5be9c4de2b174 F src/test1.c 8a98191a1da8e100f77cdb5cc716df67d405028d @@ -1541,7 +1541,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P f8ebeec211483503e135104ef977b3c384a1d789 -R f0ff94e8e63c383f0258ddac073c3711 +P ae087123db8e7d47b25a8d0a98cfd62e85e42fc6 +Q -f69ce75b3d94331fdbfa2f3a27d61db24c285d2b +R 4be5114c40ec1b8757eebb3b6a7e4284 U drh -Z daa7f757074b48f5fb7e720dfd32b54f +Z 7a47fa67b122b20ade3d4fbc1714217d diff --git a/manifest.uuid b/manifest.uuid index dcab54e3d1..2a6301b72a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ae087123db8e7d47b25a8d0a98cfd62e85e42fc6 \ No newline at end of file +4c2efd4239bf07eb4b92d4af54edd68ee6312670 \ No newline at end of file diff --git a/src/malloc.c b/src/malloc.c index 5f2f406425..84191c78a1 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -376,16 +376,12 @@ void sqlite3ScratchFree(void *p){ sqlite3MemdebugSetType(p, MEMTYPE_HEAP); if( sqlite3GlobalConfig.bMemstat ){ int iSize = sqlite3MallocSize(p); -#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_enter(mem0.mutex); -#endif sqlite3StatusDown(SQLITE_STATUS_SCRATCH_OVERFLOW, iSize); sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, iSize); sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1); sqlite3GlobalConfig.m.xFree(p); -#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_leave(mem0.mutex); -#endif }else{ sqlite3GlobalConfig.m.xFree(p); } @@ -444,15 +440,11 @@ void sqlite3_free(void *p){ assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) ); assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) ); if( sqlite3GlobalConfig.bMemstat ){ -#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_enter(mem0.mutex); -#endif sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, sqlite3MallocSize(p)); sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1); sqlite3GlobalConfig.m.xFree(p); -#ifndef SQLITE_ATOMIC_STATUS_DOWN sqlite3_mutex_leave(mem0.mutex); -#endif }else{ sqlite3GlobalConfig.m.xFree(p); } diff --git a/src/sqliteInt.h b/src/sqliteInt.h index c7be0ecd1c..0257e721bc 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -236,15 +236,6 @@ # define SQLITE_NOINLINE #endif -/* -** The SQLITE_ATOMIC_STATUS_DOWN macro is defined if and only if -** the sqlite3StatusDown() function is threadsafe. -*/ -#if !defined(SQLITE_DISABLE_INTRINSIC) \ - && (GCC_VERSION>=4004000 || CLANG_VERSION>=3000000) -# define SQLITE_ATOMIC_STATUS_DOWN 1 -#endif - /* ** Make sure that the compiler intrinsics we desire are enabled when ** compiling with an appropriate version of MSVC unless prevented by diff --git a/src/status.c b/src/status.c index f36f36724d..24dcad4572 100644 --- a/src/status.c +++ b/src/status.c @@ -100,16 +100,11 @@ void sqlite3StatusUp(int op, int N){ void sqlite3StatusDown(int op, int N){ wsdStatInit; assert( N>=0 ); - assert( op>=0 && op=4004000 || CLANG_VERSION>=3000000) - (void)__sync_fetch_and_sub(&wsdStat.nowValue[op], N); -#else assert( op>=0 && op=0 && op