Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add a comment to the OsSectorSize() function. (CVS 3710) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
0fd9983a98d8d61654f252f1708a4d72 |
User & Date: | danielk1977 2007-03-23 10:08:39.000 |
Context
2007-03-23
| ||
18:12 | Discard the contents of the pager-cache only when the change-counter indicates that it is stale. (CVS 3711) (check-in: 07b56965f3 user: danielk1977 tags: trunk) | |
10:08 | Add a comment to the OsSectorSize() function. (CVS 3710) (check-in: 0fd9983a98 user: danielk1977 tags: trunk) | |
2007-03-22
| ||
15:22 | In os_unix.c, make a distinction between pread() and pread64(). Add a new compile-time macro USE_PREAD64 to select the latter. (CVS 3709) (check-in: 177cd92910 user: drh tags: trunk) | |
Changes
Changes to src/os_common.h.
︙ | ︙ | |||
193 194 195 196 197 198 199 | /* ** The default size of a disk sector */ #ifndef PAGER_SECTOR_SIZE # define PAGER_SECTOR_SIZE 512 #endif | < < < | 193 194 195 196 197 198 199 200 | /* ** The default size of a disk sector */ #ifndef PAGER_SECTOR_SIZE # define PAGER_SECTOR_SIZE 512 #endif |
Changes to src/os_os2.c.
︙ | ︙ | |||
727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 | /* ** Return an integer that indices the type of lock currently held ** by this handle. (Used for testing and analysis only.) */ static int os2LockState( OsFile *id ){ return ((os2File*)id)->locktype; } /* ** This vector defines all the methods that can operate on an OsFile ** for os2. */ static const IoMethod sqlite3Os2IoMethod = { os2Close, os2OpenDirectory, os2Read, os2Write, os2Seek, os2Truncate, os2Sync, os2SetFullSync, os2FileHandle, os2FileSize, os2Lock, os2Unlock, os2LockState, os2CheckReservedLock, | > > > > > > > > > > > > > > | | 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 | /* ** Return an integer that indices the type of lock currently held ** by this handle. (Used for testing and analysis only.) */ static int os2LockState( OsFile *id ){ return ((os2File*)id)->locktype; } /* ** Return the sector size in bytes of the underlying block device for ** the specified file. This is almost always 512 bytes, but may be ** larger for some devices. ** ** SQLite code assumes this function cannot fail. It also assumes that ** if two files are created in the same file-system directory (i.e. ** a database and it's journal file) that the sector size will be the ** same for both. */ static int os2SectorSize(OsFile *id){ return PAGER_SECTOR_SIZE; } /* ** This vector defines all the methods that can operate on an OsFile ** for os2. */ static const IoMethod sqlite3Os2IoMethod = { os2Close, os2OpenDirectory, os2Read, os2Write, os2Seek, os2Truncate, os2Sync, os2SetFullSync, os2FileHandle, os2FileSize, os2Lock, os2Unlock, os2LockState, os2CheckReservedLock, os2SectorSize, }; /* ** Allocate memory for an OsFile. Initialize the new OsFile ** to the value given in pInit and return a pointer to the new ** OsFile. If we run out of memory, close the file and return NULL. */ |
︙ | ︙ |
Changes to src/os_unix.c.
︙ | ︙ | |||
2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 | /* ** Return an integer that indices the type of lock currently held ** by this handle. (Used for testing and analysis only.) */ static int unixLockState(OsFile *id){ return ((unixFile*)id)->locktype; } /* ** This vector defines all the methods that can operate on an OsFile ** for unix. */ static const IoMethod sqlite3UnixIoMethod = { unixClose, unixOpenDirectory, unixRead, unixWrite, unixSeek, unixTruncate, unixSync, unixSetFullSync, unixFileHandle, unixFileSize, unixLock, unixUnlock, unixLockState, unixCheckReservedLock, | > > > > > > > > > > > > > > | | 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 | /* ** Return an integer that indices the type of lock currently held ** by this handle. (Used for testing and analysis only.) */ static int unixLockState(OsFile *id){ return ((unixFile*)id)->locktype; } /* ** Return the sector size in bytes of the underlying block device for ** the specified file. This is almost always 512 bytes, but may be ** larger for some devices. ** ** SQLite code assumes this function cannot fail. It also assumes that ** if two files are created in the same file-system directory (i.e. ** a database and it's journal file) that the sector size will be the ** same for both. */ static int unixSectorSize(OsFile *id){ return PAGER_SECTOR_SIZE; } /* ** This vector defines all the methods that can operate on an OsFile ** for unix. */ static const IoMethod sqlite3UnixIoMethod = { unixClose, unixOpenDirectory, unixRead, unixWrite, unixSeek, unixTruncate, unixSync, unixSetFullSync, unixFileHandle, unixFileSize, unixLock, unixUnlock, unixLockState, unixCheckReservedLock, unixSectorSize, }; #ifdef SQLITE_ENABLE_LOCKING_STYLE /* ** This vector defines all the methods that can operate on an OsFile ** for unix with AFP style file locking. */ |
︙ | ︙ | |||
2378 2379 2380 2381 2382 2383 2384 | unixSetFullSync, unixFileHandle, unixFileSize, afpUnixLock, afpUnixUnlock, unixLockState, afpUnixCheckReservedLock, | | | 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 | unixSetFullSync, unixFileHandle, unixFileSize, afpUnixLock, afpUnixUnlock, unixLockState, afpUnixCheckReservedLock, unixSectorSize, }; /* ** This vector defines all the methods that can operate on an OsFile ** for unix with flock() style file locking. */ static const IoMethod sqlite3FlockLockingUnixIoMethod = { |
︙ | ︙ | |||
2400 2401 2402 2403 2404 2405 2406 | unixSetFullSync, unixFileHandle, unixFileSize, flockUnixLock, flockUnixUnlock, unixLockState, flockUnixCheckReservedLock, | | | 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 | unixSetFullSync, unixFileHandle, unixFileSize, flockUnixLock, flockUnixUnlock, unixLockState, flockUnixCheckReservedLock, unixSectorSize, }; /* ** This vector defines all the methods that can operate on an OsFile ** for unix with dotlock style file locking. */ static const IoMethod sqlite3DotlockLockingUnixIoMethod = { |
︙ | ︙ | |||
2422 2423 2424 2425 2426 2427 2428 | unixSetFullSync, unixFileHandle, unixFileSize, dotlockUnixLock, dotlockUnixUnlock, unixLockState, dotlockUnixCheckReservedLock, | | | 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 | unixSetFullSync, unixFileHandle, unixFileSize, dotlockUnixLock, dotlockUnixUnlock, unixLockState, dotlockUnixCheckReservedLock, unixSectorSize, }; /* ** This vector defines all the methods that can operate on an OsFile ** for unix with dotlock style file locking. */ static const IoMethod sqlite3NolockLockingUnixIoMethod = { |
︙ | ︙ | |||
2444 2445 2446 2447 2448 2449 2450 | unixSetFullSync, unixFileHandle, unixFileSize, nolockUnixLock, nolockUnixUnlock, unixLockState, nolockUnixCheckReservedLock, | | | 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 | unixSetFullSync, unixFileHandle, unixFileSize, nolockUnixLock, nolockUnixUnlock, unixLockState, nolockUnixCheckReservedLock, unixSectorSize, }; #endif /* SQLITE_ENABLE_LOCKING_STYLE */ /* ** Allocate memory for a new unixFile and initialize that unixFile. ** Write a pointer to the new unixFile into *pId. |
︙ | ︙ |
Changes to src/os_win.c.
︙ | ︙ | |||
1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 | /* ** Return an integer that indices the type of lock currently held ** by this handle. (Used for testing and analysis only.) */ static int winLockState(OsFile *id){ return ((winFile*)id)->locktype; } /* ** This vector defines all the methods that can operate on an OsFile ** for win32. */ static const IoMethod sqlite3WinIoMethod = { winClose, winOpenDirectory, winRead, winWrite, winSeek, winTruncate, winSync, winSetFullSync, winFileHandle, winFileSize, winLock, winUnlock, winLockState, winCheckReservedLock, | > > > > > > > > > > > > > > | | 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 | /* ** Return an integer that indices the type of lock currently held ** by this handle. (Used for testing and analysis only.) */ static int winLockState(OsFile *id){ return ((winFile*)id)->locktype; } /* ** Return the sector size in bytes of the underlying block device for ** the specified file. This is almost always 512 bytes, but may be ** larger for some devices. ** ** SQLite code assumes this function cannot fail. It also assumes that ** if two files are created in the same file-system directory (i.e. ** a database and it's journal file) that the sector size will be the ** same for both. */ static int winSectorSize(OsFile *id){ return PAGER_SECTOR_SIZE; } /* ** This vector defines all the methods that can operate on an OsFile ** for win32. */ static const IoMethod sqlite3WinIoMethod = { winClose, winOpenDirectory, winRead, winWrite, winSeek, winTruncate, winSync, winSetFullSync, winFileHandle, winFileSize, winLock, winUnlock, winLockState, winCheckReservedLock, winSectorSize, }; /* ** Allocate memory for an OsFile. Initialize the new OsFile ** to the value given in pInit and return a pointer to the new ** OsFile. If we run out of memory, close the file and return NULL. */ |
︙ | ︙ |