Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Cleanup header usage in lsmtest for files that require _O_BINARY. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
f3a6a64ec90e6cf24aadf62aef4f9210 |
User & Date: | mistachkin 2017-07-10 18:57:03.034 |
Context
2017-07-10
| ||
19:03 | Fix an obsolete statement about Lemon in the README.md file. (check-in: 4f6ce7a38b user: drh tags: trunk) | |
18:57 | Cleanup header usage in lsmtest for files that require _O_BINARY. (check-in: f3a6a64ec9 user: mistachkin tags: trunk) | |
18:52 | Updates to the repository README.md file. (check-in: 7bfd3ab799 user: drh tags: trunk) | |
Changes
Changes to ext/lsm1/lsm-test/lsmtest.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | #ifndef __WRAPPER_INT_H_ #define __WRAPPER_INT_H_ #include "lsmtest_tdb.h" #include "sqlite3.h" #include "lsm.h" #include <assert.h> #include <stdlib.h> #include <string.h> #include <stdio.h> #ifdef __cplusplus extern "C" { #endif | > > > > > > > > > > < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #ifndef __WRAPPER_INT_H_ #define __WRAPPER_INT_H_ #include "lsmtest_tdb.h" #include "sqlite3.h" #include "lsm.h" #include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> #include <stdio.h> #ifndef _WIN32 # include <unistd.h> #endif #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <ctype.h> #include <stdlib.h> #include <errno.h> #ifdef __cplusplus extern "C" { #endif #ifdef _WIN32 # include "windows.h" # define gettimeofday win32GetTimeOfDay # define F_OK (0) # define sleep(sec) Sleep(1000 * (sec)) # define usleep(usec) Sleep(((usec) + 999) / 1000) # ifdef _MSC_VER |
︙ | ︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 64 | #define MIN(x,y) ((x)<(y) ? (x) : (y)) #define MAX(x,y) ((x)>(y) ? (x) : (y)) #define unused_parameter(x) (void)(x) #define TESTDB_DEFAULT_PAGE_SIZE 4096 #define TESTDB_DEFAULT_CACHE_SIZE 2048 /* ** Ideally, these should be in wrapper.c. But they are here instead so that ** they can be used by the C++ database wrappers in wrapper2.cc. */ typedef struct DatabaseMethods DatabaseMethods; struct TestDb { | > > > > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | #define MIN(x,y) ((x)<(y) ? (x) : (y)) #define MAX(x,y) ((x)>(y) ? (x) : (y)) #define unused_parameter(x) (void)(x) #define TESTDB_DEFAULT_PAGE_SIZE 4096 #define TESTDB_DEFAULT_CACHE_SIZE 2048 #ifndef _O_BINARY # define _O_BINARY (0) #endif /* ** Ideally, these should be in wrapper.c. But they are here instead so that ** they can be used by the C++ database wrappers in wrapper2.cc. */ typedef struct DatabaseMethods DatabaseMethods; struct TestDb { |
︙ | ︙ |
Changes to ext/lsm1/lsm-test/lsmtest6.c.
︙ | ︙ | |||
236 237 238 239 240 241 242 | lsm_csr_close(pCsr); *pRc = rc; } } #define LSMTEST6_TESTDB "testdb.lsm" | < < < < < < < | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | lsm_csr_close(pCsr); *pRc = rc; } } #define LSMTEST6_TESTDB "testdb.lsm" void testDeleteLsmdb(const char *zFile){ char *zLog = testMallocPrintf("%s-log", zFile); char *zShm = testMallocPrintf("%s-shm", zFile); unlink(zFile); unlink(zLog); unlink(zShm); testFree(zLog); |
︙ | ︙ |
Changes to ext/lsm1/lsm-test/lsmtest_io.c.
︙ | ︙ | |||
51 52 53 54 55 56 57 | ** $ echo "2M@6M 1492K@4M S 4096@4K S" | lsmtest io testfile.db 4096 ** 3544K written in 127 ms ** */ #include "lsmtest.h" | < < < < < < < < | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | ** $ echo "2M@6M 1492K@4M S 4096@4K S" | lsmtest io testfile.db 4096 ** 3544K written in 127 ms ** */ #include "lsmtest.h" typedef struct IoContext IoContext; struct IoContext { int fd; int nWrite; }; |
︙ | ︙ |
Changes to ext/lsm1/lsm-test/lsmtest_main.c.
1 |
| < < < < < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 | #include "lsmtest.h" #include <sqlite3.h> void test_failed(){ assert( 0 ); return; } #define testSetError(rc) testSetErrorFunc(rc, pRc, __FILE__, __LINE__) |
︙ | ︙ |