mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
4e92af9f43
Bug#24509 - 2048 file descriptor limit on windows needs increasing, also
WL#3049 - improved Windows I/O
The patch replaces the use of the POSIX I/O interfaces in mysys on Windows with
the Win32 API calls (CreateFile, WriteFile, etc). The Windows HANDLE for the open
file is stored in the my_file_info struct, along with a flag for append mode
because the Windows API does not support opening files in append mode in all cases)
The default max open files has been increased to 16384 and can be increased further
by setting --max-open-files=<value> during the server start.
Another major change in this patch that almost all Windows specific file IO code
has been moved to a new file my_winfile.c, greatly reducing the amount of code
in #ifdef blocks within mysys, thus improving readability.
Minor enhancements:
- my_(f)stat() is changed to use __stati64 structure with 64 file size
and timestamps. It will return correct file size now (C runtime implementation
used to report outdated information)
- my_lock on Windows is prepared to handle additional timeout parameter
- after review : changed __WIN__ to _WIN32 in the new and changed code.
97 lines
3.1 KiB
C
97 lines
3.1 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <my_base.h>
|
|
#include <errno.h>
|
|
|
|
/*
|
|
Read a chunk of bytes from a file with retry's if needed
|
|
|
|
The parameters are:
|
|
File descriptor
|
|
Buffer to hold at least Count bytes
|
|
Bytes to read
|
|
Flags on what to do on error
|
|
|
|
Return:
|
|
-1 on error
|
|
0 if flag has bits MY_NABP or MY_FNABP set
|
|
N number of bytes read.
|
|
*/
|
|
|
|
size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags)
|
|
{
|
|
size_t readbytes, save_count;
|
|
DBUG_ENTER("my_read");
|
|
DBUG_PRINT("my",("fd: %d Buffer: %p Count: %lu MyFlags: %d",
|
|
Filedes, Buffer, (ulong) Count, MyFlags));
|
|
save_count= Count;
|
|
|
|
for (;;)
|
|
{
|
|
errno= 0; /* Linux, Windows don't reset this on EOF/success */
|
|
#ifdef _WIN32
|
|
readbytes= my_win_read(Filedes, Buffer, Count);
|
|
#else
|
|
readbytes= read(Filedes, Buffer, Count);
|
|
#endif
|
|
|
|
if (readbytes != Count)
|
|
{
|
|
my_errno= errno;
|
|
if (errno == 0 || (readbytes != (size_t) -1 &&
|
|
(MyFlags & (MY_NABP | MY_FNABP))))
|
|
my_errno= HA_ERR_FILE_TOO_SHORT;
|
|
DBUG_PRINT("warning",("Read only %d bytes off %lu from %d, errno: %d",
|
|
(int) readbytes, (ulong) Count, Filedes,
|
|
my_errno));
|
|
#ifdef THREAD
|
|
if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR)
|
|
{
|
|
DBUG_PRINT("debug", ("my_read() was interrupted and returned %ld",
|
|
(long) readbytes));
|
|
continue; /* Interrupted */
|
|
}
|
|
#endif
|
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
|
{
|
|
if (readbytes == (size_t) -1)
|
|
my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
else if (MyFlags & (MY_NABP | MY_FNABP))
|
|
my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
}
|
|
if (readbytes == (size_t) -1 ||
|
|
((MyFlags & (MY_FNABP | MY_NABP)) && !(MyFlags & MY_FULL_IO)))
|
|
DBUG_RETURN(MY_FILE_ERROR); /* Return with error */
|
|
if (readbytes != (size_t) -1 && (MyFlags & MY_FULL_IO))
|
|
{
|
|
Buffer+= readbytes;
|
|
Count-= readbytes;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
readbytes= 0; /* Ok on read */
|
|
else if (MyFlags & MY_FULL_IO)
|
|
readbytes= save_count;
|
|
break;
|
|
}
|
|
DBUG_RETURN(readbytes);
|
|
} /* my_read */
|