database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Commit changes on memory mapping that hopefully should now work on Linux.

Browse Source 
modified:
  storage/connect/maputil.cpp
  storage/connect/tabdos.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabvct.cpp
This commit is contained in:
Olivier Bertrand
2013-03-08 18:29:05 +01:00
parent 6e6e34b19d
commit 3342df63ef
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/connect/maputil.cpp
View File

@@ -159,9 +159,9 @@ HANDLE CreateFileMap(PGLOBAL g, LPCSTR fileName,
// Now we are ready to load the file. If mmap() is available we try // Now we are ready to load the file. If mmap() is available we try
// this first. If not available or it failed we try to load it. // this first. If not available or it failed we try to load it.
mm->memory = mmap(NULL, filesize, protmode, MAP_PRIVATE, fd, 0); mm->memory = mmap(NULL, filesize, protmode, MAP_SHARED, fd, 0);
if (mm->memory) { if (mm->memory != MAP_FAILED) {
mm->lenL = (mm->memory != 0) ? filesize : 0; mm->lenL = (mm->memory != 0) ? filesize : 0;
mm->lenH = 0; mm->lenH = 0;
} else { } else {
@@ -180,7 +180,7 @@ bool CloseMemMap(void *memory, size_t dwSize)
if (memory) { if (memory) {
// All this must be redesigned // All this must be redesigned
int rc = msync(memory, dwSize, MS_SYNC); int rc = msync(memory, dwSize, MS_SYNC);
return (munmap(memory, dwSize)) ? true : false; return (munmap(memory, dwSize) < 0) ? true : false;
} else } else
return false; return false;

6
storage/connect/tabdos.cpp
View File

@@ -284,15 +284,11 @@ PTDB DOSDEF::GetTable(PGLOBAL g, MODE mode)
{ {
// Mapping not used for insert // Mapping not used for insert
USETEMP tmp = PlgGetUser(g)->UseTemp; USETEMP tmp = PlgGetUser(g)->UseTemp;
#if defined(WIN32)
bool map = Mapped && mode != MODE_INSERT && bool map = Mapped && mode != MODE_INSERT &&
!(tmp != TMP_NO && Recfm == RECFM_VAR !(tmp != TMP_NO && Recfm == RECFM_VAR
&& mode == MODE_UPDATE) && && mode == MODE_UPDATE) &&
!(tmp == TMP_FORCE && !(tmp == TMP_FORCE &&
(mode == MODE_UPDATE || mode == MODE_DELETE)); (mode == MODE_UPDATE || mode == MODE_DELETE));
#else // !WIN32
bool map = Mapped && mode == MODE_READ;
#endif // !WIN32
PTXF txfp; PTXF txfp;
PTDBASE tdbp; PTDBASE tdbp;

4
storage/connect/tabfmt.cpp
View File

@@ -444,14 +444,10 @@ PTDB CSVDEF::GetTable(PGLOBAL g, MODE mode)
if (Catfunc != FNC_COL) { if (Catfunc != FNC_COL) {
USETEMP tmp = PlgGetUser(g)->UseTemp; USETEMP tmp = PlgGetUser(g)->UseTemp;
#if defined(WIN32)
bool map = Mapped && mode != MODE_INSERT && bool map = Mapped && mode != MODE_INSERT &&
!(tmp != TMP_NO && mode == MODE_UPDATE) && !(tmp != TMP_NO && mode == MODE_UPDATE) &&
!(tmp == TMP_FORCE && !(tmp == TMP_FORCE &&
(mode == MODE_UPDATE || mode == MODE_DELETE)); (mode == MODE_UPDATE || mode == MODE_DELETE));
#else // !WIN32
bool map = Mapped && mode == MODE_READ;
#endif // !WIN32
PTXF txfp; PTXF txfp;
/*******************************************************************/ /*******************************************************************/

4
storage/connect/tabvct.cpp
View File

@@ -197,13 +197,9 @@ PTDB VCTDEF::GetTable(PGLOBAL g, MODE mode)
/*********************************************************************/ /*********************************************************************/
// Mapping not used for insert (except for true VEC not split tables) // Mapping not used for insert (except for true VEC not split tables)
// or when UseTemp is forced // or when UseTemp is forced
#if defined(WIN32)
bool map = Mapped && (Estimate || mode != MODE_INSERT) && bool map = Mapped && (Estimate || mode != MODE_INSERT) &&
!(PlgGetUser(g)->UseTemp == TMP_FORCE && !(PlgGetUser(g)->UseTemp == TMP_FORCE &&
(mode == MODE_UPDATE || mode == MODE_DELETE)); (mode == MODE_UPDATE || mode == MODE_DELETE));
#else // !WIN32
bool map = Mapped && mode == MODE_READ;
#endif // !WIN32
PTXF txfp; PTXF txfp;
PTDB tdbp; PTDB tdbp;