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

Cleanup: move hash and ghash utils to C++ 

Also see #103343.

Pull Request: https://projects.blender.org/blender/blender/pulls/117761
This commit is contained in:
Jacques Lucke 2024-02-02 19:55:06 +01:00
parent 9aa20a0979
commit 319b911784
24 changed files with 43 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/test/CMakeLists.txt
View File

@ -182,11 +182,11 @@ add_library(bli_lib
"../../../source/blender/blenlib/intern/path_util.c" "../../../source/blender/blenlib/intern/path_util.c"
"../../../source/blender/blenlib/intern/BLI_dynstr.c" "../../../source/blender/blenlib/intern/BLI_dynstr.c"
"../../../source/blender/blenlib/intern/BLI_ghash.c" "../../../source/blender/blenlib/intern/BLI_ghash.c"
"../../../source/blender/blenlib/intern/BLI_ghash_utils.c" "../../../source/blender/blenlib/intern/BLI_ghash_utils.cc"
"../../../source/blender/blenlib/intern/BLI_linklist.c" "../../../source/blender/blenlib/intern/BLI_linklist.c"
"../../../source/blender/blenlib/intern/BLI_memarena.c" "../../../source/blender/blenlib/intern/BLI_memarena.c"
"../../../source/blender/blenlib/intern/BLI_mempool.c" "../../../source/blender/blenlib/intern/BLI_mempool.c"
"../../../source/blender/blenlib/intern/hash_mm2a.c" "../../../source/blender/blenlib/intern/hash_mm2a.cc"
"../../../source/blender/blenlib/intern/string_utils.c" "../../../source/blender/blenlib/intern/string_utils.c"
"../../../source/blender/blenlib/intern/system.c" "../../../source/blender/blenlib/intern/system.c"
) )

2
source/blender/blenkernel/BKE_cryptomatte.hh
View File

@ -14,7 +14,7 @@
#include "BKE_cryptomatte.h" #include "BKE_cryptomatte.h"
#include "BLI_hash_mm3.h" #include "BLI_hash_mm3.hh"
#include "BLI_map.hh" #include "BLI_map.hh"
#include "BLI_string_ref.hh" #include "BLI_string_ref.hh"

2
source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc
View File

@ -15,7 +15,7 @@
#include "BLI_binary_search.hh" #include "BLI_binary_search.hh"
#include "BLI_fileops.hh" #include "BLI_fileops.hh"
#include "BLI_hash_md5.h" #include "BLI_hash_md5.hh"
#include "BLI_path_util.h" #include "BLI_path_util.h"
#include "BLI_string.h" #include "BLI_string.h"
#include "BLI_string_utils.hh" #include "BLI_string_utils.hh"

2
source/blender/blenkernel/intern/cryptomatte.cc
View File

@ -19,7 +19,7 @@
#include "BLI_compiler_attrs.h" #include "BLI_compiler_attrs.h"
#include "BLI_dynstr.h" #include "BLI_dynstr.h"
#include "BLI_hash_mm3.h" #include "BLI_hash_mm3.hh"
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BLI_string.h" #include "BLI_string.h"

2
source/blender/blenlib/BLI_ghash.h
View File

@ -548,7 +548,7 @@ double BLI_gset_calc_quality(GSet *gs);
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name GHash/GSet Utils /** \name GHash/GSet Utils
* *
* Defined in `BLI_ghash_utils.c` * Defined in `BLI_ghash_utils.cc`
* \{ */ * \{ */
/** /**

10
source/blender/blenlib/BLI_hash_md5.h → source/blender/blenlib/BLI_hash_md5.hh
View File

@ -8,9 +8,9 @@
* \ingroup bli * \ingroup bli
*/ */
#ifdef __cplusplus #include <cstdio>
extern "C" {
#endif #include "BLI_sys_types.h"
/** /**
* Compute MD5 message digest for 'len' bytes beginning at 'buffer'. * Compute MD5 message digest for 'len' bytes beginning at 'buffer'.
@ -27,7 +27,3 @@ void *BLI_hash_md5_buffer(const char *buffer, size_t len, void *resblock);
int BLI_hash_md5_stream(FILE *stream, void *resblock); int BLI_hash_md5_stream(FILE *stream, void *resblock);
char *BLI_hash_md5_to_hexdigest(const void *resblock, char r_hex_digest[33]); char *BLI_hash_md5_to_hexdigest(const void *resblock, char r_hex_digest[33]);
#ifdef __cplusplus
}
#endif

8
source/blender/blenlib/BLI_hash_mm2a.h → source/blender/blenlib/BLI_hash_mm2a.hh
View File

@ -10,10 +10,6 @@
#include "BLI_sys_types.h" #include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct BLI_HashMurmur2A { typedef struct BLI_HashMurmur2A {
uint32_t hash; uint32_t hash;
uint32_t tail; uint32_t tail;
@ -33,7 +29,3 @@ uint32_t BLI_hash_mm2a_end(BLI_HashMurmur2A *mm2);
* Non-incremental version, quicker for small keys. * Non-incremental version, quicker for small keys.
*/ */
uint32_t BLI_hash_mm2(const unsigned char *data, size_t len, uint32_t seed); uint32_t BLI_hash_mm2(const unsigned char *data, size_t len, uint32_t seed);
#ifdef __cplusplus
}
#endif

8
source/blender/blenlib/BLI_hash_mm3.h → source/blender/blenlib/BLI_hash_mm3.hh
View File

@ -10,12 +10,4 @@
#include "BLI_sys_types.h" #include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif
uint32_t BLI_hash_mm3(const unsigned char *data, size_t len, uint32_t seed); uint32_t BLI_hash_mm3(const unsigned char *data, size_t len, uint32_t seed);
#ifdef __cplusplus
}
#endif

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

@ -29,7 +29,7 @@ set(SRC
intern/BLI_dynstr.c intern/BLI_dynstr.c
intern/BLI_filelist.cc intern/BLI_filelist.cc
intern/BLI_ghash.c intern/BLI_ghash.c
intern/BLI_ghash_utils.c intern/BLI_ghash_utils.cc
intern/BLI_heap.c intern/BLI_heap.c
intern/BLI_heap_simple.c intern/BLI_heap_simple.c
intern/BLI_index_range.cc intern/BLI_index_range.cc
@ -77,9 +77,9 @@ set(SRC
intern/generic_virtual_array.cc intern/generic_virtual_array.cc
intern/generic_virtual_vector_array.cc intern/generic_virtual_vector_array.cc
intern/gsqueue.c intern/gsqueue.c
intern/hash_md5.c intern/hash_md5.cc
intern/hash_mm2a.c intern/hash_mm2a.cc
intern/hash_mm3.c intern/hash_mm3.cc
intern/hash_tables.cc intern/hash_tables.cc
intern/implicit_sharing.cc intern/implicit_sharing.cc
intern/index_mask.cc intern/index_mask.cc
@ -242,9 +242,9 @@ set(SRC
BLI_gsqueue.h BLI_gsqueue.h
BLI_hash.h BLI_hash.h
BLI_hash.hh BLI_hash.hh
BLI_hash_md5.h BLI_hash_md5.hh
BLI_hash_mm2a.h BLI_hash_mm2a.hh
BLI_hash_mm3.h BLI_hash_mm3.hh
BLI_hash_tables.hh BLI_hash_tables.hh
BLI_heap.h BLI_heap.h
BLI_heap_simple.h BLI_heap_simple.h

16
source/blender/blenlib/intern/BLI_ghash_utils.c → source/blender/blenlib/intern/BLI_ghash_utils.cc
View File

@ -14,7 +14,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_ghash.h" /* own include */ #include "BLI_ghash.h" /* own include */
#include "BLI_hash_mm2a.h" #include "BLI_hash_mm2a.hh"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
/* keep last */ /* keep last */
@ -136,7 +136,7 @@ uint BLI_ghashutil_strhash_p(const void *ptr)
const signed char *p; const signed char *p;
uint h = 5381; uint h = 5381;
for (p = ptr; *p != '\0'; p++) { for (p = static_cast<const signed char *>(ptr); *p != '\0'; p++) {
h = (uint)((h << 5) + h) + (uint)*p; h = (uint)((h << 5) + h) + (uint)*p;
} }
@ -144,18 +144,18 @@ uint BLI_ghashutil_strhash_p(const void *ptr)
} }
uint BLI_ghashutil_strhash_p_murmur(const void *ptr) uint BLI_ghashutil_strhash_p_murmur(const void *ptr)
{ {
const uchar *key = ptr; const uchar *key = static_cast<const uchar *>(ptr);
return BLI_hash_mm2(key, strlen((const char *)key) + 1, 0); return BLI_hash_mm2(key, strlen((const char *)key) + 1, 0);
} }
bool BLI_ghashutil_strcmp(const void *a, const void *b) bool BLI_ghashutil_strcmp(const void *a, const void *b)
{ {
return (a == b) ? false : !STREQ(a, b); return (a == b) ? false : !STREQ(static_cast<const char *>(a), static_cast<const char *>(b));
} }
GHashPair *BLI_ghashutil_pairalloc(const void *first, const void *second) GHashPair *BLI_ghashutil_pairalloc(const void *first, const void *second)
{ {
GHashPair *pair = MEM_mallocN(sizeof(GHashPair), "GHashPair"); GHashPair *pair = static_cast<GHashPair *>(MEM_mallocN(sizeof(GHashPair), "GHashPair"));
pair->first = first; pair->first = first;
pair->second = second; pair->second = second;
return pair; return pair;
@ -163,15 +163,15 @@ GHashPair *BLI_ghashutil_pairalloc(const void *first, const void *second)
uint BLI_ghashutil_pairhash(const void *ptr) uint BLI_ghashutil_pairhash(const void *ptr)
{ {
const GHashPair *pair = ptr; const GHashPair *pair = static_cast<const GHashPair *>(ptr);
uint hash = BLI_ghashutil_ptrhash(pair->first); uint hash = BLI_ghashutil_ptrhash(pair->first);
return hash ^ BLI_ghashutil_ptrhash(pair->second); return hash ^ BLI_ghashutil_ptrhash(pair->second);
} }
bool BLI_ghashutil_paircmp(const void *a, const void *b) bool BLI_ghashutil_paircmp(const void *a, const void *b)
{ {
const GHashPair *A = a; const GHashPair *A = static_cast<const GHashPair *>(a);
const GHashPair *B = b; const GHashPair *B = static_cast<const GHashPair *>(b);
return ((A->first != B->first) || (A->second != B->second)); return ((A->first != B->first) || (A->second != B->second));
} }

2
source/blender/blenlib/intern/compute_context.cc
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */ * SPDX-License-Identifier: GPL-2.0-or-later */
#include "BLI_compute_context.hh" #include "BLI_compute_context.hh"
#include "BLI_hash_md5.h" #include "BLI_hash_md5.hh"
#include <sstream> #include <sstream>
namespace blender { namespace blender {

9
source/blender/blenlib/intern/hash_md5.c → source/blender/blenlib/intern/hash_md5.cc
View File

@ -15,7 +15,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include "BLI_hash_md5.h" /* own include */ #include "BLI_hash_md5.hh" /* own include */
#if defined HAVE_LIMITS_H || defined _LIBC #if defined HAVE_LIMITS_H || defined _LIBC
# include <limits.h> # include <limits.h>
@ -114,7 +114,7 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct
#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s))) #define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
md5_uint32 correct_words[16]; md5_uint32 correct_words[16];
const md5_uint32 *words = buffer; const md5_uint32 *words = static_cast<const md5_uint32 *>(buffer);
size_t nwords = len / sizeof(md5_uint32); size_t nwords = len / sizeof(md5_uint32);
const md5_uint32 *endp = words + nwords; const md5_uint32 *endp = words + nwords;
md5_uint32 A = ctx->A; md5_uint32 A = ctx->A;
@ -259,7 +259,7 @@ static void md5_process_block(const void *buffer, size_t len, struct md5_ctx *ct
*/ */
static void *md5_read_ctx(const struct md5_ctx *ctx, void *resbuf) static void *md5_read_ctx(const struct md5_ctx *ctx, void *resbuf)
{ {
md5_uint32 *digest = resbuf; md5_uint32 *digest = static_cast<md5_uint32 *>(resbuf);
digest[0] = SWAP(ctx->A); digest[0] = SWAP(ctx->A);
digest[1] = SWAP(ctx->B); digest[1] = SWAP(ctx->B);
digest[2] = SWAP(ctx->C); digest[2] = SWAP(ctx->C);
@ -268,7 +268,8 @@ static void *md5_read_ctx(const struct md5_ctx *ctx, void *resbuf)
return resbuf; return resbuf;
} }
/* Top level public functions. */ /*
Top level public functions. */
int BLI_hash_md5_stream(FILE *stream, void *resblock) int BLI_hash_md5_stream(FILE *stream, void *resblock)
{ {

2
source/blender/blenlib/intern/hash_mm2a.c → source/blender/blenlib/intern/hash_mm2a.cc
View File

@ -20,7 +20,7 @@
#include "BLI_compiler_attrs.h" #include "BLI_compiler_attrs.h"
#include "BLI_hash_mm2a.h" /* own include */ #include "BLI_hash_mm2a.hh" /* own include */
/* Helpers. */ /* Helpers. */
#define MM2A_M 0x5bd1e995 #define MM2A_M 0x5bd1e995

2
source/blender/blenlib/intern/hash_mm3.c → source/blender/blenlib/intern/hash_mm3.cc
View File

@ -15,7 +15,7 @@
#include "BLI_compiler_attrs.h" #include "BLI_compiler_attrs.h"
#include "BLI_compiler_compat.h" #include "BLI_compiler_compat.h"
#include "BLI_hash_mm3.h" /* own include */ #include "BLI_hash_mm3.hh" /* own include */
#if defined(_MSC_VER) #if defined(_MSC_VER)
# include <stdlib.h> # include <stdlib.h>

2
source/blender/blenlib/tests/BLI_hash_mm2a_test.cc
View File

@ -4,7 +4,7 @@
#include "testing/testing.h" #include "testing/testing.h"
#include "BLI_hash_mm2a.h" #include "BLI_hash_mm2a.hh"
/* NOTE: Reference results are taken from reference implementation /* NOTE: Reference results are taken from reference implementation
* (cpp code, CMurmurHash2A variant): * (cpp code, CMurmurHash2A variant):

3
source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
View File

@ -10,14 +10,13 @@
#include "BPy_Convert.h" #include "BPy_Convert.h"
#include "BLI_hash_mm2a.hh"
#include "BLI_math_vector.h" #include "BLI_math_vector.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "BLI_hash_mm2a.h"
using namespace Freestyle; using namespace Freestyle;
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////

2
source/blender/gpu/intern/gpu_codegen.cc
View File

@ -15,7 +15,7 @@
#include "DNA_material_types.h" #include "DNA_material_types.h"
#include "BLI_ghash.h" #include "BLI_ghash.h"
#include "BLI_hash_mm2a.h" #include "BLI_hash_mm2a.hh"
#include "BLI_link_utils.h" #include "BLI_link_utils.h"
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BLI_string.h" #include "BLI_string.h"

2
source/blender/imbuf/intern/thumbs.cc
View File

@ -16,7 +16,7 @@
#include "BLI_fileops.h" #include "BLI_fileops.h"
#include "BLI_ghash.h" #include "BLI_ghash.h"
#include "BLI_hash_md5.h" #include "BLI_hash_md5.hh"
#include "BLI_path_util.h" #include "BLI_path_util.h"
#include "BLI_string.h" #include "BLI_string.h"
#include "BLI_string_utils.hh" #include "BLI_string_utils.hh"

2
source/blender/imbuf/intern/thumbs_font.cc
View File

@ -7,7 +7,7 @@
*/ */
#include "BLI_fileops.h" #include "BLI_fileops.h"
#include "BLI_hash_md5.h" #include "BLI_hash_md5.hh"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "IMB_imbuf.hh" #include "IMB_imbuf.hh"

2
source/blender/io/ply/tests/io_ply_importer_test.cc
View File

@ -5,7 +5,7 @@
#include "testing/testing.h" #include "testing/testing.h"
#include "BLI_fileops.hh" #include "BLI_fileops.hh"
#include "BLI_hash_mm2a.h" #include "BLI_hash_mm2a.hh"
#include "ply_import.hh" #include "ply_import.hh"
#include "ply_import_buffer.hh" #include "ply_import_buffer.hh"

4
source/blender/makesdna/intern/CMakeLists.txt
View File

@ -48,7 +48,7 @@ file(GENERATE OUTPUT ${dna_header_string_file} CONTENT "${DNA_FILE_LIST}")
set(SRC_BLENLIB set(SRC_BLENLIB
../../blenlib/intern/BLI_assert.c ../../blenlib/intern/BLI_assert.c
../../blenlib/intern/BLI_ghash.c ../../blenlib/intern/BLI_ghash.c
../../blenlib/intern/BLI_ghash_utils.c ../../blenlib/intern/BLI_ghash_utils.cc
../../blenlib/intern/BLI_linklist.c ../../blenlib/intern/BLI_linklist.c
../../blenlib/intern/BLI_memarena.c ../../blenlib/intern/BLI_memarena.c
../../blenlib/intern/BLI_mempool.c ../../blenlib/intern/BLI_mempool.c
@ -57,7 +57,7 @@ set(SRC_BLENLIB
../../blenlib/intern/string.c ../../blenlib/intern/string.c
# Dependency of BLI_ghash.c # Dependency of BLI_ghash.c
../../blenlib/intern/hash_mm2a.c ../../blenlib/intern/hash_mm2a.cc
# Dependencies of BLI_mempool.c when ASAN is enabled. # Dependencies of BLI_mempool.c when ASAN is enabled.
../../blenlib/intern/gsqueue.c ../../blenlib/intern/gsqueue.c

2
source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
View File

@ -12,7 +12,7 @@
#include "BLI_assert.h" #include "BLI_assert.h"
#include "BLI_dynstr.h" #include "BLI_dynstr.h"
#include "BLI_hash_mm3.h" #include "BLI_hash_mm3.hh"
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BLI_math_vector.h" #include "BLI_math_vector.h"
#include "BLI_math_vector_types.hh" #include "BLI_math_vector_types.hh"

2
source/blender/nodes/intern/geometry_nodes_lazy_function.cc
View File

@ -31,7 +31,7 @@
#include "BLI_cpp_types.hh" #include "BLI_cpp_types.hh"
#include "BLI_dot_export.hh" #include "BLI_dot_export.hh"
#include "BLI_hash.h" #include "BLI_hash.h"
#include "BLI_hash_md5.h" #include "BLI_hash_md5.hh"
#include "BLI_lazy_threading.hh" #include "BLI_lazy_threading.hh"
#include "BLI_map.hh" #include "BLI_map.hh"

2
source/blender/render/intern/render_result.cc
View File

@ -14,7 +14,7 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_ghash.h" #include "BLI_ghash.h"
#include "BLI_hash_md5.h" #include "BLI_hash_md5.hh"
#include "BLI_implicit_sharing.hh" #include "BLI_implicit_sharing.hh"
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BLI_path_util.h" #include "BLI_path_util.h"