Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | For lsmtest, use a more portable means of setting open() files to binary. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: | aea6e0ffd33f41482f1b53b9f21b77ad |
| User & Date: | mistachkin 2017-07-07 21:15:24 |
Context
|
2017-07-07
| ||
| 21:20 | Fix comment in the Win32 VFS for lsm1. check-in: 12a421bc user: mistachkin tags: trunk | |
| 21:15 | For lsmtest, use a more portable means of setting open() files to binary. check-in: aea6e0ff user: mistachkin tags: trunk | |
| 20:35 | Adjust copy_file() lsmtest function so it works properly for locked database files on Win32. check-in: 54a38555 user: mistachkin tags: trunk | |
Changes
Changes to ext/lsm1/lsm-test/lsmtest.h.
10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
#include <stdlib.h>
#include <string.h>
#include <stdio.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)
|
> > > > |
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _O_BINARY
# define _O_BINARY (0)
#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)
|
Changes to ext/lsm1/lsm-test/lsmtest6.c.
265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
int fd1;
int fd2;
off_t sz;
off_t i;
struct stat buf;
u8 *aBuf;
fd1 = open(zFrom, O_RDONLY, 0644);
fd2 = open(zTo, O_RDWR | O_CREAT, 0644);
fstat(fd1, &buf);
sz = buf.st_size;
ftruncate(fd2, sz);
aBuf = testMalloc(4096);
for(i=0; i<sz; i+=4096){
|
| | |
265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 |
int fd1;
int fd2;
off_t sz;
off_t i;
struct stat buf;
u8 *aBuf;
fd1 = open(zFrom, O_RDONLY | _O_BINARY, 0644);
fd2 = open(zTo, O_RDWR | O_CREAT | _O_BINARY, 0644);
fstat(fd1, &buf);
sz = buf.st_size;
ftruncate(fd2, sz);
aBuf = testMalloc(4096);
for(i=0; i<sz; i+=4096){
|
Changes to ext/lsm1/lsm-test/lsmtest_io.c.
223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
if( pgsz<=0 ){
testPrintError("Ridiculous page size: %d", pgsz);
return -1;
}
aData = malloc(pgsz);
memset(aData, 0x77, pgsz);
ctx.fd = open(zFile, O_RDWR|O_CREAT, 0644);
if( ctx.fd<0 ){
perror("open: ");
return -1;
}
if( nArg==2 ){
readStdin(&zStdin);
|
| |
223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
if( pgsz<=0 ){
testPrintError("Ridiculous page size: %d", pgsz);
return -1;
}
aData = malloc(pgsz);
memset(aData, 0x77, pgsz);
ctx.fd = open(zFile, O_RDWR|O_CREAT|_O_BINARY, 0644);
if( ctx.fd<0 ){
perror("open: ");
return -1;
}
if( nArg==2 ){
readStdin(&zStdin);
|
Changes to ext/lsm1/lsm-test/lsmtest_main.c.
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
....
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
|
}else{
printf("Sync after each %d blocks.\n", nSync);
}
printf("Preparing file... ");
fflush(stdout);
unlink("writer.out");
fd = open("writer.out", O_RDWR|O_CREAT, 0664);
if( fd<0 ){
testPrintError("open(): %d - %s\n", errno, strerror(errno));
return -1;
}
testTimeInit();
for(i=0; i<nBlock; i++){
int iPg;
................................................................................
#ifdef LSM_DEBUG_MEM
FILE *pReport = 0; /* lsm malloc() report file */
const char *zReport = "malloc.txt generated";
#else
const char *zReport = "malloc.txt NOT generated";
#endif
#if defined(_MSC_VER) || defined(__MSVCRT__)
_set_fmode(_O_BINARY);
#endif
testMallocInstall(tdb_lsm_env());
if( argc<2 ){
testPrintError("Usage: %s sub-command ?args...?\n", argv[0]);
return -1;
}
|
|
<
<
<
<
|
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
....
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
|
}else{
printf("Sync after each %d blocks.\n", nSync);
}
printf("Preparing file... ");
fflush(stdout);
unlink("writer.out");
fd = open("writer.out", O_RDWR|O_CREAT|_O_BINARY, 0664);
if( fd<0 ){
testPrintError("open(): %d - %s\n", errno, strerror(errno));
return -1;
}
testTimeInit();
for(i=0; i<nBlock; i++){
int iPg;
................................................................................
#ifdef LSM_DEBUG_MEM
FILE *pReport = 0; /* lsm malloc() report file */
const char *zReport = "malloc.txt generated";
#else
const char *zReport = "malloc.txt NOT generated";
#endif
testMallocInstall(tdb_lsm_env());
if( argc<2 ){
testPrintError("Usage: %s sub-command ?args...?\n", argv[0]);
return -1;
}
|