mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
088e2395f1
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c
166 lines
4.2 KiB
C
166 lines
4.2 KiB
C
/* Copyright (C) 2004 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"
|
|
|
|
#ifdef HAVE_LARGE_PAGES
|
|
|
|
#ifdef HAVE_SYS_IPC_H
|
|
#include <sys/ipc.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_SHM_H
|
|
#include <sys/shm.h>
|
|
#endif
|
|
|
|
static uint my_get_large_page_size_int(void);
|
|
static uchar* my_large_malloc_int(size_t size, myf my_flags);
|
|
static my_bool my_large_free_int(uchar* ptr, myf my_flags);
|
|
|
|
/* Gets the size of large pages from the OS */
|
|
|
|
uint my_get_large_page_size(void)
|
|
{
|
|
uint size;
|
|
DBUG_ENTER("my_get_large_page_size");
|
|
|
|
if (!(size = my_get_large_page_size_int()))
|
|
fprintf(stderr, "Warning: Failed to determine large page size\n");
|
|
|
|
DBUG_RETURN(size);
|
|
}
|
|
|
|
/*
|
|
General large pages allocator.
|
|
Tries to allocate memory from large pages pool and falls back to
|
|
my_malloc_lock() in case of failure
|
|
*/
|
|
|
|
uchar* my_large_malloc(size_t size, myf my_flags)
|
|
{
|
|
uchar* ptr;
|
|
DBUG_ENTER("my_large_malloc");
|
|
|
|
if (my_use_large_pages && my_large_page_size)
|
|
{
|
|
if ((ptr = my_large_malloc_int(size, my_flags)) != NULL)
|
|
DBUG_RETURN(ptr);
|
|
if (my_flags & MY_WME)
|
|
fprintf(stderr, "Warning: Using conventional memory pool\n");
|
|
}
|
|
|
|
DBUG_RETURN(my_malloc_lock(size, my_flags));
|
|
}
|
|
|
|
/*
|
|
General large pages deallocator.
|
|
Tries to deallocate memory as if it was from large pages pool and falls back
|
|
to my_free_lock() in case of failure
|
|
*/
|
|
|
|
void my_large_free(uchar* ptr, myf my_flags __attribute__((unused)))
|
|
{
|
|
DBUG_ENTER("my_large_free");
|
|
|
|
/*
|
|
my_large_free_int() can only fail if ptr was not allocated with
|
|
my_large_malloc_int(), i.e. my_malloc_lock() was used so we should free it
|
|
with my_free_lock()
|
|
*/
|
|
if (!my_use_large_pages || !my_large_page_size ||
|
|
!my_large_free_int(ptr, my_flags))
|
|
my_free_lock(ptr, my_flags);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
#ifdef HUGETLB_USE_PROC_MEMINFO
|
|
/* Linux-specific function to determine the size of large pages */
|
|
|
|
uint my_get_large_page_size_int(void)
|
|
{
|
|
FILE *f;
|
|
uint size = 0;
|
|
char buf[256];
|
|
DBUG_ENTER("my_get_large_page_size_int");
|
|
|
|
if (!(f = my_fopen("/proc/meminfo", O_RDONLY, MYF(MY_WME))))
|
|
goto finish;
|
|
|
|
while (fgets(buf, sizeof(buf), f))
|
|
if (sscanf(buf, "Hugepagesize: %u kB", &size))
|
|
break;
|
|
|
|
my_fclose(f, MYF(MY_WME));
|
|
|
|
finish:
|
|
DBUG_RETURN(size * 1024);
|
|
}
|
|
#endif /* HUGETLB_USE_PROC_MEMINFO */
|
|
|
|
#if HAVE_DECL_SHM_HUGETLB
|
|
/* Linux-specific large pages allocator */
|
|
|
|
uchar* my_large_malloc_int(size_t size, myf my_flags)
|
|
{
|
|
int shmid;
|
|
uchar* ptr;
|
|
struct shmid_ds buf;
|
|
DBUG_ENTER("my_large_malloc_int");
|
|
|
|
/* Align block size to my_large_page_size */
|
|
size = ((size - 1) & ~(my_large_page_size - 1)) + my_large_page_size;
|
|
|
|
shmid = shmget(IPC_PRIVATE, size, SHM_HUGETLB | SHM_R | SHM_W);
|
|
if (shmid < 0)
|
|
{
|
|
if (my_flags & MY_WME)
|
|
fprintf(stderr,
|
|
"Warning: Failed to allocate %lu bytesx from HugeTLB memory."
|
|
" errno %d\n", (ulong) size, errno);
|
|
|
|
DBUG_RETURN(NULL);
|
|
}
|
|
|
|
ptr = (uchar*) shmat(shmid, NULL, 0);
|
|
if (ptr == (uchar *) -1)
|
|
{
|
|
if (my_flags& MY_WME)
|
|
fprintf(stderr, "Warning: Failed to attach shared memory segment,"
|
|
" errno %d\n", errno);
|
|
shmctl(shmid, IPC_RMID, &buf);
|
|
|
|
DBUG_RETURN(NULL);
|
|
}
|
|
|
|
/*
|
|
Remove the shared memory segment so that it will be automatically freed
|
|
after memory is detached or process exits
|
|
*/
|
|
shmctl(shmid, IPC_RMID, &buf);
|
|
|
|
DBUG_RETURN(ptr);
|
|
}
|
|
|
|
/* Linux-specific large pages deallocator */
|
|
|
|
my_bool my_large_free_int(uchar *ptr, myf my_flags __attribute__((unused)))
|
|
{
|
|
DBUG_ENTER("my_large_free_int");
|
|
DBUG_RETURN(shmdt(ptr) == 0);
|
|
}
|
|
#endif /* HAVE_DECL_SHM_HUGETLB */
|
|
|
|
#endif /* HAVE_LARGE_PAGES */
|