Remove the obsolete static mutexes. Use only the lastest static mutex code. (CVS...

FossilOrigin-Name: 6225cd461cdd2132eeb480aa4deb8986b7f63c15

diff --git a/manifest b/manifest
index 5f0f29e9017d332be87a085ca8e45b7040e3e130..0f2ced6d05daf712c24be958b3da1a9201fb8a37 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\stests\sthat\sgo\swith\sthe\sprevious\scommit.\s(CVS\s4258)
-D 2007-08-21T13:30:07
+C Remove\sthe\sobsolete\sstatic\smutexes.\s\sUse\sonly\sthe\slastest\sstatic\smutex\scode.\s(CVS\s4259)
+D 2007-08-21T13:51:23
 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -96,7 +96,7 @@ F src/hash.h 3ad3da76bfb954978d227bf495568b0e6da2c19e
 F src/insert.c 633322aef1799f6604fa805e12488bc628570b0c
 F src/legacy.c a83519a8fbb488c3155fca577b010d590ec479e9
 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
-F src/loadext.c 245ef19db91d86b394ad50366d69f160c46764d9
+F src/loadext.c 8563d7ef0d7fe424378ef7b945d56c28ba78fe24
 F src/main.c 3f8917757c7f6a937e300b613b9cfd1bbe703c70
 F src/malloc.c c2f5da620d8e030c6974a0ddcaeb7b408c9bdb3d
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
@@ -110,7 +110,7 @@ F src/os_os2.c 8769301bff502de642ad2634cedcb77d967ce199
 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 55e4d3c441e6b9e2dd36160e61df827bac1ea41d
+F src/os_unix.c 7aad42b1ee70d68034a4ac45fa822edccdc3d9e6
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c 29c0e19c1072679a4c7818c49fab2f35d2ad7747
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -120,13 +120,13 @@ F src/parse.y 2d2ce439dc6184621fb0b86f4fc5aca7f391a590
 F src/pragma.c 9b989506a1b7c8aecd6befb8235e2f57a4aba7e5
 F src/prepare.c 5bc8c7a943215302943fec831f8c646f6dfdf76a
 F src/printf.c a8f46e0ed360c18d40e89aa636533be300b406c2
-F src/random.c 89b2c5a97f5059c486c021ffc2d72c9d779ccae8
+F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da
 F src/select.c 98c367bce3f38c5adfcc97de9ab5c79b0e5dc2b2
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c ac29402b538515fa4697282387be9c1205e6e9eb
 F src/sqlite.h.in 09d8d2780c2c25dedbcfdfcafc39e8b213fc8432
 F src/sqlite3ext.h 647a6b8a8f76ff6c9611e4a071531d8e63ff2d6b
-F src/sqliteInt.h 6891d6864a6b9fc661eadaa0328e81dff7523584
+F src/sqliteInt.h c9ba3861d1e8835caeb0c89fca7cddd12779e1ac
 F src/sqliteLimit.h f14609c27636ebc217c9603ade26dbdd7d0f6afa
 F src/table.c c725e47f6f3092b9a7b569fc58e408e2173ee008
 F src/tclsqlite.c 299fb45c5cf983b49b2c984b87b936b8132fbfe2
@@ -558,7 +558,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 0da48209140b6c1ba47df799ce6065054b994f02
-R cea3f4dd0f8d31322bd710223c9b6fd4
-U danielk1977
-Z 0894b0ecd2f2b85dfd7a091f744238da
+P a87f32e13e91250ab4d9366d2e9a3a7024a12fb9
+R 0b7b982232326cbf89fa9a6240b3b769
+U drh
+Z 004bb3b1aa3b13212b12a95be5a80713

diff --git a/manifest.uuid b/manifest.uuid
index 17df4849c6082270d32fcbf9a16bd0cc7bc2720f..3b7094d4b147be22c7914cd8f75d6330328bb8bc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a87f32e13e91250ab4d9366d2e9a3a7024a12fb9
\ No newline at end of file
+6225cd461cdd2132eeb480aa4deb8986b7f63c15
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index f2d93907f164df496de762db7a2fcfc48961ec2b..5e854e933414adda953439dc9250fd616c89a7b5 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -372,7 +372,7 @@ static void **aAutoExtension = 0;
 int sqlite3_auto_extension(void *xInit){
   int i;
   int rc = SQLITE_OK;
-  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_GLOBAL);
+  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
   sqlite3_mutex_enter(mutex);
   for(i=0; i<nAutoExtension; i++){
     if( aAutoExtension[i]==xInit ) break;
@@ -396,7 +396,7 @@ int sqlite3_auto_extension(void *xInit){
 ** Reset the automatic extension loading mechanism.
 */
 void sqlite3_reset_auto_extension(void){
-  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_GLOBAL);
+  sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
   sqlite3_mutex_enter(mutex);
   sqlite3_free(aAutoExtension);
   aAutoExtension = 0;
@@ -419,7 +419,7 @@ int sqlite3AutoLoadExtensions(sqlite3 *db){
   }
   for(i=0; go; i++){
     char *zErrmsg = 0;
-    sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_GLOBAL);
+    sqlite3_mutex *mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER);
     sqlite3_mutex_enter(mutex);
     if( i>=nAutoExtension ){
       xInit = 0;

diff --git a/src/os_unix.c b/src/os_unix.c
index a268f28bce6470815d3f844e5fb1a067734cf6f2..066ae6e58982ad188f385d2c9a04d001308db01c 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -373,10 +373,10 @@ typedef enum {
 ** Helper functions to obtain and relinquish the global mutex.
 */
 static void enterMutex(){
-  sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_GLOBAL));
+  sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
 }
 static void leaveMutex(){
-  sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_GLOBAL));
+  sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_MASTER));
 }
 
 #if SQLITE_THREADSAFE

diff --git a/src/random.c b/src/random.c
index 6443a01e0d8f259f75a77c3761a9da64b82ce798..19b284f94f0d3aee19a5bbe32dd073f97bfe0504 100644 (file)
--- a/src/random.c
+++ b/src/random.c
@@ -15,7 +15,7 @@
 ** Random numbers are used by some of the database backends in order
 ** to generate random integer keys for tables or random filenames.
 **
-** $Id: random.c,v 1.19 2007/08/21 10:44:16 drh Exp $
+** $Id: random.c,v 1.20 2007/08/21 13:51:23 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -91,9 +91,13 @@ static int randomByte(void){
 */
 void sqlite3Randomness(int N, void *pBuf){
   unsigned char *zBuf = pBuf;
-  sqlite3_mutex_enter(sqlite3_mutex_alloc(SQLITE_MUTEX_PRNG));
+  static sqlite3_mutex *mutex = 0;
+  if( mutex==0 ){
+    mutex = sqlite3_mutex_alloc(SQLITE_MUTEX_STATIC_PRNG);
+  }
+  sqlite3_mutex_enter(mutex);
   while( N-- ){
     *(zBuf++) = randomByte();
   }
-  sqlite3_mutex_leave(sqlite3_mutex_alloc(SQLITE_MUTEX_PRNG));
+  sqlite3_mutex_leave(mutex);
 }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 63bb6a3d958bd4faa674dd5a30388d4e980f5497..d388afffdfd302fed59d17b2a43beb54efdb121d 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.593 2007/08/20 22:48:43 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.594 2007/08/21 13:51:23 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -193,16 +193,6 @@ typedef INT16_TYPE i16;            /* 2-byte signed integer */
 typedef UINT8_TYPE u8;             /* 1-byte unsigned integer */
 typedef UINT8_TYPE i8;             /* 1-byte signed integer */
 
-/*
-** The mutex subsystem provides a handfull of static mutexes
-** that are identified by small positive integers.  The following
-** macros give symbolic names to those integers.
-*/
-#define SQLITE_MUTEX_MEM      1    /* Used by the memory allocator */
-#define SQLITE_MUTEX_PRNG     2    /* Used by pseudorandom generator */
-#define SQLITE_MUTEX_GLOBAL   3    /* Used by global variables */
-#define SQLITE_MUTEX_STATIC_MAX 3
-
 /*
 ** Macros to determine whether the machine is big or little endian,
 ** evaluated at runtime.