diff options
| -rw-r--r-- | manifest | 26 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/os_unix.c | 84 | ||||
| -rw-r--r-- | src/sqlite.h.in | 1 |
4 files changed, 77 insertions, 36 deletions
@@ -1,5 +1,8 @@ -C Changes\sto\sthe\sway\sfaults\sare\sinjected\sinto\sxShmXXX\sVFS\scalls. -D 2010-06-01T19:15:19 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C The\sshared-memory\sused\sby\sWAL\son\slinux\snow\sreally\sis\sshared\smemory\sin\s/dev/shm.\nOn\sother\sunix\sflavors,\sthe\sfile\sis\sin\sa\stemporary\sdirectory\srather\sthan\sin\sthe\nsame\sdirectory\sas\sthe\sdatabase. +D 2010-06-01T21:02:52 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -152,7 +155,7 @@ F src/os.c 1516984144e26734f97748f891f1a04f9e294c2e F src/os.h 6f604986f0ef0ca288c2330b16051ff70b431e8c F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19 -F src/os_unix.c 29dd06f4850672326765218e75cb49d7d618c254 +F src/os_unix.c 31511480da88947d39c9e12560a11d4495e19832 F src/os_win.c f815403c51a2adad30244374c801dd7fd2734567 F src/pager.c acbef227bf158776449907c275c5d9332e4e52f9 F src/pager.h 76466c3a5af56943537f68b1f16567101a0cd1d0 @@ -168,7 +171,7 @@ F src/resolve.c ac5f1a713cd1ae77f08b83cc69581e11bf5ae6f9 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c c03d8a0565febcde8c6a12c5d77d065fddae889b F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714 -F src/sqlite.h.in c77dd6f7391c7d780622abd221c49d926d32b3b6 +F src/sqlite.h.in 4f72e39f1edeccaf2a5913483bce2f704492b892 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 F src/sqliteInt.h c1ca9bed7c963343f90edaf0ec31b8ff4b43fb01 F src/sqliteLimit.h 196e2f83c3b444c4548fc1874f52f84fdbda40f3 @@ -815,7 +818,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P b627e1536822bb7e3ef91867661a53be0efc13ef -R 61962739bee4b134d51f0c50b54806e9 -U dan -Z 398c600fb787a366135f57477d6a61d0 +P 716d99f3929b466c7a17190e0f18de8ab0e7f1fa +R b3414260e40f837bf1c8d956dc6a26ad +U drh +Z 80c5ba01de50121a690a7f5cd9c5e6cc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFMBXV/oxKgR168RlERAimSAJ4rYYH4hdiefDukk1w3PgpCHNzTdQCfanYl +zzhyiYRjebOZPSJO3xolVfs= +=lQ6P +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 470c2bba3..b65be6e7f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -716d99f3929b466c7a17190e0f18de8ab0e7f1fa
\ No newline at end of file +fc18c4aadb908c3b6f9b6481a2efca6a0daadc64
\ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index 868071214..9d4a780a6 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3275,6 +3275,9 @@ static void unixShmPurge(unixFile *pFd){ } } +/* Forward reference */ +static const char *unixTempFileDir(int); + /* ** Open a shared-memory area. This particular implementation uses ** mmapped files. @@ -3297,7 +3300,9 @@ static int unixShmOpen( struct unixShmNode *pShmNode = 0; /* The underlying mmapped file */ int rc; /* Result code */ struct unixFile *pDbFd; /* Underlying database file */ - int nPath; /* Size of pDbFd->zPath in bytes */ + unixInodeInfo *pInode; /* The inode of fd */ + const char *zTempDir; /* Directory for temporary files */ + int nTempDir; /* Size of the zTempDir string */ /* Allocate space for the new sqlite3_shm object. */ @@ -3311,18 +3316,26 @@ static int unixShmOpen( ** one if present. Create a new one if necessary. */ unixEnterMutex(); - pShmNode = pDbFd->pInode->pShmNode; + pInode = pDbFd->pInode; + pShmNode = pInode->pShmNode; if( pShmNode==0 ){ - nPath = strlen(pDbFd->zPath); - pShmNode = sqlite3_malloc( sizeof(*pShmNode) + nPath + 15 ); + zTempDir = unixTempFileDir(1); + if( zTempDir==0 ){ + unixLeaveMutex(); + sqlite3_free(p); + return SQLITE_CANTOPEN_NOTEMPDIR; + } + nTempDir = strlen(zTempDir); + pShmNode = sqlite3_malloc( sizeof(*pShmNode) + nTempDir + 50 ); if( pShmNode==0 ){ rc = SQLITE_NOMEM; goto shm_open_err; } memset(pShmNode, 0, sizeof(*pShmNode)); pShmNode->zFilename = (char*)&pShmNode[1]; - sqlite3_snprintf(nPath+15, pShmNode->zFilename, - "%s-wal-index", pDbFd->zPath); + sqlite3_snprintf(nTempDir+50, pShmNode->zFilename, + "%s/sqlite-wi-%x-%x", zTempDir, + (u32)pInode->fileId.dev, (u32)pInode->fileId.ino); pShmNode->h = -1; pDbFd->pInode->pShmNode = pShmNode; pShmNode->pInode = pDbFd->pInode; @@ -4199,26 +4212,54 @@ static int openDirectory(const char *zFilename, int *pFd){ } /* -** Create a temporary file name in zBuf. zBuf must be allocated -** by the calling process and must be big enough to hold at least -** pVfs->mxPathname bytes. +** Return the name of a directory in which to put temporary files. +** If no suitable temporary file directory can be found, return NULL. */ -static int getTempname(int nBuf, char *zBuf){ +static const char *unixTempFileDir(int allowShm){ static const char *azDirs[] = { 0, 0, "/var/tmp", "/usr/tmp", "/tmp", - ".", + 0 /* List terminator */ }; + unsigned int i; + struct stat buf; + const char *zDir = 0; + + azDirs[0] = sqlite3_temp_directory; + if( !azDirs[1] ) azDirs[1] = getenv("TMPDIR"); + + if( allowShm ){ + zDir = "/dev/shm"; + i = 0; + }else{ + zDir = azDirs[0]; + i = 1; + } + for(; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){ + if( zDir==0 ) continue; + if( stat(zDir, &buf) ) continue; + if( !S_ISDIR(buf.st_mode) ) continue; + if( access(zDir, 07) ) continue; + break; + } + return zDir; +} + +/* +** Create a temporary file name in zBuf. zBuf must be allocated +** by the calling process and must be big enough to hold at least +** pVfs->mxPathname bytes. +*/ +static int unixGetTempname(int nBuf, char *zBuf){ static const unsigned char zChars[] = "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789"; unsigned int i, j; - struct stat buf; - const char *zDir = "."; + const char *zDir; /* It's odd to simulate an io-error here, but really this is just ** using the io-error infrastructure to test that SQLite handles this @@ -4226,19 +4267,8 @@ static int getTempname(int nBuf, char *zBuf){ */ SimulateIOError( return SQLITE_IOERR ); - azDirs[0] = sqlite3_temp_directory; - if (NULL == azDirs[1]) { - azDirs[1] = getenv("TMPDIR"); - } - - for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); i++){ - if( azDirs[i]==0 ) continue; - if( stat(azDirs[i], &buf) ) continue; - if( !S_ISDIR(buf.st_mode) ) continue; - if( access(azDirs[i], 07) ) continue; - zDir = azDirs[i]; - break; - } + zDir = unixTempFileDir(0); + if( zDir==0 ) zDir = "."; /* Check that the output buffer is large enough for the temporary file ** name. If it is not, return SQLITE_ERROR. @@ -4428,7 +4458,7 @@ static int unixOpen( }else if( !zName ){ /* If zName is NULL, the upper layer is requesting a temp file. */ assert(isDelete && !isOpenDirectory); - rc = getTempname(MAX_PATHNAME+1, zTmpname); + rc = unixGetTempname(MAX_PATHNAME+1, zTmpname); if( rc!=SQLITE_OK ){ return rc; } diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 0b931dcc9..e6a1659b9 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -446,6 +446,7 @@ int sqlite3_exec( #define SQLITE_IOERR_DIR_CLOSE (SQLITE_IOERR | (17<<8)) #define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8)) #define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1<<8)) +#define SQLITE_CANTOPEN_NOTEMPDIR (SQLITE_CANTOPEN | (1<<8)) /* ** CAPI3REF: Flags For File Open Operations |