Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch lsm_env-xsize Excluding Merge-Ins
This is equivalent to a diff from 28a10397d1 to 1eb4aaa4c2
2012-07-07
| ||
11:44 | merged in lsm_env-xsize branch. check-in: 3dd0037efb user: stephan tags: trunk | |
11:43 | Added license header to test_mem.c Closed-Leaf check-in: 1eb4aaa4c2 user: stephan tags: lsm_env-xsize | |
11:30 | Updates to test_mem.c. Add the "mtv.tcl" script to the tool/ directory. check-in: 4c5516a180 user: dan tags: lsm_env-xsize | |
2012-07-06
| ||
22:38 | Minor internal doc correction. check-in: 2ee70dc7a3 user: stephan tags: trunk | |
21:58 | Create new branch named "lsm_env-xsize" check-in: 6d31a9d20c user: stephan tags: lsm_env-xsize | |
17:42 | Add file "shm.wiki" with notes regarding shared memory contents. check-in: daac1c7c4e user: dan tags: multi-process | |
2012-07-04
| ||
09:44 | Remove unused variable. check-in: 28a10397d1 user: dan tags: trunk | |
2012-07-03
| ||
18:59 | Add OOM test cases. check-in: e5f3a7f3bb user: dan tags: trunk | |
Changes to GNUmakefile.linux.
︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | + | ifeq (clang,$(compiler)) BCC ?= clang -g -Wall endif ######################################################################## # optionally set OPTS to various sqlite4 build options. # OPTS = -DHI_WORLD # OPTS += -DLSM_DEBUG_MEM=1 ######################################################################## # Now include the main rules... include Makefile.linux-gcc ######################################################################## # Force regeneration of sqlite4.h if any makefiles change... parse.h sqlite4.h: $(MAKEFILE_LIST) |
︙ |
Changes to main.mk.
︙ | |||
227 228 229 230 231 232 233 234 235 236 237 238 239 240 | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | + | $(TOP)/test/test_utf.c \ $(TOP)/test/test_misc1.c \ $(TOP)/test/test_config.c \ $(TOP)/test/test_func.c \ $(TOP)/test/test_hexio.c \ $(TOP)/test/test_lsm.c \ $(TOP)/test/test_malloc.c \ $(TOP)/test/test_mem.c \ $(TOP)/test/test_mutex.c \ $(TOP)/test/test_storage.c \ $(TOP)/test/test_storage2.c \ $(TOP)/test/test_thread.c \ $(TOP)/test/test_wsd.c #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c |
︙ | |||
565 566 567 568 569 570 571 572 573 574 | 566 567 568 569 570 571 572 573 574 575 576 | + | rm -f $(PUBLISH) rm -f *.da *.bb *.bbg gmon.out rm -rf tsrc target_source rm -f testloadext.dll libtestloadext.so rm -f amalgamation-testfixture amalgamation-testfixture.exe rm -f fts3-testfixture fts3-testfixture.exe rm -f testfixture testfixture.exe rm -f lsmtest rm -f threadtest3 threadtest3.exe rm -f sqlite4.c fts?amal.c tclsqlite4.c rm -f sqlite4_analyzer sqlite4_analyzer.exe sqlite4_analyzer.c |
Changes to src/Makefile.
1 | 1 2 3 4 | - + | default: |
Changes to src/lsm.h.
︙ | |||
11 12 13 14 15 16 17 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | - + | ************************************************************************* ** ** This file defines the LSM API. */ #ifndef _LSM_H #define _LSM_H #include <stddef.h> |
︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | + + + | int (*xClose)(lsm_file *); int (*xUnlink)(lsm_env*, const char *); /****** memory allocation ****************************************/ void *pMemCtx; void *(*xMalloc)(lsm_env*, int); /* malloc(3) function */ void *(*xRealloc)(lsm_env*, void *, int); /* realloc(3) function */ void (*xFree)(lsm_env*, void *); /* free(3) function */ #if 1 sqlite4_size_t (*xSize)(lsm_env*, void *); /* xSize function */ #endif /****** mutexes ****************************************************/ void *pMutexCtx; int (*xMutexStatic)(lsm_env*,int,lsm_mutex**); /* Obtain a static mutex */ int (*xMutexNew)(lsm_env*, lsm_mutex**); /* Get a new dynamic mutex */ void (*xMutexDel)(lsm_mutex *); /* Delete an allocated mutex */ void (*xMutexEnter)(lsm_mutex *); /* Grab a mutex */ int (*xMutexTry)(lsm_mutex *); /* Attempt to obtain a mutex */ |
︙ |
Changes to src/lsm_shared.c.
︙ | |||
754 755 756 757 758 759 760 | 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 | - - | ** must be held in order to call this function. ** ** If successful, *piBlk is set to the block number allocated and LSM_OK is ** returned. Otherwise, *piBlk is zeroed and an lsm error code returned. */ int lsmBlockAllocate(lsm_db *pDb, int *piBlk){ Database *p = pDb->pDatabase; |
︙ |
Changes to src/lsm_unix.c.
︙ | |||
277 278 279 280 281 282 283 | 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + | int prc = unlink(zFile); return prc ? LSM_IOERR_BKPT : LSM_OK; } /**************************************************************************** ** Memory allocation routines. */ #define ROUND8(x) (((x)+7)&~7) #define BLOCK_HDR_SIZE ROUND8( sizeof(sqlite4_size_t) ) |
︙ | |||
488 489 490 491 492 493 494 | 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 | - + + | lsmPosixOsClose, /* xClose */ lsmPosixOsUnlink, /* xUnlink */ /***** memory allocation *********/ 0, /* pMemCtx */ lsmPosixOsMalloc, /* xMalloc */ lsmPosixOsRealloc, /* xRealloc */ lsmPosixOsFree, /* xFree */ |
Changes to src/tclsqlite.c.
︙ | |||
36 37 38 39 40 41 42 | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | - + | # include "sqlite4.h" # include <stdlib.h> # include <string.h> # include <assert.h> typedef unsigned char u8; #endif #include <ctype.h> |
︙ | |||
2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 | 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 | + | if( !slave ){ return TCL_ERROR; } init_all(slave); return TCL_OK; } /* ** Tclcmd: db_use_legacy_prepare DB BOOLEAN ** ** The first argument to this command must be a database command created by ** [sqlite4]. If the second argument is true, then the handle is configured ** to use the sqlite4_prepare_v2() function to prepare statements. If it |
︙ | |||
2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 | 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 | + + | extern int Sqlitetestrtree_Init(Tcl_Interp*); extern int Sqlitequota_Init(Tcl_Interp*); extern int SqliteSuperlock_Init(Tcl_Interp*); extern int SqlitetestSyscall_Init(Tcl_Interp*); extern int Sqliteteststorage_Init(Tcl_Interp*); extern int Sqliteteststorage2_Init(Tcl_Interp*); extern int SqlitetestLsm_Init(Tcl_Interp*); extern int Sqlitetest_mem_Init(Tcl_Interp*); Sqliteconfig_Init(interp); Sqlitetest1_Init(interp); Sqlitetest4_Init(interp); Sqlitetest5_Init(interp); Sqlitetest9_Init(interp); Sqlitetest_hexio_Init(interp); Sqlitetest_malloc_Init(interp); Sqlitetest_mutex_Init(interp); SqlitetestThread_Init(interp); Sqliteteststorage_Init(interp); Sqliteteststorage2_Init(interp); SqlitetestLsm_Init(interp); Sqlitetest_mem_Init(interp); Tcl_CreateObjCommand( interp, "load_testfixture_extensions", init_all_cmd, 0, 0 ); Tcl_CreateObjCommand( interp, "db_use_legacy_prepare", db_use_legacy_prepare_cmd, 0, 0 |
︙ | |||
2987 2988 2989 2990 2991 2992 2993 | 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 | - + - + + + | Tcl_Interp *interp; /* Call sqlite4_shutdown() once before doing anything else. This is to ** test that sqlite4_shutdown() can be safely called by a process before ** sqlite4_initialize() is. */ sqlite4_shutdown(0); |
Changes to test/test_main.c.
︙ | |||
180 181 182 183 184 185 186 | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | - | #define StmtToDb(X) sqlite4_db_handle(X) /* ** Check a return value to make sure it agrees with the results ** from sqlite4_errcode. */ int sqlite4TestErrCode(Tcl_Interp *interp, sqlite4 *db, int rc){ |
︙ |
Added test/test_mem.c.