After running speed1.test and speed1p.test, reset the size of the lookaside buffer. Otherwise, subsequent runs of malloc5.test may report an error. Changes to test code only. (CVS 5824)
FossilOrigin-Name: 9283478e69d84aa99b2d4636587c8c0b34e7c4da
This commit is contained in:
danielk1977
parent
4bd3ce69ac
commit
ab7bee892b
16
manifest
16
manifest
@ -1,5 +1,5 @@
|
||||
C Disable\sthe\spage-cache\sat\sthe\send\sof\spcache2.test.\s(CVS\s5823)
|
||||
D 2008-10-14T19:21:52
|
||||
C After\srunning\sspeed1.test\sand\sspeed1p.test,\sreset\sthe\ssize\sof\sthe\slookaside\sbuffer.\sOtherwise,\ssubsequent\sruns\sof\smalloc5.test\smay\sreport\san\serror.\sChanges\sto\stest\scode\sonly.\s(CVS\s5824)
|
||||
D 2008-10-15T11:43:55
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in 2014e5a4010ad5ebbcaedff98240b3d14ee83838
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -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 c4e5e3ea12c81b67e7b5473a06e900bc9881e722
|
||||
F src/test_malloc.c 243244eb3ba2095db8b65a797d23de72c75e848c
|
||||
F src/test_md5.c 28209a4e2068711b5443c33104fe41f21d160071
|
||||
F src/test_mutex.c d3422d9f60cc1330249d102e74b333f0d24a0cb6
|
||||
F src/test_onefile.c 243157b10275251c5dc2d6619aee2ff9ae22379c
|
||||
@ -496,9 +496,9 @@ F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
|
||||
F test/soak.test 3c317b3e55e1160731030c8e865d1858fab66fea
|
||||
F test/softheap1.test 73ebd6e020d2954d965da2072baba5922fc8fb6a
|
||||
F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
|
||||
F test/speed1.test 155493358a9aa96b61e51ba546dc80c7ce501251
|
||||
F test/speed1.test c74564fea46e094d6b518bf464c355991905eea2
|
||||
F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
|
||||
F test/speed1p.test a656e04f07e6f7ba55d031e8287abdefa48ddbd7
|
||||
F test/speed1p.test 7f046639ffd70e6b1deb38684ef2208a43b45df3
|
||||
F test/speed2.test 53177056baf6556dcbdcf032bbdfc41c1aa74ded
|
||||
F test/speed3.test e312d7e442a5047d730569fdae2ba99bc94e1a13
|
||||
F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
|
||||
@ -648,7 +648,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P 494510d8f25c69f5a5f5937b92f505849def6745
|
||||
R b7389beb7dc5a80380c024a04056c162
|
||||
P 3d2d05b6286e2a22a711e02f37748065b3b7f86e
|
||||
R 471b5d462241fc0e1a0cb7b7d4155791
|
||||
U danielk1977
|
||||
Z 3d24cf7d9bd7bf0f7354b4d7f17fad1f
|
||||
Z eee97e63dce82dee7a4ebfea59be659b
|
||||
|
||||
@ -1 +1 @@
|
||||
3d2d05b6286e2a22a711e02f37748065b3b7f86e
|
||||
9283478e69d84aa99b2d4636587c8c0b34e7c4da
|
||||
@ -13,7 +13,7 @@
|
||||
** This file contains code used to implement test interfaces to the
|
||||
** memory allocation subsystem.
|
||||
**
|
||||
** $Id: test_malloc.c,v 1.48 2008/10/10 17:41:29 drh Exp $
|
||||
** $Id: test_malloc.c,v 1.49 2008/10/15 11:43:55 danielk1977 Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include "tcl.h"
|
||||
@ -1001,14 +1001,22 @@ static int test_config_lookaside(
|
||||
){
|
||||
int rc;
|
||||
int sz, cnt;
|
||||
Tcl_Obj *pRet;
|
||||
if( objc!=3 ){
|
||||
Tcl_WrongNumArgs(interp, 1, objv, "SIZE COUNT");
|
||||
return TCL_ERROR;
|
||||
}
|
||||
if( Tcl_GetIntFromObj(interp, objv[1], &sz) ) return TCL_ERROR;
|
||||
if( Tcl_GetIntFromObj(interp, objv[2], &cnt) ) return TCL_ERROR;
|
||||
pRet = Tcl_NewObj();
|
||||
Tcl_ListObjAppendElement(
|
||||
interp, pRet, Tcl_NewIntObj(sqlite3GlobalConfig.szLookaside)
|
||||
);
|
||||
Tcl_ListObjAppendElement(
|
||||
interp, pRet, Tcl_NewIntObj(sqlite3GlobalConfig.nLookaside)
|
||||
);
|
||||
rc = sqlite3_config(SQLITE_CONFIG_LOOKASIDE, sz, cnt);
|
||||
Tcl_SetObjResult(interp, Tcl_NewIntObj(rc));
|
||||
Tcl_SetObjResult(interp, pRet);
|
||||
return TCL_OK;
|
||||
}
|
||||
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
# This file implements regression tests for SQLite library. The
|
||||
# focus of this script is measuring executing speed.
|
||||
#
|
||||
# $Id: speed1.test,v 1.9 2008/07/30 13:15:46 drh Exp $
|
||||
# $Id: speed1.test,v 1.10 2008/10/15 11:43:55 danielk1977 Exp $
|
||||
#
|
||||
|
||||
sqlite3_shutdown
|
||||
#sqlite3_config_scratch 29000 1
|
||||
sqlite3_config_lookaside 1000 300
|
||||
set old_lookaside [sqlite3_config_lookaside 1000 300]
|
||||
#sqlite3_config_pagecache 1024 10000
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
@ -290,4 +290,7 @@ do_test speed1-1.2 {
|
||||
} 10000
|
||||
speed_trial_summary speed1
|
||||
|
||||
db close
|
||||
sqlite3_shutdown
|
||||
eval sqlite3_config_lookaside $old_lookaside
|
||||
finish_test
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
#
|
||||
# This is a copy of speed1.test modified to user prepared statements.
|
||||
#
|
||||
# $Id: speed1p.test,v 1.5 2008/07/30 13:15:46 drh Exp $
|
||||
# $Id: speed1p.test,v 1.6 2008/10/15 11:43:55 danielk1977 Exp $
|
||||
#
|
||||
|
||||
sqlite3_shutdown
|
||||
#sqlite3_config_scratch 29000 1
|
||||
sqlite3_config_lookaside 2048 300
|
||||
set old_lookaside [sqlite3_config_lookaside 2048 300]
|
||||
#sqlite3_config_pagecache 1024 11000
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
@ -326,7 +326,6 @@ speed_trial speed1p-random-del1 20000 row {
|
||||
do_test speed1p-1.1 {
|
||||
db one {SELECT count(*) FROM t1}
|
||||
} 30000
|
||||
|
||||
|
||||
# Delete 20000 more rows at random from the table.
|
||||
#
|
||||
@ -339,4 +338,7 @@ do_test speed1p-1.2 {
|
||||
} 10000
|
||||
speed_trial_summary speed1
|
||||
|
||||
db close
|
||||
sqlite3_shutdown
|
||||
eval sqlite3_config_lookaside $old_lookaside
|
||||
finish_test
|
||||
|
||||
Loading…
Reference in New Issue
Block a user