mutter/cogl/cogl-memory-stack.c
Neil Roberts 7bf0fe9df8 Don't dereference an unitialised pointer in _cogl_container_of
The previous implementation was dereferencing the sample pointer in
order to get the offset to subtract from the member pointer. The
resulting value is then only used to get a pointer to the member in
order to calculate the offset so it doesn't actually read from the
memory location and shouldn't cause any problems. However this is
probably technically invalid and could have undefined behaviour. It
looks like clang takes advantage of this undefined behaviour and
doesn't actually offset the pointer. It also generates a warning when
it does this.

This patch splits the _cogl_container_of macro into two
implementations. Previously the macro was always used in the list
iterator macros like this:

SomeType *sample = _cogl_container_of(list_node, sample, link)

Instead of doing that there is now a new macro called
_cogl_list_set_iterator which explicitly assigns to the sample pointer
with an initial value before assigning to it again with the real
offset. This redundant initialisation gets optimised out by compiler.

The second macro is still called _cogl_container_of but instead of
taking a sample pointer it just directly takes the type name. That way
it can use the standard offsetof macro.

https://bugzilla.gnome.org/show_bug.cgi?id=723530

Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 1efed1e0a2bce706eb4901979ed4e717bb13e4e2)
2014-02-20 13:38:43 +00:00

191 lines
5.6 KiB
C

/*
* Cogl
*
* An object oriented GL/GLES Abstraction/Utility Layer
*
* Copyright (C) 2011 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
*
* CoglMemoryStack provides a really simple, but lightning fast
* memory stack allocation strategy:
*
* - The underlying pool of memory is grow-only.
* - The pool is considered to be a stack which may be comprised
* of multiple smaller stacks. Allocation is done as follows:
* - If there's enough memory in the current sub-stack then the
* stack-pointer will be returned as the allocation and the
* stack-pointer will be incremented by the allocation size.
* - If there isn't enough memory in the current sub-stack
* then a new sub-stack is allocated twice as big as the current
* sub-stack or twice as big as the requested allocation size if
* that's bigger and the stack-pointer is set to the start of the
* new sub-stack.
* - Allocations can't be freed in a random-order, you can only
* rewind the entire stack back to the start. There is no
* the concept of stack frames to allow partial rewinds.
*
* For example; we plan to use this in our tesselator which has to
* allocate lots of small vertex, edge and face structures because
* when tesselation has been finished we just want to free the whole
* lot in one go.
*
*
* Authors:
* Robert Bragg <robert@linux.intel.com>
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "cogl-memory-stack-private.h"
#include "cogl-list.h"
#include <stdint.h>
#include <glib.h>
typedef struct _CoglMemorySubStack
{
CoglList link;
size_t bytes;
uint8_t *data;
} CoglMemorySubStack;
struct _CoglMemoryStack
{
CoglList sub_stacks;
CoglMemorySubStack *sub_stack;
size_t sub_stack_offset;
};
static CoglMemorySubStack *
_cogl_memory_sub_stack_alloc (size_t bytes)
{
CoglMemorySubStack *sub_stack = g_slice_new (CoglMemorySubStack);
sub_stack->bytes = bytes;
sub_stack->data = g_malloc (bytes);
return sub_stack;
}
static void
_cogl_memory_stack_add_sub_stack (CoglMemoryStack *stack,
size_t sub_stack_bytes)
{
CoglMemorySubStack *sub_stack =
_cogl_memory_sub_stack_alloc (sub_stack_bytes);
_cogl_list_insert (stack->sub_stacks.prev, &sub_stack->link);
stack->sub_stack = sub_stack;
stack->sub_stack_offset = 0;
}
CoglMemoryStack *
_cogl_memory_stack_new (size_t initial_size_bytes)
{
CoglMemoryStack *stack = g_slice_new0 (CoglMemoryStack);
_cogl_list_init (&stack->sub_stacks);
_cogl_memory_stack_add_sub_stack (stack, initial_size_bytes);
return stack;
}
void *
_cogl_memory_stack_alloc (CoglMemoryStack *stack, size_t bytes)
{
CoglMemorySubStack *sub_stack;
void *ret;
sub_stack = stack->sub_stack;
if (G_LIKELY (sub_stack->bytes - stack->sub_stack_offset >= bytes))
{
ret = sub_stack->data + stack->sub_stack_offset;
stack->sub_stack_offset += bytes;
return ret;
}
/* If the stack has been rewound and then a large initial allocation
* is made then we may need to skip over one or more of the
* sub-stacks that are too small for the requested allocation
* size... */
for (_cogl_list_set_iterator (sub_stack->link.next, sub_stack, link);
&sub_stack->link != &stack->sub_stacks;
_cogl_list_set_iterator (sub_stack->link.next, sub_stack, link))
{
if (sub_stack->bytes >= bytes)
{
ret = sub_stack->data;
stack->sub_stack = sub_stack;
stack->sub_stack_offset = bytes;
return ret;
}
}
/* Finally if we couldn't find a free sub-stack with enough space
* for the requested allocation we allocate another sub-stack that's
* twice as big as the last sub-stack or twice as big as the
* requested allocation if that's bigger.
*/
sub_stack = _cogl_container_of (stack->sub_stacks.prev,
CoglMemorySubStack,
link);
_cogl_memory_stack_add_sub_stack (stack, MAX (sub_stack->bytes, bytes) * 2);
sub_stack = _cogl_container_of (stack->sub_stacks.prev,
CoglMemorySubStack,
link);
stack->sub_stack_offset += bytes;
return sub_stack->data;
}
void
_cogl_memory_stack_rewind (CoglMemoryStack *stack)
{
stack->sub_stack = _cogl_container_of (stack->sub_stacks.next,
CoglMemorySubStack,
link);
stack->sub_stack_offset = 0;
}
static void
_cogl_memory_sub_stack_free (CoglMemorySubStack *sub_stack)
{
g_free (sub_stack->data);
g_slice_free (CoglMemorySubStack, sub_stack);
}
void
_cogl_memory_stack_free (CoglMemoryStack *stack)
{
while (!_cogl_list_empty (&stack->sub_stacks))
{
CoglMemorySubStack *sub_stack =
_cogl_container_of (stack->sub_stacks.next, CoglMemorySubStack, link);
_cogl_list_remove (&sub_stack->link);
_cogl_memory_sub_stack_free (sub_stack);
}
g_slice_free (CoglMemoryStack, stack);
}