tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

BLI_array_store: move helper functions into their own API

This commit is contained in:
Campbell Barton 2016-06-08 18:34:01 +10:00
parent e623d6b223
commit 0a029e3dd1
4 changed files with 167 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/blender/blenlib/BLI_array_store_utils.h Normal file
View File

@ -0,0 +1,50 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* 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; either version 2
* of the License, or (at your option) any later version.
*
* 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, Fifth Floor, Boston, MA 02110-1301, USA.
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef __BLI_ARRAY_STORE_UTILS_H__
#define __BLI_ARRAY_STORE_UTILS_H__
/** \file BLI_array_store_utils.h
* \ingroup bli
*/
struct BArrayStore;
struct BArrayStore_AtSize {
struct BArrayStore **stride_table;
int stride_table_len;
};
BArrayStore *BLI_array_store_at_size_ensure(
struct BArrayStore_AtSize *bs_stride,
const int stride, const int chunk_size);
BArrayStore *BLI_array_store_at_size_get(
struct BArrayStore_AtSize *bs_stride,
const int stride);
void BLI_array_store_at_size_clear(
struct BArrayStore_AtSize *bs_stride);
void BLI_array_store_at_size_calc_memory_usage(
struct BArrayStore_AtSize *bs_stride,
size_t *r_size_expanded, size_t *r_size_compacted);
#endif /* __BLI_ARRAY_STORE_UTILS_H__ */

2
source/blender/blenlib/CMakeLists.txt
View File

@ -53,6 +53,7 @@ set(SRC
intern/BLI_mempool.c
intern/DLRB_tree.c
intern/array_store.c
intern/array_store_utils.c
intern/array_utils.c
intern/astar.c
intern/boxpack2d.c
@ -122,6 +123,7 @@ set(SRC
BLI_args.h
BLI_array.h
BLI_array_store.h
BLI_array_store_utils.h
BLI_array_utils.h
BLI_astar.h
BLI_bitmap.h

103
source/blender/blenlib/intern/array_store_utils.c Normal file
View File

@ -0,0 +1,103 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* 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; either version 2
* of the License, or (at your option) any later version.
*
* 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, Fifth Floor, Boston, MA 02110-1301, USA.
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/blenlib/intern/array_store_utils.c
* \ingroup bli
* \brief Helper functions for BLI_array_store API.
*/
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
#include "BLI_array_store.h"
#include "BLI_array_store_utils.h" /* own include */
#include "BLI_math_base.h"
BArrayStore *BLI_array_store_at_size_ensure(
struct BArrayStore_AtSize *bs_stride,
const int stride, const int chunk_size)
{
if (bs_stride->stride_table_len < stride) {
bs_stride->stride_table_len = stride;
bs_stride->stride_table = MEM_recallocN(bs_stride->stride_table, sizeof(*bs_stride->stride_table) * stride);
}
BArrayStore **bs_p = &bs_stride->stride_table[stride - 1];
if ((*bs_p) == NULL) {
#if 0
unsigned int chunk_count = chunk_size;
#else
/* calculate best chunk-count to fit a power of two */
unsigned int chunk_count = chunk_size;
{
unsigned int size = chunk_count * stride;
size = power_of_2_max_u(size);
size = MEM_SIZE_OPTIMAL(size);
chunk_count = size / stride;
}
#endif
(*bs_p) = BLI_array_store_create(stride, chunk_count);
}
return *bs_p;
}
BArrayStore *BLI_array_store_at_size_get(
struct BArrayStore_AtSize *bs_stride,
const int stride)
{
BLI_assert(stride > 0 && stride <= bs_stride->stride_table_len);
return bs_stride->stride_table[stride - 1];
}
void BLI_array_store_at_size_clear(
struct BArrayStore_AtSize *bs_stride)
{
for (int i = 0; i < bs_stride->stride_table_len; i += 1) {
if (bs_stride->stride_table[i]) {
BLI_array_store_destroy(bs_stride->stride_table[i]);
}
}
MEM_freeN(bs_stride->stride_table);
bs_stride->stride_table = NULL;
bs_stride->stride_table_len = 0;
}
void BLI_array_store_at_size_calc_memory_usage(
struct BArrayStore_AtSize *bs_stride,
size_t *r_size_expanded, size_t *r_size_compacted)
{
size_t size_compacted = 0;
size_t size_expanded = 0;
for (int i = 0; i < bs_stride->stride_table_len; i++) {
BArrayStore *bs = bs_stride->stride_table[i];
if (bs) {
size_compacted += BLI_array_store_calc_size_compacted_get(bs);
size_expanded += BLI_array_store_calc_size_expanded_get(bs);
}
}
*r_size_expanded = size_expanded;
*r_size_compacted = size_compacted;
}

85
source/blender/editors/mesh/editmesh_undo.c
View File

@ -49,7 +49,7 @@
# endif
# include "BLI_array_store.h"
# include "BLI_math_base.h"
# include "BLI_array_store_utils.h"
/* check on best size later... */
# define ARRAY_CHUNK_SIZE 256
@ -89,8 +89,7 @@ typedef struct UndoMesh {
#ifdef USE_ARRAY_STORE
/* NULL arrays are considered empty */
struct {
/* most data is stored as 'custom' data */
struct { /* most data is stored as 'custom' data */
BArrayCustomData *vdata, *edata, *ldata, *pdata;
BArrayState **keyblocks;
BArrayState *mselect;
@ -105,8 +104,7 @@ typedef struct UndoMesh {
* \{ */
static struct {
BArrayStore **bs_all;
int bs_all_len;
struct BArrayStore_AtSize bs_stride;
int users;
/* We could have the undo API pass in the previous state, for now store a local list */
@ -118,57 +116,6 @@ static struct {
} um_arraystore = {NULL};
static BArrayStore *array_store_at_size_ensure(const int stride)
{
if (um_arraystore.bs_all_len < stride) {
um_arraystore.bs_all_len = stride;
um_arraystore.bs_all = MEM_recallocN(um_arraystore.bs_all, sizeof(*um_arraystore.bs_all) * stride);
}
BArrayStore **bs_p = &um_arraystore.bs_all[stride - 1];
if ((*bs_p) == NULL) {
#if 0
unsigned int chunk_count = ARRAY_CHUNK_SIZE;
#else
/* calculate best chunk-count to fit a power of two */
unsigned int chunk_count = ARRAY_CHUNK_SIZE;
{
unsigned int size = chunk_count * stride;
size = power_of_2_max_u(size);
size = MEM_SIZE_OPTIMAL(size);
chunk_count = size / stride;
}
#endif
(*bs_p) = BLI_array_store_create(stride, chunk_count);
}
return *bs_p;
}
static BArrayStore *array_store_at_size_get(const int stride)
{
BLI_assert(stride > 0 && stride <= um_arraystore.bs_all_len);
return um_arraystore.bs_all[stride - 1];
}
#ifdef DEBUG_PRINT
static void um_arraystore_memory_usage(size_t *r_size_expanded, size_t *r_size_compacted)
{
size_t size_compacted = 0;
size_t size_expanded = 0;
for (int i = 0; i < um_arraystore.bs_all_len; i++) {
BArrayStore *bs = um_arraystore.bs_all[i];
if (bs) {
size_compacted += BLI_array_store_calc_size_compacted_get(bs);
size_expanded += BLI_array_store_calc_size_expanded_get(bs);
}
}
*r_size_expanded = size_expanded;
*r_size_compacted = size_compacted;
}
#endif
static void um_arraystore_cd_compact(
struct CustomData *cdata, const size_t data_len,
bool create,
@ -194,7 +141,7 @@ static void um_arraystore_cd_compact(
}
const int stride = CustomData_sizeof(type);
BArrayStore *bs = create ? array_store_at_size_ensure(stride) : NULL;
BArrayStore *bs = create ? BLI_array_store_at_size_ensure(&um_arraystore.bs_stride, stride, ARRAY_CHUNK_SIZE) : NULL;
const int layer_len = layer_end - layer_start;
if (create) {
@ -299,7 +246,7 @@ static void um_arraystore_cd_free(BArrayCustomData *bcd)
while (bcd) {
BArrayCustomData *bcd_next = bcd->next;
const int stride = CustomData_sizeof(bcd->type);
BArrayStore *bs = array_store_at_size_get(stride);
BArrayStore *bs = BLI_array_store_at_size_get(&um_arraystore.bs_stride, stride);
for (int i = 0; i < bcd->states_len; i++) {
if (bcd->states[i]) {
BLI_array_store_state_remove(bs, bcd->states[i]);
@ -328,7 +275,7 @@ static void um_arraystore_compact_ex(
if (me->key && me->key->totkey) {
const size_t stride = me->key->elemsize;
BArrayStore *bs = create ? array_store_at_size_ensure(stride) : NULL;
BArrayStore *bs = create ? BLI_array_store_at_size_ensure(&um_arraystore.bs_stride, stride, ARRAY_CHUNK_SIZE) : NULL;
if (create) {
um->store.keyblocks = MEM_mallocN(me->key->totkey * sizeof(*um->store.keyblocks), __func__);
}
@ -355,7 +302,7 @@ static void um_arraystore_compact_ex(
if (create) {
BArrayState *state_reference = um_ref ? um_ref->store.mselect : NULL;
const size_t stride = sizeof(*me->mselect);
BArrayStore *bs = array_store_at_size_ensure(stride);
BArrayStore *bs = BLI_array_store_at_size_ensure(&um_arraystore.bs_stride, stride, ARRAY_CHUNK_SIZE);
um->store.mselect = BLI_array_store_state_add(
bs, me->mselect, (size_t)me->totselect * stride, state_reference);
}
@ -384,7 +331,7 @@ static void um_arraystore_compact_with_info(UndoMesh *um, const UndoMesh *um_ref
{
#ifdef DEBUG_PRINT
size_t size_expanded_prev, size_compacted_prev;
um_arraystore_memory_usage(&size_expanded_prev, &size_compacted_prev);
BLI_array_store_at_size_calc_memory_usage(&um_arraystore.bs_stride, &size_expanded_prev, &size_compacted_prev);
#endif
#ifdef DEBUG_TIME
@ -400,7 +347,7 @@ static void um_arraystore_compact_with_info(UndoMesh *um, const UndoMesh *um_ref
#ifdef DEBUG_PRINT
{
size_t size_expanded, size_compacted;
um_arraystore_memory_usage(&size_expanded, &size_compacted);
BLI_array_store_at_size_calc_memory_usage(&um_arraystore.bs_stride, &size_expanded, &size_compacted);
const double percent_total = size_expanded ?
(((double)size_compacted / (double)size_expanded) * 100.0) : -1.0;
@ -483,7 +430,7 @@ static void um_arraystore_free(UndoMesh *um)
if (um->store.keyblocks) {
const size_t stride = me->key->elemsize;
BArrayStore *bs = array_store_at_size_get(stride);
BArrayStore *bs = BLI_array_store_at_size_get(&um_arraystore.bs_stride, stride);
for (int i = 0; i < me->key->totkey; i++) {
BArrayState *state = um->store.keyblocks[i];
BLI_array_store_state_remove(bs, state);
@ -494,7 +441,7 @@ static void um_arraystore_free(UndoMesh *um)
if (um->store.mselect) {
const size_t stride = sizeof(*me->mselect);
BArrayStore *bs = array_store_at_size_get(stride);
BArrayStore *bs = BLI_array_store_at_size_get(&um_arraystore.bs_stride, stride);
BArrayState *state = um->store.mselect;
BLI_array_store_state_remove(bs, state);
um->store.mselect = NULL;
@ -508,15 +455,7 @@ static void um_arraystore_free(UndoMesh *um)
#ifdef DEBUG_PRINT
printf("mesh undo store: freeing all data!\n");
#endif
for (int i = 0; i < um_arraystore.bs_all_len; i += 1) {
if (um_arraystore.bs_all[i]) {
BLI_array_store_destroy(um_arraystore.bs_all[i]);
}
}
MEM_freeN(um_arraystore.bs_all);
um_arraystore.bs_all = NULL;
um_arraystore.bs_all_len = 0;
BLI_array_store_at_size_clear(&um_arraystore.bs_stride);
#ifdef USE_ARRAY_STORE_THREAD
BLI_task_pool_free(um_arraystore.task_pool);