database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

In os_unix.c, make a distinction between pread() and pread64(). Add a new

Browse Source 
compile-time macro USE_PREAD64 to select the latter. (CVS 3709)

FossilOrigin-Name: 177cd92910d01c97eb3133a59fad417edbb1aa92
This commit is contained in:
drh
2007-03-22 15:22:06 +00:00
parent 73375822d4
commit 8350a2187a
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Call\ssqlite3_free()\sinstead\sof\sfree()\sto\srelease\sa\sbuffer\sallocated\sby\ssqlite3_vmprintf()\sin\stest_async.c\s(test\ssuite\sbug\sonly).\s(CVS\s3708) C In\sos_unix.c,\smake\sa\sdistinction\sbetween\spread()\sand\spread64().\s\sAdd\sa\snew\ncompile-time\smacro\sUSE_PREAD64\sto\sselect\sthe\slatter.\s(CVS\s3709)
D 2007-03-22T15:20:00 D 2007-03-22T15:22:06
F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -82,7 +82,7 @@ F src/os_os2.c 175101ffc2142c3fc7962ed7a171806f28f95363
F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3 F src/os_os2.h e5f17dd69333632bbc3112881ea407c37d245eb3
F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c 33ee7c1483fbd4d67cf5638c87622c277442b744 F src/os_unix.c f6c261661a4b88da679dfb45069a46680d8f18d3
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c f3ca3e08167eb3382781b840e787809eccb626dc F src/os_win.c f3ca3e08167eb3382781b840e787809eccb626dc
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -437,7 +437,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P d04fa3a13a84f49074c673b8ee2fb6541da061b5 P b078f09bffee5863d595d281f2ecd14e1c9ec727
R 5327334ba0c57477e0c9404d6f419f54 R 9457b72e4d50a7bf046bedc43327a3b4
U danielk1977 U drh
Z 8aabe8cf7a145f47786e9385aa8a3f47 Z 2f03d003f64477a1b374c8414bc90cbd

2
manifest.uuid
View File

@@ -1 +1 @@
b078f09bffee5863d595d281f2ecd14e1c9ec727 177cd92910d01c97eb3133a59fad417edbb1aa92

8
src/os_unix.c
View File

@@ -1002,8 +1002,10 @@ static int seekAndRead(unixFile *id, void *pBuf, int cnt){
int got; int got;
i64 newOffset; i64 newOffset;
TIMER_START; TIMER_START;
#ifdef USE_PREAD #if defined(USE_PREAD)
got = pread(id->h, pBuf, cnt, id->offset); got = pread(id->h, pBuf, cnt, id->offset);
#elif defined(USE_PREAD64)
got = pread64(id->h, pBuf, cnt, id->offset);
#else #else
newOffset = lseek(id->h, id->offset, SEEK_SET); newOffset = lseek(id->h, id->offset, SEEK_SET);
if( newOffset!=id->offset ){ if( newOffset!=id->offset ){
@@ -1047,8 +1049,10 @@ static int seekAndWrite(unixFile *id, const void *pBuf, int cnt){
int got; int got;
i64 newOffset; i64 newOffset;
TIMER_START; TIMER_START;
#ifdef USE_PREAD #if defined(USE_PREAD)
got = pwrite(id->h, pBuf, cnt, id->offset); got = pwrite(id->h, pBuf, cnt, id->offset);
#elif defined(USE_PREAD64)
got = pwrite64(id->h, pBuf, cnt, id->offset);
#else #else
newOffset = lseek(id->h, id->offset, SEEK_SET); newOffset = lseek(id->h, id->offset, SEEK_SET);
if( newOffset!=id->offset ){ if( newOffset!=id->offset ){