[Bf-blender-cvs] [0be6427429c] master: Outliner: Compile outliner tree-hashing files in C++
Julian Eisel
noreply at git.blender.org
Wed Aug 17 21:01:58 CEST 2022
Commit: 0be6427429c46278096dde01fc411424fb13a4d0
Author: Julian Eisel
Date: Wed Aug 17 21:00:22 2022 +0200
Branches: master
https://developer.blender.org/rB0be6427429c46278096dde01fc411424fb13a4d0
Outliner: Compile outliner tree-hashing files in C++
Some performance issues were found here with a heavy production file and
we want to look into using some C++ to improve things for this ancient
code.
===================================================================
R052 source/blender/blenkernel/BKE_outliner_treehash.h source/blender/blenkernel/BKE_outliner_treehash.hh
M source/blender/blenkernel/CMakeLists.txt
R076 source/blender/blenkernel/intern/outliner_treehash.c source/blender/blenkernel/intern/outliner_treehash.cc
M source/blender/editors/space_outliner/outliner_tree.cc
M source/blender/editors/space_outliner/outliner_utils.cc
M source/blender/editors/space_outliner/space_outliner.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_outliner_treehash.h b/source/blender/blenkernel/BKE_outliner_treehash.hh
similarity index 52%
rename from source/blender/blenkernel/BKE_outliner_treehash.h
rename to source/blender/blenkernel/BKE_outliner_treehash.hh
index 6f4d126fcbf..fc0ab35cf38 100644
--- a/source/blender/blenkernel/BKE_outliner_treehash.h
+++ b/source/blender/blenkernel/BKE_outliner_treehash.hh
@@ -11,35 +11,36 @@ extern "C" {
struct BLI_mempool;
struct ID;
+struct GHash;
struct TreeStoreElem;
/* create and fill hashtable with treestore elements */
-void *BKE_outliner_treehash_create_from_treestore(struct BLI_mempool *treestore);
+GHash *BKE_outliner_treehash_create_from_treestore(BLI_mempool *treestore);
/* full rebuild for already allocated hashtable */
-void *BKE_outliner_treehash_rebuild_from_treestore(void *treehash, struct BLI_mempool *treestore);
+GHash *BKE_outliner_treehash_rebuild_from_treestore(GHash *treehash, BLI_mempool *treestore);
/* clear element usage flags */
-void BKE_outliner_treehash_clear_used(void *treehash);
+void BKE_outliner_treehash_clear_used(GHash *treehash);
/* Add/remove hashtable elements */
-void BKE_outliner_treehash_add_element(void *treehash, struct TreeStoreElem *elem);
-void BKE_outliner_treehash_remove_element(void *treehash, struct TreeStoreElem *elem);
+void BKE_outliner_treehash_add_element(GHash *treehash, TreeStoreElem *elem);
+void BKE_outliner_treehash_remove_element(GHash *treehash, TreeStoreElem *elem);
/* find first unused element with specific type, nr and id */
-struct TreeStoreElem *BKE_outliner_treehash_lookup_unused(void *treehash,
+struct TreeStoreElem *BKE_outliner_treehash_lookup_unused(GHash *treehash,
short type,
short nr,
- struct ID *id);
+ ID *id);
/* find user or unused element with specific type, nr and id */
-struct TreeStoreElem *BKE_outliner_treehash_lookup_any(void *treehash,
+struct TreeStoreElem *BKE_outliner_treehash_lookup_any(GHash *treehash,
short type,
short nr,
- struct ID *id);
+ ID *id);
/* free treehash structure */
-void BKE_outliner_treehash_free(void *treehash);
+void BKE_outliner_treehash_free(GHash *treehash);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 660c71cdf33..820d051f087 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -237,7 +237,7 @@ set(SRC
intern/object_update.c
intern/ocean.c
intern/ocean_spectrum.c
- intern/outliner_treehash.c
+ intern/outliner_treehash.cc
intern/packedFile.c
intern/paint.c
intern/paint_canvas.cc
@@ -444,7 +444,7 @@ set(SRC
BKE_object_deform.h
BKE_object_facemap.h
BKE_ocean.h
- BKE_outliner_treehash.h
+ BKE_outliner_treehash.hh
BKE_packedFile.h
BKE_paint.h
BKE_particle.h
diff --git a/source/blender/blenkernel/intern/outliner_treehash.c b/source/blender/blenkernel/intern/outliner_treehash.cc
similarity index 76%
rename from source/blender/blenkernel/intern/outliner_treehash.c
rename to source/blender/blenkernel/intern/outliner_treehash.cc
index 09e2baf2be1..cc0bd331b82 100644
--- a/source/blender/blenkernel/intern/outliner_treehash.c
+++ b/source/blender/blenkernel/intern/outliner_treehash.cc
@@ -15,7 +15,7 @@
#include "DNA_outliner_types.h"
-#include "BKE_outliner_treehash.h"
+#include "BKE_outliner_treehash.hh"
#include "MEM_guardedalloc.h"
@@ -40,8 +40,8 @@ typedef struct TseGroup {
* so there is no need to preallocate memory for more than one pointer */
static TseGroup *tse_group_create(void)
{
- TseGroup *tse_group = MEM_mallocN(sizeof(TseGroup), "TseGroup");
- tse_group->elems = MEM_mallocN(sizeof(TreeStoreElem *), "TseGroupElems");
+ TseGroup *tse_group = MEM_new<TseGroup>("TseGroup");
+ tse_group->elems = MEM_new<TreeStoreElem *>("TseGroupElems");
tse_group->size = 0;
tse_group->allocated = 1;
tse_group->lastused = 0;
@@ -52,8 +52,8 @@ static void tse_group_add_element(TseGroup *tse_group, TreeStoreElem *elem)
{
if (UNLIKELY(tse_group->size == tse_group->allocated)) {
tse_group->allocated *= 2;
- tse_group->elems = MEM_reallocN(tse_group->elems,
- sizeof(TreeStoreElem *) * tse_group->allocated);
+ tse_group->elems = static_cast<TreeStoreElem **>(
+ MEM_reallocN(tse_group->elems, sizeof(TreeStoreElem *) * tse_group->allocated));
}
tse_group->elems[tse_group->size] = elem;
tse_group->lastused = tse_group->size;
@@ -78,8 +78,8 @@ static void tse_group_remove_element(TseGroup *tse_group, TreeStoreElem *elem)
if (UNLIKELY(tse_group->size > 0 && tse_group->size <= min_allocated)) {
tse_group->allocated = min_allocated;
- tse_group->elems = MEM_reallocN(tse_group->elems,
- sizeof(TreeStoreElem *) * tse_group->allocated);
+ tse_group->elems = static_cast<TreeStoreElem **>(
+ MEM_reallocN(tse_group->elems, sizeof(TreeStoreElem *) * tse_group->allocated));
}
}
@@ -91,7 +91,7 @@ static void tse_group_free(TseGroup *tse_group)
static unsigned int tse_hash(const void *ptr)
{
- const TreeStoreElem *tse = ptr;
+ const TreeStoreElem *tse = static_cast<const TreeStoreElem *>(ptr);
union {
short h_pair[2];
unsigned int u_int;
@@ -109,12 +109,12 @@ static unsigned int tse_hash(const void *ptr)
static bool tse_cmp(const void *a, const void *b)
{
- const TreeStoreElem *tse_a = a;
- const TreeStoreElem *tse_b = b;
+ const TreeStoreElem *tse_a = static_cast<const TreeStoreElem *>(a);
+ const TreeStoreElem *tse_b = static_cast<const TreeStoreElem *>(b);
return tse_a->type != tse_b->type || tse_a->nr != tse_b->nr || tse_a->id != tse_b->id;
}
-static void fill_treehash(void *treehash, BLI_mempool *treestore)
+static void fill_treehash(GHash *treehash, BLI_mempool *treestore)
{
TreeStoreElem *tselem;
BLI_mempool_iter iter;
@@ -122,12 +122,12 @@ static void fill_treehash(void *treehash, BLI_mempool *treestore)
BLI_assert(treehash);
- while ((tselem = BLI_mempool_iterstep(&iter))) {
+ while ((tselem = static_cast<TreeStoreElem *>(BLI_mempool_iterstep(&iter)))) {
BKE_outliner_treehash_add_element(treehash, tselem);
}
}
-void *BKE_outliner_treehash_create_from_treestore(BLI_mempool *treestore)
+GHash *BKE_outliner_treehash_create_from_treestore(BLI_mempool *treestore)
{
GHash *treehash = BLI_ghash_new_ex(tse_hash, tse_cmp, "treehash", BLI_mempool_len(treestore));
fill_treehash(treehash, treestore);
@@ -136,21 +136,21 @@ void *BKE_outliner_treehash_create_from_treestore(BLI_mempool *treestore)
static void free_treehash_group(void *key)
{
- tse_group_free(key);
+ tse_group_free(static_cast<TseGroup *>(key));
}
-void BKE_outliner_treehash_clear_used(void *treehash)
+void BKE_outliner_treehash_clear_used(GHash *treehash)
{
GHashIterator gh_iter;
GHASH_ITER (gh_iter, treehash) {
- TseGroup *group = BLI_ghashIterator_getValue(&gh_iter);
+ TseGroup *group = static_cast<TseGroup *>(BLI_ghashIterator_getValue(&gh_iter));
group->lastused = 0;
group->lastused_reset_count = 0;
}
}
-void *BKE_outliner_treehash_rebuild_from_treestore(void *treehash, BLI_mempool *treestore)
+GHash *BKE_outliner_treehash_rebuild_from_treestore(GHash *treehash, BLI_mempool *treestore)
{
BLI_assert(treehash);
@@ -159,7 +159,7 @@ void *BKE_outliner_treehash_rebuild_from_treestore(void *treehash, BLI_mempool *
return treehash;
}
-void BKE_outliner_treehash_add_element(void *treehash, TreeStoreElem *elem)
+void BKE_outliner_treehash_add_element(GHash *treehash, TreeStoreElem *elem)
{
TseGroup *group;
void **val_p;
@@ -167,13 +167,13 @@ void BKE_outliner_treehash_add_element(void *treehash, TreeStoreElem *elem)
if (!BLI_ghash_ensure_p(treehash, elem, &val_p)) {
*val_p = tse_group_create();
}
- group = *val_p;
+ group = static_cast<TseGroup *>(*val_p);
tse_group_add_element(group, elem);
}
-void BKE_outliner_treehash_remove_element(void *treehash, TreeStoreElem *elem)
+void BKE_outliner_treehash_remove_element(GHash *treehash, TreeStoreElem *elem)
{
- TseGroup *group = BLI_ghash_lookup(treehash, elem);
+ TseGroup *group = static_cast<TseGroup *>(BLI_ghash_lookup(treehash, elem));
BLI_assert(group != NULL);
if (group->size <= 1) {
@@ -194,10 +194,10 @@ static TseGroup *BKE_outliner_treehash_lookup_group(GHash *th, short type, short
BLI_assert(th);
- return BLI_ghash_lookup(th, &tse_template);
+ return static_cast<TseGroup *>(BLI_ghash_lookup(th, &tse_template));
}
-TreeStoreElem *BKE_outliner_treehash_lookup_unused(void *treehash,
+TreeStoreElem *BKE_outliner_treehash_lookup_unused(GHash *treehash,
short type,
short nr,
struct ID *id)
@@ -235,10 +235,7 @@ TreeStoreElem *BKE_outliner_treehash_lookup_unused(void *treehash,
return NULL;
}
-TreeStoreElem *BKE_outliner_treehash_lookup_any(void *treehash,
- short type,
- short nr,
- struct ID *id)
+TreeStoreElem *BKE_outliner_treehash_lookup_any(GHash *treehash, short type, short nr, ID *id)
{
TseGroup *group;
@@ -248,7 +245,7 @@ TreeStoreElem *BKE_outliner_treehash_lookup_any(void *treehash,
return group ? group->elems[0] : NULL;
}
-void BKE_outliner_treehash_free(void *treehash)
+void BKE_outliner_treehash_free(GHash *treehash)
{
BLI_assert(treehash);
diff --git a/source/blender/editors/space_outliner/outliner_tree.cc b/source/blender/editors/space_outliner/o
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list