mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
4e1116b2c6
Also, remove empty .ic files that were not removed by my MySQL commit. Problem: InnoDB used to support a compilation mode that allowed to choose whether the function definitions in .ic files are to be inlined or not. This stopped making sense when InnoDB moved to C++ in MySQL 5.6 (and ha_innodb.cc started to #include .ic files), and more so in MySQL 5.7 when inline methods and functions were introduced in .h files. Solution: Remove all references to UNIV_NONINL and UNIV_MUST_NOT_INLINE from all files, assuming that the symbols are never defined. Remove the files fut0fut.cc and ut0byte.cc which only mattered when UNIV_NONINL was defined.
73 lines
2.3 KiB
C++
73 lines
2.3 KiB
C++
/*****************************************************************************
|
|
|
|
Copyright (c) 2006, 2016, Oracle and/or its affiliates. All Rights Reserved.
|
|
|
|
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.,
|
|
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
|
|
|
*****************************************************************************/
|
|
|
|
/*******************************************************************//**
|
|
@file ut/ut0vec.cc
|
|
A vector of pointers to data items
|
|
|
|
Created 4/6/2006 Osku Salerma
|
|
************************************************************************/
|
|
|
|
#include "ut0vec.h"
|
|
#include "mem0mem.h"
|
|
|
|
/********************************************************************
|
|
Create a new vector with the given initial size. */
|
|
ib_vector_t*
|
|
ib_vector_create(
|
|
/*=============*/
|
|
/* out: vector */
|
|
ib_alloc_t* allocator, /* in: vector allocator */
|
|
ulint sizeof_value, /* in: size of data item */
|
|
ulint size) /* in: initial size */
|
|
{
|
|
ib_vector_t* vec;
|
|
|
|
ut_a(size > 0);
|
|
|
|
vec = static_cast<ib_vector_t*>(
|
|
allocator->mem_malloc(allocator, sizeof(*vec)));
|
|
|
|
vec->used = 0;
|
|
vec->total = size;
|
|
vec->allocator = allocator;
|
|
vec->sizeof_value = sizeof_value;
|
|
|
|
vec->data = static_cast<void*>(
|
|
allocator->mem_malloc(allocator, vec->sizeof_value * size));
|
|
|
|
return(vec);
|
|
}
|
|
|
|
/********************************************************************
|
|
Resize the vector, currently the vector can only grow and we
|
|
expand the number of elements it can hold by 2 times. */
|
|
void
|
|
ib_vector_resize(
|
|
/*=============*/
|
|
ib_vector_t* vec) /* in: vector */
|
|
{
|
|
ulint new_total = vec->total * 2;
|
|
ulint old_size = vec->used * vec->sizeof_value;
|
|
ulint new_size = new_total * vec->sizeof_value;
|
|
|
|
vec->data = static_cast<void*>(vec->allocator->mem_resize(
|
|
vec->allocator, vec->data, old_size, new_size));
|
|
|
|
vec->total = new_total;
|
|
}
|