diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-29 21:02:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-01 10:43:56 +0000 |
| commit | 05a8216d03b5db559e01dd1808f2805df31c970a (patch) | |
| tree | bf3c841aad4dd36eb4cde4c6fd4bbff5f769bc60 | |
| parent | 7029ccec25bc0b15f9cea463ea3713e802eafc08 (diff) | |
STAR_ENABLE_FILE_LOCKING was a secret
| -rw-r--r-- | sal/osl/unx/file.cxx | 2 | ||||
| -rw-r--r-- | tools/source/stream/strmunx.cxx | 49 |
2 files changed, 1 insertions, 50 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index b8a851f5a84d..c513f601a582 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -837,7 +837,7 @@ struct Locking_Impl Locking_Impl() : m_enabled(0) { #ifndef HAVE_O_EXLOCK - m_enabled = ((getenv("SAL_ENABLE_FILE_LOCKING") != 0) || (getenv("STAR_ENABLE_FILE_LOCKING") != 0)); + m_enabled = (getenv("SAL_ENABLE_FILE_LOCKING") != 0); #endif /* HAVE_O_EXLOCK */ } }; diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index d001c6fd4c00..2df86ce5b4ca 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -34,7 +34,6 @@ #include <errno.h> #include <unistd.h> #include <limits.h> -#include <stdlib.h> // fuer getenv() #include <tools/debug.hxx> #include <tools/fsys.hxx> @@ -500,8 +499,6 @@ void SvFileStream::FlushData() // lokal gibt es nicht } -static char *pFileLockEnvVar = (char*)1; - /************************************************************************* |* |* SvFileStream::LockRange() @@ -510,11 +507,6 @@ static char *pFileLockEnvVar = (char*)1; sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes ) { - struct flock aflock; - aflock.l_start = nByteOffset; - aflock.l_whence = SEEK_SET; - aflock.l_len = nBytes; - int nLockMode = 0; if ( ! IsOpen() ) @@ -559,47 +551,6 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes ) return sal_False; } - // HACK: File-Locking nur via Environmentvariable einschalten - // um einen Haenger im Zusammenspiel mit einem Linux - // NFS-2-Server (kein Lockdaemon) zu verhindern. - // File-Locking ?ber NFS ist generell ein Performancekiller. - // HR, 22.10.1997 fuer SOLARIS - // HR, 18.05.1998 Environmentvariable - - if ( pFileLockEnvVar == (char*)1 ) - pFileLockEnvVar = getenv("STAR_ENABLE_FILE_LOCKING"); - if ( ! pFileLockEnvVar ) - return sal_True; - - aflock.l_type = nLockMode; - sal_IntPtr iFileHandle; - oslFileError rc = osl_getFileOSHandle(pInstanceData->rHandle, &iFileHandle); - if (rc != osl_File_E_None) - { - SetError( ::GetSvError( rc )); - return sal_False; - } - if (fcntl((int)iFileHandle, F_GETLK, &aflock) == -1) - { - #if defined SOLARIS - if (errno == ENOSYS) - return sal_True; - #endif - SetError( ::GetSvError( errno )); - return sal_False; - } - if (aflock.l_type != F_UNLCK) - { - SetError(SVSTREAM_LOCKING_VIOLATION); - return sal_False; - } - - aflock.l_type = nLockMode; - if (fcntl((int)iFileHandle, F_SETLK, &aflock) == -1) - { - SetError( ::GetSvError( errno )); - return sal_False; - } return sal_True; } |