summaryrefslogtreecommitdiff
path: root/storage/innobase/ut
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/ut')
-rw-r--r--storage/innobase/ut/ut0byte.c4
-rw-r--r--storage/innobase/ut/ut0dbg.c4
-rw-r--r--storage/innobase/ut/ut0mem.c93
-rw-r--r--storage/innobase/ut/ut0rnd.c22
-rw-r--r--storage/innobase/ut/ut0ut.c100
5 files changed, 112 insertions, 111 deletions
diff --git a/storage/innobase/ut/ut0byte.c b/storage/innobase/ut/ut0byte.c
index cc83aacc90b..18f57181827 100644
--- a/storage/innobase/ut/ut0byte.c
+++ b/storage/innobase/ut/ut0byte.c
@@ -15,10 +15,10 @@ Created 5/11/1994 Heikki Tuuri
#include "ut0sort.h"
/* Zero value for a dulint */
-dulint ut_dulint_zero = {0, 0};
+dulint ut_dulint_zero = {0, 0};
/* Maximum value for a dulint */
-dulint ut_dulint_max = {0xFFFFFFFFUL, 0xFFFFFFFFUL};
+dulint ut_dulint_max = {0xFFFFFFFFUL, 0xFFFFFFFFUL};
/****************************************************************
Sort function for dulint arrays. */
diff --git a/storage/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c
index e810d8dead7..2157a71116a 100644
--- a/storage/innobase/ut/ut0dbg.c
+++ b/storage/innobase/ut/ut0dbg.c
@@ -17,8 +17,8 @@ ulint ut_dbg_zero = 0;
/* If this is set to TRUE all threads will stop into the next assertion
and assert */
ibool ut_dbg_stop_threads = FALSE;
-#ifdef __NETWARE__
-ibool panic_shutdown = FALSE; /* This is set to TRUE when on NetWare there
+#ifdef __NETWARE__
+ibool panic_shutdown = FALSE; /* This is set to TRUE when on NetWare there
happens an InnoDB assertion failure or other
fatal error condition that requires an
immediate shutdown. */
diff --git a/storage/innobase/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c
index 47b1e24e5e1..345c14e00f9 100644
--- a/storage/innobase/ut/ut0mem.c
+++ b/storage/innobase/ut/ut0mem.c
@@ -23,7 +23,7 @@ typedef struct ut_mem_block_struct ut_mem_block_t;
ulint ut_total_allocated_memory = 0;
struct ut_mem_block_struct{
- UT_LIST_NODE_T(ut_mem_block_t) mem_block_list;
+ UT_LIST_NODE_T(ut_mem_block_t) mem_block_list;
/* mem block list node */
ulint size; /* size of allocated memory */
ulint magic_n;
@@ -35,7 +35,7 @@ struct ut_mem_block_struct{
with malloc */
UT_LIST_BASE_NODE_T(ut_mem_block_t) ut_mem_block_list;
-os_fast_mutex_t ut_list_mutex; /* this protects the list */
+os_fast_mutex_t ut_list_mutex; /* this protects the list */
ibool ut_mem_block_list_inited = FALSE;
@@ -48,8 +48,8 @@ void
ut_mem_block_list_init(void)
/*========================*/
{
- os_fast_mutex_init(&ut_list_mutex);
- UT_LIST_INIT(ut_mem_block_list);
+ os_fast_mutex_init(&ut_list_mutex);
+ UT_LIST_INIT(ut_mem_block_list);
ut_mem_block_list_inited = TRUE;
}
@@ -60,12 +60,13 @@ defined and set_to_zero is TRUE. */
void*
ut_malloc_low(
/*==========*/
- /* out, own: allocated memory */
- ulint n, /* in: number of bytes to allocate */
- ibool set_to_zero, /* in: TRUE if allocated memory should be set
- to zero if UNIV_SET_MEM_TO_ZERO is defined */
- ibool assert_on_error) /* in: if TRUE, we crash mysqld if the memory
- cannot be allocated */
+ /* out, own: allocated memory */
+ ulint n, /* in: number of bytes to allocate */
+ ibool set_to_zero, /* in: TRUE if allocated memory should be
+ set to zero if UNIV_SET_MEM_TO_ZERO is
+ defined */
+ ibool assert_on_error)/* in: if TRUE, we crash mysqld if the
+ memory cannot be allocated */
{
ulint retry_count = 0;
void* ret;
@@ -73,7 +74,7 @@ ut_malloc_low(
ut_ad((sizeof(ut_mem_block_t) % 8) == 0); /* check alignment ok */
if (!ut_mem_block_list_inited) {
- ut_mem_block_list_init();
+ ut_mem_block_list_init();
}
retry:
os_fast_mutex_lock(&ut_list_mutex);
@@ -95,7 +96,7 @@ retry:
"InnoDB: Note that in most 32-bit computers the process\n"
"InnoDB: memory space is limited to 2 GB or 4 GB.\n"
"InnoDB: We keep retrying the allocation for 60 seconds...\n",
- (ulong) n, (ulong) ut_total_allocated_memory,
+ (ulong) n, (ulong) ut_total_allocated_memory,
#ifdef __WIN__
(ulong) GetLastError()
#else
@@ -110,7 +111,7 @@ retry:
just a temporary shortage of memory */
os_thread_sleep(1000000);
-
+
retry_count++;
goto retry;
@@ -123,13 +124,13 @@ retry:
fflush(stderr);
- os_fast_mutex_unlock(&ut_list_mutex);
+ os_fast_mutex_unlock(&ut_list_mutex);
/* Make an intentional seg fault so that we get a stack
trace */
- /* Intentional segfault on NetWare causes an abend. Avoid this
+ /* Intentional segfault on NetWare causes an abend. Avoid this
by graceful exit handling in ut_a(). */
-#if (!defined __NETWARE__)
+#if (!defined __NETWARE__)
if (assert_on_error) {
ut_print_timestamp(stderr);
@@ -144,11 +145,11 @@ retry:
#else
ut_a(0);
#endif
- }
+ }
if (set_to_zero) {
#ifdef UNIV_SET_MEM_TO_ZERO
- memset(ret, '\0', n + sizeof(ut_mem_block_t));
+ memset(ret, '\0', n + sizeof(ut_mem_block_t));
#endif
}
@@ -156,9 +157,9 @@ retry:
((ut_mem_block_t*)ret)->magic_n = UT_MEM_MAGIC_N;
ut_total_allocated_memory += n + sizeof(ut_mem_block_t);
-
+
UT_LIST_ADD_FIRST(mem_block_list, ut_mem_block_list,
- ((ut_mem_block_t*)ret));
+ ((ut_mem_block_t*)ret));
os_fast_mutex_unlock(&ut_list_mutex);
return((void*)((byte*)ret + sizeof(ut_mem_block_t)));
@@ -171,10 +172,10 @@ defined. */
void*
ut_malloc(
/*======*/
- /* out, own: allocated memory */
- ulint n) /* in: number of bytes to allocate */
+ /* out, own: allocated memory */
+ ulint n) /* in: number of bytes to allocate */
{
- return(ut_malloc_low(n, TRUE, TRUE));
+ return(ut_malloc_low(n, TRUE, TRUE));
}
/**************************************************************************
@@ -202,8 +203,8 @@ ut_test_malloc(
"InnoDB: ulimits of your operating system.\n"
"InnoDB: On FreeBSD check you have compiled the OS with\n"
"InnoDB: a big enough maximum process size.\n",
- (ulong) n,
- (ulong) ut_total_allocated_memory,
+ (ulong) n,
+ (ulong) ut_total_allocated_memory,
(int) errno);
return(FALSE);
}
@@ -211,7 +212,7 @@ ut_test_malloc(
free(ret);
return(TRUE);
-}
+}
/**************************************************************************
Frees a memory block allocated with ut_malloc. */
@@ -221,7 +222,7 @@ ut_free(
/*====*/
void* ptr) /* in, own: memory block */
{
- ut_mem_block_t* block;
+ ut_mem_block_t* block;
block = (ut_mem_block_t*)((byte*)ptr - sizeof(ut_mem_block_t));
@@ -231,10 +232,10 @@ ut_free(
ut_a(ut_total_allocated_memory >= block->size);
ut_total_allocated_memory -= block->size;
-
+
UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block);
free(block);
-
+
os_fast_mutex_unlock(&ut_list_mutex);
}
@@ -248,10 +249,10 @@ man realloc in Linux, 2004:
realloc() changes the size of the memory block pointed to
by ptr to size bytes. The contents will be unchanged to
the minimum of the old and new sizes; newly allocated mem­
- ory will be uninitialized. If ptr is NULL, the call is
+ ory will be uninitialized. If ptr is NULL, the call is
equivalent to malloc(size); if size is equal to zero, the
- call is equivalent to free(ptr). Unless ptr is NULL, it
- must have been returned by an earlier call to malloc(),
+ call is equivalent to free(ptr). Unless ptr is NULL, it
+ must have been returned by an earlier call to malloc(),
calloc() or realloc().
RETURN VALUE
@@ -259,8 +260,8 @@ RETURN VALUE
which is suitably aligned for any kind of variable and may
be different from ptr, or NULL if the request fails. If
size was equal to 0, either NULL or a pointer suitable to
- be passed to free() is returned. If realloc() fails the
- original block is left untouched - it is not freed or
+ be passed to free() is returned. If realloc() fails the
+ original block is left untouched - it is not freed or
moved. */
void*
@@ -270,7 +271,7 @@ ut_realloc(
void* ptr, /* in: pointer to old block or NULL */
ulint size) /* in: desired size */
{
- ut_mem_block_t* block;
+ ut_mem_block_t* block;
ulint old_size;
ulint min_size;
void* new_ptr;
@@ -297,20 +298,20 @@ ut_realloc(
} else {
min_size = old_size;
}
-
+
new_ptr = ut_malloc(size);
if (new_ptr == NULL) {
return(NULL);
- }
+ }
/* Copy the old data from ptr */
ut_memcpy(new_ptr, ptr, min_size);
ut_free(ptr);
- return(new_ptr);
+ return(new_ptr);
}
/**************************************************************************
@@ -320,9 +321,9 @@ void
ut_free_all_mem(void)
/*=================*/
{
- ut_mem_block_t* block;
+ ut_mem_block_t* block;
- os_fast_mutex_free(&ut_list_mutex);
+ os_fast_mutex_free(&ut_list_mutex);
while ((block = UT_LIST_GET_FIRST(ut_mem_block_list))) {
@@ -330,11 +331,11 @@ ut_free_all_mem(void)
ut_a(ut_total_allocated_memory >= block->size);
ut_total_allocated_memory -= block->size;
-
- UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block);
- free(block);
+
+ UT_LIST_REMOVE(mem_block_list, ut_mem_block_list, block);
+ free(block);
}
-
+
if (ut_total_allocated_memory != 0) {
fprintf(stderr,
"InnoDB: Warning: after shutdown total allocated memory is %lu\n",
@@ -359,7 +360,7 @@ ut_strlcpy(
if (size != 0) {
ulint n = ut_min(src_size, size - 1);
-
+
memcpy(dst, src, n);
dst[n] = '\0';
}
@@ -391,7 +392,7 @@ ut_strlcpy_rev(
}
/**************************************************************************
-Make a quoted copy of a NUL-terminated string. Leading and trailing
+Make a quoted copy of a NUL-terminated string. Leading and trailing
quotes will not be included; only embedded quotes will be escaped.
See also ut_strlenq() and ut_memcpyq(). */
diff --git a/storage/innobase/ut/ut0rnd.c b/storage/innobase/ut/ut0rnd.c
index 85d2e6094c3..016809e0474 100644
--- a/storage/innobase/ut/ut0rnd.c
+++ b/storage/innobase/ut/ut0rnd.c
@@ -32,9 +32,9 @@ ut_find_prime(
{
ulint pow2;
ulint i;
-
+
n += 100;
-
+
pow2 = 1;
while (pow2 * 2 < n) {
pow2 = 2 * pow2;
@@ -43,23 +43,23 @@ ut_find_prime(
if ((double)n < 1.05 * (double)pow2) {
n = (ulint) ((double)n * UT_RANDOM_1);
}
-
+
pow2 = 2 * pow2;
-
+
if ((double)n > 0.95 * (double)pow2) {
n = (ulint) ((double)n * UT_RANDOM_2);
}
-
+
if (n > pow2 - 20) {
n += 30;
}
/* Now we have n far enough from powers of 2. To make
- n more random (especially, if it was not near
- a power of 2), we then multiply it by a random number. */
+ n more random (especially, if it was not near
+ a power of 2), we then multiply it by a random number. */
n = (ulint) ((double)n * UT_RANDOM_3);
-
+
for (;; n++) {
i = 2;
while (i * i <= n) {
@@ -68,11 +68,11 @@ ut_find_prime(
}
i++;
}
-
+
/* Found a prime */
break;
-next_n: ;
+next_n: ;
}
-
+
return(n);
}
diff --git a/storage/innobase/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c
index 1be5939303a..48435fe6155 100644
--- a/storage/innobase/ut/ut0ut.c
+++ b/storage/innobase/ut/ut0ut.c
@@ -117,11 +117,11 @@ ut_print_timestamp(
FILE* file) /* in: file where to print */
{
#ifdef __WIN__
- SYSTEMTIME cal_tm;
+ SYSTEMTIME cal_tm;
- GetLocalTime(&cal_tm);
+ GetLocalTime(&cal_tm);
- fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
+ fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
(int)cal_tm.wYear % 100,
(int)cal_tm.wMonth,
(int)cal_tm.wDay,
@@ -130,18 +130,18 @@ ut_print_timestamp(
(int)cal_tm.wSecond);
#else
struct tm cal_tm;
- struct tm* cal_tm_ptr;
- time_t tm;
+ struct tm* cal_tm_ptr;
+ time_t tm;
- time(&tm);
+ time(&tm);
#ifdef HAVE_LOCALTIME_R
- localtime_r(&tm, &cal_tm);
- cal_tm_ptr = &cal_tm;
+ localtime_r(&tm, &cal_tm);
+ cal_tm_ptr = &cal_tm;
#else
- cal_tm_ptr = localtime(&tm);
+ cal_tm_ptr = localtime(&tm);
#endif
- fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
+ fprintf(file,"%02d%02d%02d %2d:%02d:%02d",
cal_tm_ptr->tm_year % 100,
cal_tm_ptr->tm_mon + 1,
cal_tm_ptr->tm_mday,
@@ -160,11 +160,11 @@ ut_sprintf_timestamp(
char* buf) /* in: buffer where to sprintf */
{
#ifdef __WIN__
- SYSTEMTIME cal_tm;
+ SYSTEMTIME cal_tm;
- GetLocalTime(&cal_tm);
+ GetLocalTime(&cal_tm);
- sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
+ sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
(int)cal_tm.wYear % 100,
(int)cal_tm.wMonth,
(int)cal_tm.wDay,
@@ -173,18 +173,18 @@ ut_sprintf_timestamp(
(int)cal_tm.wSecond);
#else
struct tm cal_tm;
- struct tm* cal_tm_ptr;
- time_t tm;
+ struct tm* cal_tm_ptr;
+ time_t tm;
- time(&tm);
+ time(&tm);
#ifdef HAVE_LOCALTIME_R
- localtime_r(&tm, &cal_tm);
- cal_tm_ptr = &cal_tm;
+ localtime_r(&tm, &cal_tm);
+ cal_tm_ptr = &cal_tm;
#else
- cal_tm_ptr = localtime(&tm);
+ cal_tm_ptr = localtime(&tm);
#endif
- sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
+ sprintf(buf, "%02d%02d%02d %2d:%02d:%02d",
cal_tm_ptr->tm_year % 100,
cal_tm_ptr->tm_mon + 1,
cal_tm_ptr->tm_mday,
@@ -204,11 +204,11 @@ ut_sprintf_timestamp_without_extra_chars(
char* buf) /* in: buffer where to sprintf */
{
#ifdef __WIN__
- SYSTEMTIME cal_tm;
+ SYSTEMTIME cal_tm;
- GetLocalTime(&cal_tm);
+ GetLocalTime(&cal_tm);
- sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
+ sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
(int)cal_tm.wYear % 100,
(int)cal_tm.wMonth,
(int)cal_tm.wDay,
@@ -217,18 +217,18 @@ ut_sprintf_timestamp_without_extra_chars(
(int)cal_tm.wSecond);
#else
struct tm cal_tm;
- struct tm* cal_tm_ptr;
- time_t tm;
+ struct tm* cal_tm_ptr;
+ time_t tm;
- time(&tm);
+ time(&tm);
#ifdef HAVE_LOCALTIME_R
- localtime_r(&tm, &cal_tm);
- cal_tm_ptr = &cal_tm;
+ localtime_r(&tm, &cal_tm);
+ cal_tm_ptr = &cal_tm;
#else
- cal_tm_ptr = localtime(&tm);
+ cal_tm_ptr = localtime(&tm);
#endif
- sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
+ sprintf(buf, "%02d%02d%02d_%2d_%02d_%02d",
cal_tm_ptr->tm_year % 100,
cal_tm_ptr->tm_mon + 1,
cal_tm_ptr->tm_mday,
@@ -249,29 +249,29 @@ ut_get_year_month_day(
ulint* day) /* out: day */
{
#ifdef __WIN__
- SYSTEMTIME cal_tm;
+ SYSTEMTIME cal_tm;
- GetLocalTime(&cal_tm);
+ GetLocalTime(&cal_tm);
- *year = (ulint)cal_tm.wYear;
- *month = (ulint)cal_tm.wMonth;
- *day = (ulint)cal_tm.wDay;
+ *year = (ulint)cal_tm.wYear;
+ *month = (ulint)cal_tm.wMonth;
+ *day = (ulint)cal_tm.wDay;
#else
struct tm cal_tm;
- struct tm* cal_tm_ptr;
- time_t tm;
+ struct tm* cal_tm_ptr;
+ time_t tm;
- time(&tm);
+ time(&tm);
#ifdef HAVE_LOCALTIME_R
- localtime_r(&tm, &cal_tm);
- cal_tm_ptr = &cal_tm;
+ localtime_r(&tm, &cal_tm);
+ cal_tm_ptr = &cal_tm;
#else
- cal_tm_ptr = localtime(&tm);
+ cal_tm_ptr = localtime(&tm);
#endif
- *year = (ulint)cal_tm_ptr->tm_year + 1900;
- *month = (ulint)cal_tm_ptr->tm_mon + 1;
- *day = (ulint)cal_tm_ptr->tm_mday;
+ *year = (ulint)cal_tm_ptr->tm_year + 1900;
+ *month = (ulint)cal_tm_ptr->tm_mon + 1;
+ *day = (ulint)cal_tm_ptr->tm_mday;
#endif
}
@@ -296,9 +296,9 @@ ut_delay(
if (ut_always_false) {
ut_always_false = (ibool) j;
}
-
+
return(j);
-}
+}
/*****************************************************************
Prints the contents of a memory buffer in hex and ascii. */
@@ -307,7 +307,7 @@ void
ut_print_buf(
/*=========*/
FILE* file, /* in: file where to print */
- const byte* buf, /* in: memory buffer */
+ const void* buf, /* in: memory buffer */
ulint len) /* in: length of the buffer */
{
const byte* data;
@@ -315,13 +315,13 @@ ut_print_buf(
fprintf(file, " len %lu; hex ", len);
- for (data = buf, i = 0; i < len; i++) {
+ for (data = (const byte*)buf, i = 0; i < len; i++) {
fprintf(file, "%02lx", (ulong)*data++);
}
fputs("; asc ", file);
- data = buf;
+ data = (const byte*)buf;
for (i = 0; i < len; i++) {
int c = (int) *data++;
@@ -408,7 +408,7 @@ Outputs a fixed-length string, quoted as an SQL identifier. */
void
ut_print_namel(
-/*==========*/
+/*===========*/
FILE* f, /* in: output stream */
trx_t* trx, /* in: transaction (NULL=no quotes) */
const char* name, /* in: name to print */
View Lorry Controller Status