diff options
author | Bastien Montagne <bastien@blender.org> | 2021-06-30 16:19:35 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-07-27 15:53:49 +0300 |
commit | db4fe8e3223b36615e53cf64f4a55f6d974c4597 (patch) | |
tree | 91f97a9f26050ed889779a5f0dae86b460251c19 /source/blender/blenkernel/intern/main.c | |
parent | e37c876cd77dd26d540597b3796621a4f22d1518 (diff) |
BlenRead: Add GHash-based search for already read linked IDs.
Ths commit adds a new `IDNameLibMap` to `Main`, used during file reading
to quickly find already read linked IDs.
Without that, search would use string-based search over list of linked
data, which becomes extremely slow and inneficient in cases where a lot
of IDs are linked from a same library. See also {T89194}.
Extrem-usecase reported in T89194 is now about 4 times faster in linked
data reading (about 2 times faster for the whole .blend file loading).
More normal cases (like Sprites studio production files) have barely
measurable speed improvements, a few percents at best.
NOTE: `main_idmap` API was extended to support insertion and removal of
IDs from the mapping, avoids having to re-create the whole thing several
time during libraries expansion in readcode.
Differential Revision: https://developer.blender.org/D11757
Diffstat (limited to 'source/blender/blenkernel/intern/main.c')
-rw-r--r-- | source/blender/blenkernel/intern/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/main.c b/source/blender/blenkernel/intern/main.c index 655b6d3732c..bb33f5f9f87 100644 --- a/source/blender/blenkernel/intern/main.c +++ b/source/blender/blenkernel/intern/main.c @@ -38,6 +38,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_main.h" +#include "BKE_main_idmap.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -194,6 +195,10 @@ void BKE_main_free(Main *mainvar) BKE_main_relations_free(mainvar); } + if (mainvar->id_map) { + BKE_main_idmap_destroy(mainvar->id_map); + } + BLI_spin_end((SpinLock *)mainvar->lock); MEM_freeN(mainvar->lock); MEM_freeN(mainvar); |