Removed a few more small parts of memsys6 code, including some config and test code...

FossilOrigin-Name: a11241d6fbc9e0408d5adc73d494b85124d2d609

diff --git a/manifest b/manifest
index 0630379f2ff41ac0028f4f9c3534f3927bb81531..21fe96ad3a69dc0271d15f0bf2321e4fb94af9b2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sbtree.c,\somit\scalls\sto\ssetChildPtrmaps()\sif\sSQLITE_OMIT_AUTOVACUUM\sis\sdefined.\sTicket\s#3439.\s(CVS\s5871)
-D 2008-11-10T17:14:58
+C Removed\sa\sfew\smore\ssmall\sparts\sof\smemsys6\scode,\sincluding\ssome\sconfig\sand\stest\scode\sfor\sit;\s(CVS\s5872)
+D 2008-11-10T18:05:36
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 48172b58e444a9725ec482e0c022a564749acab4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -118,7 +118,7 @@ F src/insert.c d61998cb8d934bd42b77bd362f94cc3368c5d5f7
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c aac57bd984e666059011ea01ec4383892a253be3
 F src/loadext.c 3872457afdf25bb174fd383cb4e3e0d2a9e60552
-F src/main.c 02e1f05f949f614563db03998b0f3ec70273332e
+F src/main.c cdc0fa9b11254d7e9f15c67b22a3981cb5090119
 F src/malloc.c a213fb461b8df08aed7606f6a1e1d3452e089000
 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c 2091081d1c6bcd4516738f37cd84d42e814cf9a2
@@ -150,9 +150,9 @@ F src/random.c a87afbd598aa877e23ac676ee92fd8ee5c786a51
 F src/resolve.c 266bb03d2b456fe68f5df2dd5687e7e88ff8088d
 F src/select.c 0d79c6c0b48b9d67a443853fd6add8c2967ba870
 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967
-F src/sqlite.h.in e3bbc8a9ca3da538e8670ba8341ebef56181bee5
+F src/sqlite.h.in d78bb41578104ca45d2e3e219b191f8e412bb726
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h e32c2dbd6d2e53c2a4d137ce977313a38df38f8a
+F src/sqliteInt.h 1e112bd969e0b318c8ee13d7104d4ae0a30da822
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
@@ -174,7 +174,7 @@ F src/test_devsym.c 802d10e65b4217208cb47059b84adf46318bcdf4
 F src/test_func.c a55c4d5479ff2eb5c0a22d4d88e9528ab59c953b
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
 F src/test_loadext.c 97dc8800e46a46ed002c2968572656f37e9c0dd9
-F src/test_malloc.c 243244eb3ba2095db8b65a797d23de72c75e848c
+F src/test_malloc.c e2f6e6774308f531a3d12475dd2a5211dd31b7eb
 F src/test_md5.c 28209a4e2068711b5443c33104fe41f21d160071
 F src/test_mutex.c 66c4ab4e0396a440ddb17cd9b58a05305144f05d
 F src/test_onefile.c 243157b10275251c5dc2d6619aee2ff9ae22379c
@@ -459,7 +459,7 @@ F test/pageropt.test 3ee6578891baaca967f0bd349e4abfa736229e1a
 F test/pagesize.test 0d9ff3fedfce6e5ffe8fa7aca9b6d3433a2e843b
 F test/pcache.test 515b4c26e9f57660357dfff5b6b697acac1abc5f
 F test/pcache2.test e2260293e892190be65de89526dbc4f92c8b5a7c
-F test/permutations.test 3f24cf55e9646b138a6980f78f18190f318af9a3
+F test/permutations.test b1b15770940d954dbd874f3e6296ec321b81b5c6
 F test/pragma.test 165372b62391d233715cde82d99f34d306f9257f
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
@@ -654,7 +654,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P dfc94743378e576ecc5c567ae4020bf9594a3fb9
-R ab50adb2868cd6b34252f3f59477e787
+P e0f07323e878c44ad2ccc38628c74c27f79e35ef
+R 4f16e7ef70c35c3587acb462727ce1c9
 U shane
-Z f5661d40fe2eef239e43f4c5401e5473
+Z 142d3f5e3bd748fab846fd6e61a473a6

diff --git a/manifest.uuid b/manifest.uuid
index 6e69f60a2bbb890cf40b9a0c2159784138ac35a0..0376f76ae20f7fd409b899e3c79c985c634cd98e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0f07323e878c44ad2ccc38628c74c27f79e35ef
\ No newline at end of file
+a11241d6fbc9e0408d5adc73d494b85124d2d609
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index e3754b803950911dc32b853754f08daed05ddfa1..810da80daaa98385b6a939963ea568636bca422f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.510 2008/11/04 13:46:28 drh Exp $
+** $Id: main.c,v 1.511 2008/11/10 18:05:36 shane Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -340,14 +340,6 @@ int sqlite3_config(int op, ...){
     }
 #endif
 
-#if defined(SQLITE_ENABLE_MEMSYS6)
-    case SQLITE_CONFIG_CHUNKALLOC: {
-      sqlite3GlobalConfig.nSmall = va_arg(ap, int);
-      sqlite3GlobalConfig.m = *sqlite3MemGetMemsys6();
-      break;
-    }
-#endif
-
     case SQLITE_CONFIG_LOOKASIDE: {
       sqlite3GlobalConfig.szLookaside = va_arg(ap, int);
       sqlite3GlobalConfig.nLookaside = va_arg(ap, int);

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index df02b7c4526659ce6f6e5c38396c280a16d52eea..dd8581bdd148d17e45b7e456eeec1941cb628c8f 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.410 2008/11/10 17:08:49 shane Exp $
+** @(#) $Id: sqlite.h.in,v 1.411 2008/11/10 18:05:36 shane Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -1332,7 +1332,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
 #define SQLITE_CONFIG_MUTEX        10  /* sqlite3_mutex_methods* */
 #define SQLITE_CONFIG_GETMUTEX     11  /* sqlite3_mutex_methods* */
-#define SQLITE_CONFIG_CHUNKALLOC   12  /* int threshold */
+/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */ 
 #define SQLITE_CONFIG_LOOKASIDE    13  /* int int */
 
 /*

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 9496373a1346db500e20312807e3c143344e2b1a..ba13719cbb7c3a79acf93d18f4eef3b78f921300 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.788 2008/11/05 16:37:35 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.789 2008/11/10 18:05:36 shane Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -463,7 +463,7 @@ struct BusyHandler {
 ** buffer that holds real variable.  The constant is also the initializer
 ** for the run-time allocated buffer.
 **
-** In the usually case where WSD is supported, the SQLITE_WSD and GLOBAL
+** In the usual case where WSD is supported, the SQLITE_WSD and GLOBAL
 ** macros become no-ops and have zero performance impact.
 */
 #ifdef SQLITE_OMIT_WSD
@@ -1972,7 +1972,6 @@ struct Sqlite3Config {
   int isMallocInit;                 /* True after malloc is initialized */
   sqlite3_mutex *pInitMutex;        /* Mutex used by sqlite3_initialize() */
   int nRefInitMutex;                /* Number of users of pInitMutex */
-  int nSmall;                       /* alloc size threshold used by mem6.c */
   int mxParserStack;                /* maximum depth of the parser stack */
   int sharedCacheEnabled;           /* true if shared-cache mode enabled */
 };

diff --git a/src/test_malloc.c b/src/test_malloc.c
index 8c24961b7678d7b0be71e26660cfb93e39591276..bcf18d2a05cc49fc95aa99f6c654befb3dea1b62 100644 (file)
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -13,7 +13,7 @@
 ** This file contains code used to implement test interfaces to the
 ** memory allocation subsystem.
 **
-** $Id: test_malloc.c,v 1.49 2008/10/15 11:43:55 danielk1977 Exp $
+** $Id: test_malloc.c,v 1.50 2008/11/10 18:05:36 shane Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -967,28 +967,6 @@ static int test_config_memstatus(
   return TCL_OK;
 }
 
-/*
-** Usage:    sqlite3_config_chunkalloc 
-**
-*/
-static int test_config_chunkalloc(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  int rc;
-  int nThreshold;
-  if( objc!=2 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "THRESHOLD");
-    return TCL_ERROR;
-  }
-  if( Tcl_GetIntFromObj(interp, objv[1], &nThreshold) ) return TCL_ERROR;
-  rc = sqlite3_config(SQLITE_CONFIG_CHUNKALLOC, nThreshold);
-  Tcl_SetObjResult(interp, Tcl_NewIntObj(rc));
-  return TCL_OK;
-}
-
 /*
 ** Usage:    sqlite3_config_lookaside  SIZE  COUNT
 **
@@ -1339,7 +1317,6 @@ int Sqlitetest_malloc_Init(Tcl_Interp *interp){
      { "install_malloc_faultsim",    test_install_malloc_faultsim  ,0 },
      { "sqlite3_config_heap",        test_config_heap              ,0 },
      { "sqlite3_config_memstatus",   test_config_memstatus         ,0 },
-     { "sqlite3_config_chunkalloc",  test_config_chunkalloc        ,0 },
      { "sqlite3_config_lookaside",   test_config_lookaside         ,0 },
      { "sqlite3_config_error",       test_config_error             ,0 },
      { "sqlite3_db_config_lookaside",test_db_config_lookaside      ,0 },

diff --git a/test/permutations.test b/test/permutations.test
index b459cd0a7fbda116203705b775eea7bc92eb0c65..a42bea01917ea26a6fda9a5426f233b52947352c 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: permutations.test,v 1.36 2008/10/17 18:51:53 danielk1977 Exp $
+# $Id: permutations.test,v 1.37 2008/11/10 18:05:36 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -565,27 +565,6 @@ ifcapable threadsafe {
   }
 }
 
-run_tests "memsys6" -description {
-  Run tests using the allocator in mem6.c.
-} -exclude {
-  capi3.test capi3c.test 
-} -initialize {
-  catch {db close}
-  sqlite3_reset_auto_extension
-  sqlite3_shutdown
-  sqlite3_config_chunkalloc 0
-  install_malloc_faultsim 1 
-  sqlite3_initialize
-  autoinstall_test_functions
-} -shutdown {
-  catch {db close}
-  sqlite3_reset_auto_extension
-  sqlite3_shutdown
-  sqlite3_config_heap 0 0
-  install_malloc_faultsim 1 
-  sqlite3_initialize
-}
-
 # run_tests "crash_safe_append" -description {
 #   Run crash.test with persistent journals on a SAFE_APPEND file-system.
 # } -initialize {