diff options
| author | shane <shane@noemail.net> | 2008-05-29 20:22:37 +0000 |
|---|---|---|
| committer | shane <shane@noemail.net> | 2008-05-29 20:22:37 +0000 |
| commit | 9bcbdad2983a5f20438deee53ed6a1c545495771 (patch) | |
| tree | f3ebd1f6bd0bab4087173d3cb2a0e5656fb1054d /src/os_unix.c | |
| parent | 174edc64770dcf9401fdb09d503eb28e1c9ff70f (diff) | |
| download | sqlite-9bcbdad2983a5f20438deee53ed6a1c545495771.tar.gz sqlite-9bcbdad2983a5f20438deee53ed6a1c545495771.zip | |
Consolidated inline assembly versions of "hwtime()" into hwtime.h. Provided MSVC version. Modified code for consistent use of hwtime(). Changed implementation to use sqlite_uint64 and sqlite_int64 instead of unsigned long long int and long long int for MSVC compiler support. (CVS 5178)
FossilOrigin-Name: 9883b406ce24eae93942ee5e6aab33fb6b05329f
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 2f99db460..45b08d6c6 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -12,7 +12,7 @@ ** ** This file contains code that is specific to Unix systems. ** -** $Id: os_unix.c,v 1.182 2008/05/16 04:51:55 danielk1977 Exp $ +** $Id: os_unix.c,v 1.183 2008/05/29 20:22:37 shane Exp $ */ #include "sqliteInt.h" #if OS_UNIX /* This file is used on unix only */ @@ -805,7 +805,7 @@ static int seekAndRead(unixFile *id, sqlite3_int64 offset, void *pBuf, int cnt){ got = read(id->h, pBuf, cnt); #endif TIMER_END; - OSTRACE5("READ %-3d %5d %7lld %d\n", id->h, got, offset, TIMER_ELAPSED); + OSTRACE5("READ %-3d %5d %7lld %llu\n", id->h, got, offset, TIMER_ELAPSED); return got; } @@ -853,7 +853,7 @@ static int seekAndWrite(unixFile *id, i64 offset, const void *pBuf, int cnt){ got = write(id->h, pBuf, cnt); #endif TIMER_END; - OSTRACE5("WRITE %-3d %5d %7lld %d\n", id->h, got, offset, TIMER_ELAPSED); + OSTRACE5("WRITE %-3d %5d %7lld %llu\n", id->h, got, offset, TIMER_ELAPSED); return got; } |