firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:03:02 +01:00
Code Issues

Adjusted the Alex changes for Windows.

Browse Source
This commit is contained in:
dimitr 2010-04-15 15:52:21 +00:00
parent 23f30563c6
commit 7db5f08d4b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jrd/os/win32/winnt.cpp
View File

@ -126,22 +126,20 @@ struct AdjustFsCache
static InitMutex<AdjustFsCache> adjustFsCacheOnce;
inline static DWORD getShareFlags(bool temporary = false)
{
static bool shared_access = Config::getSharedDatabase();
return FILE_SHARE_READ | ((!temporary && shared_access) ? FILE_SHARE_WRITE : 0);
}
#ifdef SUPERSERVER_V2
static const DWORD g_dwShareFlags = FILE_SHARE_READ; // no write sharing
static const DWORD g_dwExtraFlags = FILE_FLAG_OVERLAPPED |
FILE_FLAG_NO_BUFFERING |
FILE_FLAG_RANDOM_ACCESS;
#else
#ifdef SUPERSERVER
static const DWORD g_dwShareFlags = FILE_SHARE_READ; // no write sharing
static const DWORD g_dwExtraFlags = FILE_FLAG_RANDOM_ACCESS;
#else
static const DWORD g_dwShareFlags = FILE_SHARE_READ | FILE_SHARE_WRITE;
static const DWORD g_dwExtraFlags = FILE_FLAG_RANDOM_ACCESS;
#endif
#endif
static const DWORD g_dwShareTempFlags = FILE_SHARE_READ;
static const DWORD g_dwExtraTempFlags = FILE_ATTRIBUTE_TEMPORARY |
FILE_FLAG_DELETE_ON_CLOSE;
@ -227,7 +225,7 @@ jrd_file* PIO_create(Database* dbb, const Firebird::PathName& string,
const TEXT* file_name = string.c_str();
DWORD dwShareMode = (temporary ? g_dwShareTempFlags : g_dwShareFlags);
DWORD dwShareMode = getShareFlags(true);
if (share_delete)
dwShareMode |= FILE_SHARE_DELETE;
@ -379,7 +377,7 @@ void PIO_force_write(jrd_file* file, const bool forceWrite, const bool notUseFSC
maybeCloseFile(hFile);
hFile = CreateFile(file->fil_string,
GENERIC_READ | writeMode,
g_dwShareFlags,
getShareFlags(),
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL | force | fsCache | g_dwExtraFlags,
@ -569,7 +567,7 @@ jrd_file* PIO_open(Database* dbb,
HANDLE desc = CreateFile(ptr,
GENERIC_READ | GENERIC_WRITE,
g_dwShareFlags | (share_delete ? FILE_SHARE_DELETE : 0),
getShareFlags() | (share_delete ? FILE_SHARE_DELETE : 0),
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL |