Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Trying to get the OS abstraction layer to work. (CVS 256) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
abff526d005b3b46904de091753cc795 |
User & Date: | drh 2001-09-19 13:22:39.000 |
Context
2001-09-19
| ||
13:58 | Add the OpenReadOnly() OS method to fix a bug in the pager. (CVS 257) (check-in: 82db5456c9 user: drh tags: trunk) | |
13:22 | Trying to get the OS abstraction layer to work. (CVS 256) (check-in: abff526d00 user: drh tags: trunk) | |
2001-09-18
| ||
22:17 | Fix a problem in GROUP BY with multiple columns. (CVS 255) (check-in: 22132ce18c user: drh tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
57 58 59 60 61 62 63 | # You should not have to change anything below this line ############################################################################### # Object files for the SQLite library. # LIBOBJ = btree.o build.o delete.o expr.o insert.o \ | | | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | # You should not have to change anything below this line ############################################################################### # Object files for the SQLite library. # LIBOBJ = btree.o build.o delete.o expr.o insert.o \ main.o os.o pager.o parse.o printf.o random.o select.o table.o \ tokenize.o update.o util.o vdbe.o where.o tclsqlite.o # All of the source code files. # SRC = \ $(TOP)/src/btree.c \ $(TOP)/src/btree.h \ |
︙ | ︙ | |||
130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | cp $(TOP)/tool/lempar.c . # Header files used by all library source files. # HDR = \ sqlite.h \ $(TOP)/src/btree.h \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/vdbe.h \ parse.h btree.o: $(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h $(TCC) -c $(TOP)/src/btree.c build.o: $(TOP)/src/build.c $(HDR) $(TCC) -c $(TOP)/src/build.c main.o: $(TOP)/src/main.c $(HDR) $(TCC) -c $(TOP)/src/main.c pager.o: $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h $(TCC) -c $(TOP)/src/pager.c parse.o: parse.c $(HDR) $(TCC) -c parse.c parse.h: parse.c parse.c: $(TOP)/src/parse.y lemon | > > > > | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | cp $(TOP)/tool/lempar.c . # Header files used by all library source files. # HDR = \ sqlite.h \ $(TOP)/src/btree.h \ $(TOP)/src/os.h \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/vdbe.h \ parse.h btree.o: $(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h $(TCC) -c $(TOP)/src/btree.c build.o: $(TOP)/src/build.c $(HDR) $(TCC) -c $(TOP)/src/build.c main.o: $(TOP)/src/main.c $(HDR) $(TCC) -c $(TOP)/src/main.c pager.o: $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h $(TCC) -c $(TOP)/src/pager.c os.o: $(TOP)/src/os.c $(HDR) $(TCC) -c $(TOP)/src/os.c parse.o: parse.c $(HDR) $(TCC) -c parse.c parse.h: parse.c parse.c: $(TOP)/src/parse.y lemon |
︙ | ︙ |
Changes to src/main.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** | | < | < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.39 2001/09/19 13:22:40 drh Exp $ */ #include "sqliteInt.h" #include "os.h" /* ** This is the callback routine for the code that initializes the ** database. Each callback contains the following information: ** ** argv[0] = "meta" or "table" or "index" ** argv[1] = table or index name or meta statement type. |
︙ | ︙ | |||
424 425 426 427 428 429 430 | ** argument. */ static int sqliteDefaultBusyCallback( void *Timeout, /* Maximum amount of time to wait */ const char *NotUsed, /* The name of the table that is busy */ int count /* Number of times table has been busy */ ){ | | | | | | | | | 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 | ** argument. */ static int sqliteDefaultBusyCallback( void *Timeout, /* Maximum amount of time to wait */ const char *NotUsed, /* The name of the table that is busy */ int count /* Number of times table has been busy */ ){ #if SQLITE_MIN_SLEEP_MS==1 int delay = 10; int prior_delay = 0; int timeout = (int)Timeout; int i; for(i=1; i<count; i++){ prior_delay += delay; delay = delay*2; if( delay>=1000 ){ delay = 1000; prior_delay += 1000*(count - i - 1); break; } } if( prior_delay + delay > timeout*1000 ){ delay = timeout*1000 - prior_delay; if( delay<=0 ) return 0; } sqliteOsSleep(delay); return 1; #else int timeout = (int)Timeout; if( (count+1)*1000 > timeout ){ return 0; } sqliteOsSleep(1000); return 1; #endif } /* ** This routine sets the busy callback for an Sqlite database to the ** given callback function with the given argument. |
︙ | ︙ |
Changes to src/os.c.
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | ** This file contains code that is specific to particular operating ** systems. The purpose of this file is to provide a uniform abstract ** on which the rest of SQLite can operate. */ #include "sqliteInt.h" #include "os.h" #if OS_UNIX # include <fcntl.h> # include <sys/stat.h> # include <unistd.h> # include <time.h> #endif #if OS_WIN # include <winbase.h> #endif /* ** Attempt to open a file for both reading and writing. If that ** fails, try opening it read-only. If the file does not exist, ** try to create it. ** ** On success, a handle for the open file is written to *pResult ** and *pReadonly is set to 0 if the file was opened for reading and ** writing or 1 if the file was opened read-only. The function returns ** SQLITE_OK. ** ** On failure, the function returns SQLITE_CANTOPEN and leaves ** *pResulst and *pReadonly unchanged. */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | ** This file contains code that is specific to particular operating ** systems. The purpose of this file is to provide a uniform abstract ** on which the rest of SQLite can operate. */ #include "sqliteInt.h" #include "os.h" #ifndef OS_UNIX # ifndef OS_WIN # define OS_UNIX 1 # else # define OS_UNIX 0 # endif #endif #ifndef OS_WIN # define OS_WIN 0 #endif #if OS_UNIX # include <fcntl.h> # include <sys/stat.h> # include <unistd.h> # include <time.h> #endif #if OS_WIN # include <winbase.h> #endif /* ** Delete the named file */ int sqliteOsDelete(const char *zFilename){ #if OS_UNIX unlink(zFilename); #endif #if OS_WIN DeleteFile(zFilename); #endif return SQLITE_OK; } /* ** Return TRUE if the named file exists. */ int sqliteOsFileExists(const char *zFilename){ #if OS_UNIX return access(zFilename, 0)==0; #endif #if OS_WIN HANDLE h; h = CreateFile(zBuf, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL ); if( h!=INVALID_FILE_HANDLE ){ CloseHandle(h); return 1; } return 0; #endif } /* ** Attempt to open a file for both reading and writing. If that ** fails, try opening it read-only. If the file does not exist, ** try to create it. ** ** On success, a handle for the open file is written to *pResult ** and *pReadonly is set to 0 if the file was opened for reading and ** writing or 1 if the file was opened read-only. The function returns ** SQLITE_OK. ** ** On failure, the function returns SQLITE_CANTOPEN and leaves ** *pResulst and *pReadonly unchanged. */ int sqliteOsOpenReadWrite( const char *zFilename, OsFile *pResult, int *pReadonly ){ #if OS_UNIX int fd = open(zFilename, O_RDWR|O_CREAT, 0644); if( fd<0 ){ fd = open(zFilename, O_RDONLY); if( fd<0 ){ return SQLITE_CANTOPEN; } |
︙ | ︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | *pReadonly = 1; }else{ *pReadonly = 0; } *pResult = h; return SQLITE_OK; #endif /* ** Attempt to open a new file for exclusive access by this process. ** The file will be opened for both reading and writing. To avoid ** a potential security problem, we do not allow the file to have ** previously existed. Nor do we allow the file to be a symbolic ** link. ** ** On success, write the file handle into *pResult and return SQLITE_OK. ** ** On failure, return SQLITE_CANTOPEN. */ | > | < < | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | *pReadonly = 1; }else{ *pReadonly = 0; } *pResult = h; return SQLITE_OK; #endif } /* ** Attempt to open a new file for exclusive access by this process. ** The file will be opened for both reading and writing. To avoid ** a potential security problem, we do not allow the file to have ** previously existed. Nor do we allow the file to be a symbolic ** link. ** ** On success, write the file handle into *pResult and return SQLITE_OK. ** ** On failure, return SQLITE_CANTOPEN. */ int sqliteOsOpenExclusive(const char *zFilename, OsFile *pResult){ #if OS_UNIX int fd; if( access(zFilename, 0)==0 ){ return SQLITE_CANTOPEN; } #ifndef O_NOFOLLOW # define O_NOFOLLOW 0 #endif |
︙ | ︙ | |||
146 147 148 149 150 151 152 | }; static char zChars[] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789"; int i, j; struct stat buf; | | | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | }; static char zChars[] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789"; int i, j; struct stat buf; const char *zDir = "."; for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); i++){ if( stat(azDirs[i], &buf) ) continue; if( !S_ISDIR(buf.st_mode) ) continue; if( access(azDirs[i], 07) ) continue; zDir = azDirs[i]; break; } |
︙ | ︙ | |||
177 178 179 180 181 182 183 | sprintf(zBuf, "%s/sqlite_", zTempPath); j = strlen(zBuf); for(i=0; i<15; i++){ int n = sqliteRandomByte() % sizeof(zChars); zBuf[j++] = zChars[n]; } zBuf[j] = 0; | < < < < < < < < < < < < | | > > > > > > > > > > > > | > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | > > > > > | > > > > > > | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 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 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 | sprintf(zBuf, "%s/sqlite_", zTempPath); j = strlen(zBuf); for(i=0; i<15; i++){ int n = sqliteRandomByte() % sizeof(zChars); zBuf[j++] = zChars[n]; } zBuf[j] = 0; if( !sqliteOsFileExists(zBuf) ) break; } #endif return SQLITE_OK; } /* ** Close a file */ int sqliteOsClose(OsFile id){ #if OS_UNIX close(id); return SQLITE_OK; #endif #if OS_WIN CloseHandle(id); return SQLITE_OK; #endif } /* ** Read data from a file into a buffer. Return the number of ** bytes actually read. */ int sqliteOsRead(OsFile id, void *pBuf, int amt){ #if OS_UNIX int got; got = read(id, pBuf, amt); if( got<0 ) got = 0; return got==amt ? SQLITE_OK : SQLITE_IOERR; #endif #if OS_WIN int got; if( !ReadFile(id, pBuf, amt, &got, 0) ){ got = 0; } return got==amt ? SQLITE_OK : SQLITE_IOERR; #endif } /* ** Write data from a buffer into a file. Return SQLITE_OK on success ** or some other error code on failure. */ int sqliteOsWrite(OsFile id, const void *pBuf, int amt){ #if OS_UNIX int wrote; wrote = write(id, pBuf, amt); if( wrote<amt ) return SQLITE_FULL; return SQLITE_OK; #endif #if OS_WIN int wrote; if( !WriteFile(id, pBuf, amt, &wrote, 0) || wrote<amt ){ return SQLITE_FULL; } return SQLITE_OK; #endif } /* ** Move the read/write pointer in a file. */ int sqliteOsSeek(OsFile id, int offset){ #if OS_UNIX lseek(id, offset, SEEK_SET); return SQLITE_OK; #endif #if OS_WIN SetFilePointer(id, offset, 0, FILE_BEGIN); return SQLITE_OK; #endif } /* ** Make sure all writes to a particular file are committed to disk. */ int sqliteOsSync(OsFile id){ #if OS_UNIX return fsync(id)==0 ? SQLITE_OK : SQLITE_IOERR; #endif #if OS_WIN return FlushFileBuffers(id) ? SQLITE_OK : SQLITE_IOERR; #endif } /* ** Truncate an open file to a specified size */ int sqliteOsTruncate(OsFile id, int nByte){ #if OS_UNIX return ftruncate(id, nByte)==0 ? SQLITE_OK : SQLITE_IOERR; #endif #if OS_WIN SetFilePointer(id, nByte, 0, FILE_BEGIN); SetEndOfFile(id); return SQLITE_OK; #endif } /* ** Determine the current size of a file in bytes */ int sqliteOsFileSize(OsFile id, int *pSize){ #if OS_UNIX struct stat buf; if( fstat(id, &buf)!=0 ){ return SQLITE_IOERR; } *pSize = buf.st_size; return SQLITE_OK; #endif #if OS_WIN *pSize = GetFileSize(id, 0); return SQLITE_OK; #endif } /* ** Get a read or write lock on a file. */ int sqliteOsLock(OsFile id, int wrlock){ #if OS_UNIX int rc; struct flock lock; memset(&lock, 0, sizeof(lock)); lock.l_type = wrlock ? F_WRLCK : F_RDLCK; lock.l_whence = SEEK_SET; lock.l_start = 0L; lock.l_len = 1024L; printf("LOCK %s %d\n",wrlock?"WRITE":"READ",id); rc = fcntl(id, F_SETLK, &lock); fcntl(id, F_GETLK, &lock); printf("rc=%d why=%d\n",rc,lock.l_type); return rc==0 ? SQLITE_OK : SQLITE_BUSY; #endif #if OS_WIN if( !LockFile(id, 0, 0, 1024, 0) ){ return SQLITE_BUSY; } return SQLITE_OK; #endif } /* ** Release the read or write lock from a file. */ int sqliteOsUnlock(OsFile id){ #if OS_UNIX int rc; struct flock lock; lock.l_type = F_UNLCK; lock.l_whence = SEEK_SET; lock.l_start = 0L; lock.l_len = 1L; printf("UNLOCK %d\n",id); rc = fcntl(id, F_SETLK, &lock); return rc==0 ? SQLITE_OK : SQLITE_IOERR; #endif #if OS_WIN return UnlockFile(id, 0, 0, 1024, 0) ? SQLITE_OK : SQLITE_IOERR; #endif } /* ** Get information to seed the random number generator. */ int sqliteOsRandomSeed(char *zBuf){ #if OS_UNIX int pid; time((time_t*)zBuf); zBuf += sizeof(time_t); pid = getpid(); memcpy(zBuf, &pid, sizeof(pid)); zBuf += pid; return SQLITE_OK; #endif #if OS_WIN GetSystemTime((LPSYSTEMTIME)zBuf); return SQLITE_OK; #endif } /* ** Sleep for a little while. Return the amount of time slept. */ int sqliteOsSleep(int ms){ #if OS_UNIX #if defined(HAVE_USLEEP) && HAVE_USLEEP usleep(ms*1000); return ms; #else sleep((ms+999)/1000); return 1000*((ms+999)/1000); #endif #endif #if OS_WIN Sleep(ms); return ms; #endif } |
Changes to src/os.h.
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 | /* ** A handle for an open file is stored in an OsFile object. */ #if OS_UNIX typedef int OsFile; # define SQLITE_TEMPNAME_SIZE 200 #endif #if OS_WIN typedef HANDLE OsFile; | > > > > > | > > > | | | | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | /* ** A handle for an open file is stored in an OsFile object. */ #if OS_UNIX typedef int OsFile; # define SQLITE_TEMPNAME_SIZE 200 # if defined(HAVE_USLEEP) && HAVE_USLEEP # define SQLITE_MIN_SLEEP_MS 1 # else # define SQLITE_MIN_SLEEP_MS 1000 # endif #endif #if OS_WIN typedef HANDLE OsFile; # define SQLITE_TEMPNAME_SIZE (MAX_PATH+50) # deifne SQLITE_MIN_SLEEP_MS 1 #endif int sqliteOsDelete(const char*); int sqliteOsFileExists(const char*); int sqliteOsOpenReadWrite(const char*, OsFile*, int*); int sqliteOsOpenExclusive(const char*, OsFile*); int sqliteOsTempFileName(char*); int sqliteOsClose(OsFile); int sqliteOsRead(OsFile, void*, int amt); int sqliteOsWrite(OsFile, const void*, int amt); int sqliteOsSeek(OsFile, int offset); int sqliteOsSync(OsFile); int sqliteOsTruncate(OsFile, int size); int sqliteOsFileSize(OsFile, int *pSize); int sqliteOsLock(OsFile, int wrlock); int sqliteOsUnlock(OsFile); int sqliteOsRandomSeed(char*); int sqliteOsSleep(int ms); #endif /* _SQLITE_OS_H_ */ |
Changes to src/pager.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** | | | < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** ** @(#) $Id: pager.c,v 1.22 2001/09/19 13:22:40 drh Exp $ */ #include "sqliteInt.h" #include "pager.h" #include "os.h" #include <assert.h> #include <string.h> /* ** The page cache as a whole is always in one of the following ** states: ** |
︙ | ︙ | |||
98 99 100 101 102 103 104 | /* ** A open page cache is an instance of the following structure. */ struct Pager { char *zFilename; /* Name of the database file */ char *zJournal; /* Name of the journal file */ | | > | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | /* ** A open page cache is an instance of the following structure. */ struct Pager { char *zFilename; /* Name of the database file */ char *zJournal; /* Name of the journal file */ OsFile fd, jfd; /* File descriptors for database and journal */ int journalOpen; /* True if journal file descriptors is valid */ int dbSize; /* Number of pages in the file */ int origDbSize; /* dbSize before the current change */ int nExtra; /* Add this many bytes to each in-memory page */ void (*xDestructor)(void*); /* Call this routine when freeing pages */ int nPage; /* Total number of in-memory pages */ int nRef; /* Number of in-memory pages with PgHdr.nRef>0 */ int mxPage; /* Maximum number of pages to hold in cache */ |
︙ | ︙ | |||
168 169 170 171 172 173 174 | cnt++; /* Something to set a breakpoint on */ } # define REFINFO(X) pager_refinfo(X) #else # define REFINFO(X) #endif | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | cnt++; /* Something to set a breakpoint on */ } # define REFINFO(X) pager_refinfo(X) #else # define REFINFO(X) #endif /* ** Convert the bits in the pPager->errMask into an approprate ** return code. */ static int pager_errcode(Pager *pPager){ int rc = SQLITE_OK; if( pPager->errMask & PAGER_ERR_LOCK ) rc = SQLITE_PROTOCOL; |
︙ | ︙ | |||
300 301 302 303 304 305 306 | pPager->pLast = 0; pPager->pAll = 0; memset(pPager->aHash, 0, sizeof(pPager->aHash)); pPager->nPage = 0; if( pPager->state==SQLITE_WRITELOCK ){ sqlitepager_rollback(pPager); } | | > | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | pPager->pLast = 0; pPager->pAll = 0; memset(pPager->aHash, 0, sizeof(pPager->aHash)); pPager->nPage = 0; if( pPager->state==SQLITE_WRITELOCK ){ sqlitepager_rollback(pPager); } sqliteOsUnlock(pPager->fd); pPager->state = SQLITE_UNLOCK; pPager->dbSize = -1; pPager->nRef = 0; assert( pPager->journalOpen==0 ); } /* ** When this routine is called, the pager has the journal file open and ** a write lock on the database. This routine releases the database ** write lock and acquires a read lock in its place. The journal file ** is deleted and closed. |
︙ | ︙ | |||
327 328 329 330 331 332 333 | ** is set in pPager->errMask, and this routine returns SQLITE_PROTOCOL. ** SQLITE_OK is returned on success. */ static int pager_unwritelock(Pager *pPager){ int rc; PgHdr *pPg; if( pPager->state!=SQLITE_WRITELOCK ) return SQLITE_OK; | | | < | | > | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 | ** is set in pPager->errMask, and this routine returns SQLITE_PROTOCOL. ** SQLITE_OK is returned on success. */ static int pager_unwritelock(Pager *pPager){ int rc; PgHdr *pPg; if( pPager->state!=SQLITE_WRITELOCK ) return SQLITE_OK; sqliteOsUnlock(pPager->fd); rc = sqliteOsLock(pPager->fd, 0); sqliteOsClose(pPager->jfd); pPager->journalOpen = 0; sqliteOsDelete(pPager->zJournal); sqliteFree( pPager->aInJournal ); pPager->aInJournal = 0; for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ pPg->inJournal = 0; pPg->dirty = 0; } if( rc!=SQLITE_OK ){ |
︙ | ︙ | |||
376 377 378 379 380 381 382 | ** pPager->errMask and SQLITE_CORRUPT is returned. If it all ** works, then this routine returns SQLITE_OK. */ static int pager_playback(Pager *pPager){ int nRec; /* Number of Records */ int i; /* Loop counter */ Pgno mxPg = 0; /* Size of the original file in pages */ | < | | | | | | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < | 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 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | ** pPager->errMask and SQLITE_CORRUPT is returned. If it all ** works, then this routine returns SQLITE_OK. */ static int pager_playback(Pager *pPager){ int nRec; /* Number of Records */ int i; /* Loop counter */ Pgno mxPg = 0; /* Size of the original file in pages */ PgHdr *pPg; /* An existing page in the cache */ PageRecord pgRec; unsigned char aMagic[sizeof(aJournalMagic)]; int rc; /* Read the beginning of the journal and truncate the ** database file back to its original size. */ assert( pPager->journalOpen ); sqliteOsSeek(pPager->jfd, 0); rc = sqliteOsRead(pPager->jfd, aMagic, sizeof(aMagic)); if( rc!=SQLITE_OK || memcmp(aMagic,aJournalMagic,sizeof(aMagic))!=0 ){ return SQLITE_PROTOCOL; } rc = sqliteOsRead(pPager->jfd, &mxPg, sizeof(mxPg)); if( rc!=SQLITE_OK ){ return SQLITE_PROTOCOL; } sqliteOsTruncate(pPager->fd, mxPg*SQLITE_PAGE_SIZE); pPager->dbSize = mxPg; /* Begin reading the journal beginning at the end and moving ** toward the beginning. */ if( sqliteOsFileSize(pPager->jfd, &nRec)!=SQLITE_OK ){ return SQLITE_OK; } nRec = (nRec - (sizeof(aMagic)+sizeof(Pgno))) / sizeof(PageRecord); /* Process segments beginning with the last and working backwards ** to the first. */ for(i=nRec-1; i>=0; i--){ /* Seek to the beginning of the segment */ off_t ofst; ofst = i*sizeof(PageRecord) + sizeof(aMagic) + sizeof(Pgno); rc = sqliteOsSeek(pPager->jfd, ofst); if( rc!=SQLITE_OK ) break; rc = sqliteOsRead(pPager->jfd, &pgRec, sizeof(pgRec)); if( rc!=SQLITE_OK ) break; /* Sanity checking on the page */ if( pgRec.pgno>mxPg || pgRec.pgno==0 ){ rc = SQLITE_CORRUPT; break; } /* Playback the page. Update the in-memory copy of the page ** at the same time, if there is one. */ pPg = pager_lookup(pPager, pgRec.pgno); if( pPg ){ memcpy(PGHDR_TO_DATA(pPg), pgRec.aData, SQLITE_PAGE_SIZE); memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); } rc = sqliteOsSeek(pPager->fd, (pgRec.pgno-1)*SQLITE_PAGE_SIZE); if( rc!=SQLITE_OK ) break; rc = sqliteOsWrite(pPager->fd, pgRec.aData, SQLITE_PAGE_SIZE); if( rc!=SQLITE_OK ) break; } if( rc!=SQLITE_OK ){ pager_unwritelock(pPager); pPager->errMask |= PAGER_ERR_CORRUPT; rc = SQLITE_CORRUPT; }else{ rc = pager_unwritelock(pPager); } return rc; } /* ** Change the maximum number of in-memory pages that are allowed. */ void sqlitepager_set_cachesize(Pager *pPager, int mxPage){ if( mxPage>10 ){ pPager->mxPage = mxPage; } |
︙ | ︙ | |||
494 495 496 497 498 499 500 | Pager **ppPager, /* Return the Pager structure here */ const char *zFilename, /* Name of the database file to open */ int mxPage, /* Max number of in-memory cache pages */ int nExtra /* Extra bytes append to each in-memory page */ ){ Pager *pPager; int nameLen; | > | | < < | < < | < | | | | | | | 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 | Pager **ppPager, /* Return the Pager structure here */ const char *zFilename, /* Name of the database file to open */ int mxPage, /* Max number of in-memory cache pages */ int nExtra /* Extra bytes append to each in-memory page */ ){ Pager *pPager; int nameLen; OsFile fd; int rc; int tempFile; int readOnly = 0; char zTemp[SQLITE_TEMPNAME_SIZE]; *ppPager = 0; if( sqlite_malloc_failed ){ return SQLITE_NOMEM; } if( zFilename ){ rc = sqliteOsOpenReadWrite(zFilename, &fd, &readOnly); tempFile = 0; }else{ int cnt = 8; sqliteOsTempFileName(zTemp); do{ cnt--; sqliteOsTempFileName(zTemp); rc = sqliteOsOpenExclusive(zTemp, &fd); }while( cnt>0 && rc!=SQLITE_OK ); zFilename = zTemp; tempFile = 1; } if( rc!=SQLITE_OK ){ return SQLITE_CANTOPEN; } nameLen = strlen(zFilename); pPager = sqliteMalloc( sizeof(*pPager) + nameLen*2 + 30 ); if( pPager==0 ){ sqliteOsClose(fd); return SQLITE_NOMEM; } pPager->zFilename = (char*)&pPager[1]; pPager->zJournal = &pPager->zFilename[nameLen+1]; strcpy(pPager->zFilename, zFilename); strcpy(pPager->zJournal, zFilename); strcpy(&pPager->zJournal[nameLen], "-journal"); pPager->fd = fd; pPager->journalOpen = 0; pPager->nRef = 0; pPager->dbSize = -1; pPager->nPage = 0; pPager->mxPage = mxPage>5 ? mxPage : 10; pPager->state = SQLITE_UNLOCK; pPager->errMask = 0; pPager->tempFile = tempFile; |
︙ | ︙ | |||
573 574 575 576 577 578 579 | /* ** Return the total number of pages in the disk file associated with ** pPager. */ int sqlitepager_pagecount(Pager *pPager){ int n; | < | | < < > | > | | | | | 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 | /* ** Return the total number of pages in the disk file associated with ** pPager. */ int sqlitepager_pagecount(Pager *pPager){ int n; assert( pPager!=0 ); if( pPager->dbSize>=0 ){ return pPager->dbSize; } if( sqliteOsFileSize(pPager->fd, &n)!=SQLITE_OK ){ return 0; } n /= SQLITE_PAGE_SIZE; if( pPager->state!=SQLITE_UNLOCK ){ pPager->dbSize = n; } return n; } /* ** Shutdown the page cache. Free all memory and close all files. ** ** If a transaction was in progress when this routine is called, that ** transaction is rolled back. All outstanding pages are invalidated ** and their memory is freed. Any attempt to use a page associated ** with this page cache after this function returns will likely ** result in a coredump. */ int sqlitepager_close(Pager *pPager){ PgHdr *pPg, *pNext; switch( pPager->state ){ case SQLITE_WRITELOCK: { sqlitepager_rollback(pPager); sqliteOsUnlock(pPager->fd); assert( pPager->journalOpen==0 ); break; } case SQLITE_READLOCK: { sqliteOsUnlock(pPager->fd); break; } default: { /* Do nothing */ break; } } for(pPg=pPager->pAll; pPg; pPg=pNext){ pNext = pPg->pNextAll; sqliteFree(pPg); } sqliteOsClose(pPager->fd); assert( pPager->journalOpen==0 ); if( pPager->tempFile ){ sqliteOsDelete(pPager->zFilename); } sqliteFree(pPager); return SQLITE_OK; } /* ** Return the page number for the given page data. |
︙ | ︙ | |||
686 687 688 689 690 691 692 | ** of having to do another fsync() later on. Writing dirty free pages ** in this way make database operations go up to 10 times faster. */ static int syncAllPages(Pager *pPager){ PgHdr *pPg; int rc = SQLITE_OK; if( pPager->needSync ){ | | | | | 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 | ** of having to do another fsync() later on. Writing dirty free pages ** in this way make database operations go up to 10 times faster. */ static int syncAllPages(Pager *pPager){ PgHdr *pPg; int rc = SQLITE_OK; if( pPager->needSync ){ rc = sqliteOsSync(pPager->jfd); if( rc!=0 ) return rc; pPager->needSync = 0; } for(pPg=pPager->pFirst; pPg; pPg=pPg->pNextFree){ if( pPg->dirty ){ sqliteOsSeek(pPager->fd, (pPg->pgno-1)*SQLITE_PAGE_SIZE); rc = sqliteOsWrite(pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE); if( rc!=SQLITE_OK ) break; pPg->dirty = 0; } } return SQLITE_OK; } |
︙ | ︙ | |||
740 741 742 743 744 745 746 | return pager_errcode(pPager); } /* If this is the first page accessed, then get a read lock ** on the database file. */ if( pPager->nRef==0 ){ | | | | | > > > | > | > > | | | | | > | 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 | return pager_errcode(pPager); } /* If this is the first page accessed, then get a read lock ** on the database file. */ if( pPager->nRef==0 ){ if( sqliteOsLock(pPager->fd, 0)!=SQLITE_OK ){ *ppPage = 0; return SQLITE_BUSY; } pPager->state = SQLITE_READLOCK; /* If a journal file exists, try to play it back. */ if( sqliteOsFileExists(pPager->zJournal) ){ int rc, readOnly; /* Open the journal for exclusive access. Return SQLITE_BUSY if ** we cannot get exclusive access to the journal file */ rc = sqliteOsOpenReadWrite(pPager->zJournal, &pPager->jfd, &readOnly); if( rc==SQLITE_OK ){ pPager->journalOpen = 1; } if( rc!=SQLITE_OK || sqliteOsLock(pPager->jfd, 1)!=SQLITE_OK ){ if( pPager->journalOpen ){ sqliteOsClose(pPager->jfd); pPager->journalOpen = 0; } sqliteOsUnlock(pPager->fd); *ppPage = 0; return SQLITE_BUSY; } /* Get a write lock on the database */ sqliteOsUnlock(pPager->fd); if( sqliteOsLock(pPager->fd, 1)!=SQLITE_OK ){ sqliteOsClose(pPager->jfd); pPager->journalOpen = 0; *ppPage = 0; return SQLITE_PROTOCOL; } pPager->state = SQLITE_WRITELOCK; /* Playback and delete the journal. Drop the database write ** lock and reacquire the read lock. */ rc = pager_playback(pPager); if( rc!=SQLITE_OK ){ return rc; |
︙ | ︙ | |||
888 889 890 891 892 893 894 | assert( pPg->pNextHash->pPrevHash==0 ); pPg->pNextHash->pPrevHash = pPg; } if( pPager->dbSize<0 ) sqlitepager_pagecount(pPager); if( pPager->dbSize<pgno ){ memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE); }else{ | | | | 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 | assert( pPg->pNextHash->pPrevHash==0 ); pPg->pNextHash->pPrevHash = pPg; } if( pPager->dbSize<0 ) sqlitepager_pagecount(pPager); if( pPager->dbSize<pgno ){ memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE); }else{ sqliteOsSeek(pPager->fd, (pgno-1)*SQLITE_PAGE_SIZE); sqliteOsRead(pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE); } if( pPager->nExtra>0 ){ memset(PGHDR_TO_EXTRA(pPg), 0, pPager->nExtra); } }else{ /* The requested page is in the page cache. */ pPager->nHit++; |
︙ | ︙ | |||
1019 1020 1021 1022 1023 1024 1025 | assert( pPager->state!=SQLITE_UNLOCK ); if( pPager->state==SQLITE_READLOCK ){ assert( pPager->aInJournal==0 ); pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 ); if( pPager->aInJournal==0 ){ return SQLITE_NOMEM; } | | | > | | | | | | | | | | | | | 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 | assert( pPager->state!=SQLITE_UNLOCK ); if( pPager->state==SQLITE_READLOCK ){ assert( pPager->aInJournal==0 ); pPager->aInJournal = sqliteMalloc( pPager->dbSize/8 + 1 ); if( pPager->aInJournal==0 ){ return SQLITE_NOMEM; } rc = sqliteOsOpenExclusive(pPager->zJournal, &pPager->jfd); if( rc!=SQLITE_OK ){ return SQLITE_CANTOPEN; } pPager->journalOpen = 1; pPager->needSync = 0; if( sqliteOsLock(pPager->jfd, 1)!=SQLITE_OK ){ sqliteOsClose(pPager->jfd); pPager->journalOpen = 0; return SQLITE_BUSY; } sqliteOsUnlock(pPager->fd); if( sqliteOsLock(pPager->fd, 1)!=SQLITE_OK ){ sqliteOsClose(pPager->jfd); pPager->journalOpen = 0; pPager->state = SQLITE_UNLOCK; pPager->errMask |= PAGER_ERR_LOCK; return SQLITE_PROTOCOL; } pPager->state = SQLITE_WRITELOCK; sqlitepager_pagecount(pPager); pPager->origDbSize = pPager->dbSize; rc = sqliteOsWrite(pPager->jfd, aJournalMagic, sizeof(aJournalMagic)); if( rc==SQLITE_OK ){ rc = sqliteOsWrite(pPager->jfd, &pPager->dbSize, sizeof(Pgno)); } if( rc!=SQLITE_OK ){ rc = pager_unwritelock(pPager); if( rc==SQLITE_OK ) rc = SQLITE_FULL; return rc; } } assert( pPager->state==SQLITE_WRITELOCK ); assert( pPager->journalOpen ); if( pPg->pgno <= pPager->origDbSize ){ rc = sqliteOsWrite(pPager->jfd, &pPg->pgno, sizeof(Pgno)); if( rc==SQLITE_OK ){ rc = sqliteOsWrite(pPager->jfd, pData, SQLITE_PAGE_SIZE); } if( rc!=SQLITE_OK ){ sqlitepager_rollback(pPager); pPager->errMask |= PAGER_ERR_FULL; return rc; } assert( pPager->aInJournal!=0 ); |
︙ | ︙ | |||
1106 1107 1108 1109 1110 1111 1112 | if( pPager->errMask!=0 ){ rc = pager_errcode(pPager); return rc; } if( pPager->state!=SQLITE_WRITELOCK ){ return SQLITE_ERROR; } | | | | | | | 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 | if( pPager->errMask!=0 ){ rc = pager_errcode(pPager); return rc; } if( pPager->state!=SQLITE_WRITELOCK ){ return SQLITE_ERROR; } assert( pPager->journalOpen ); if( pPager->needSync && sqliteOsSync(pPager->jfd)!=SQLITE_OK ){ goto commit_abort; } for(pPg=pPager->pAll; pPg; pPg=pPg->pNextAll){ if( pPg->dirty==0 ) continue; rc = sqliteOsSeek(pPager->fd, (pPg->pgno-1)*SQLITE_PAGE_SIZE); if( rc!=SQLITE_OK ) goto commit_abort; rc = sqliteOsWrite(pPager->fd, PGHDR_TO_DATA(pPg), SQLITE_PAGE_SIZE); if( rc!=SQLITE_OK ) goto commit_abort; } if( sqliteOsSync(pPager->fd)!=SQLITE_OK ) goto commit_abort; rc = pager_unwritelock(pPager); pPager->dbSize = -1; return rc; /* Jump here if anything goes wrong during the commit process. */ commit_abort: |
︙ | ︙ |
Changes to src/random.c.
︙ | ︙ | |||
11 12 13 14 15 16 17 | ************************************************************************* ** This file contains code to implement a pseudo-random number ** generator (PRNG) for SQLite. ** ** Random numbers are used by some of the database backends in order ** to generate random integer keys for tables or random filenames. ** | | | | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | ************************************************************************* ** This file contains code to implement a pseudo-random number ** generator (PRNG) for SQLite. ** ** Random numbers are used by some of the database backends in order ** to generate random integer keys for tables or random filenames. ** ** $Id: random.c,v 1.6 2001/09/19 13:22:40 drh Exp $ */ #include "sqliteInt.h" #include "os.h" /* ** Get a single 8-bit random value from the RC4 PRNG. */ int sqliteRandomByte(void){ int t; |
︙ | ︙ | |||
44 45 46 47 48 49 50 | /* Initialize the state of the random number generator once, ** the first time this routine is called. The seed value does ** not need to contain a lot of randomness since we are not ** trying to do secure encryption or anything like that... */ if( !prng_state.isInit ){ int i; | | | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | /* Initialize the state of the random number generator once, ** the first time this routine is called. The seed value does ** not need to contain a lot of randomness since we are not ** trying to do secure encryption or anything like that... */ if( !prng_state.isInit ){ int i; static char seed[] = " sqlite random seed abcdefghijklmnop"; char k[256]; sqliteOsRandomSeed(seed); prng_state.j = 0; prng_state.i = 0; for(i=0; i<256; i++){ prng_state.s[i] = i; k[i] = seed[i%sizeof(seed)]; } for(i=0; i<256; i++){ |
︙ | ︙ |
Changes to src/util.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** Utility functions used throughout sqlite. ** ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** Utility functions used throughout sqlite. ** ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** ** $Id: util.c,v 1.27 2001/09/19 13:22:40 drh Exp $ */ #include "sqliteInt.h" #include <stdarg.h> #include <ctype.h> /* ** If malloc() ever fails, this global variable gets set to 1. |
︙ | ︙ | |||
388 389 390 391 392 393 394 | ** This function computes a hash on the name of a keyword. ** Case is not significant. */ int sqliteHashNoCase(const char *z, int n){ int h = 0; if( n<=0 ) n = strlen(z); while( n > 0 ){ | | | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | ** This function computes a hash on the name of a keyword. ** Case is not significant. */ int sqliteHashNoCase(const char *z, int n){ int h = 0; if( n<=0 ) n = strlen(z); while( n > 0 ){ h = (h<<3) ^ h ^ UpperToLower[(unsigned char)*z++]; n--; } if( h<0 ) h = -h; return h; } /* |
︙ | ︙ |